This commit was manufactured by cvs2svn to create tagEVOLUTION_2_6_3

'EVOLUTION_2_6_3'.

svn path=/tags/EVOLUTION_2_6_3/; revision=32456

135 files changed, 75997 insertions, 69653 deletions

diff --git a/ChangeLog b/ChangeLog
index 006d3b079d..4d6a011cf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,8 @@
-2006-07-28  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
+2006-07-31  Harish Krishnaswamy  <kharish@novell.com>
 
-	* configure.in: Added configure script for building
-	evolution calendar with cairo support.
-
-2006-07-24  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Evolution 2.7.90 release 
+	* NEWS, configure.in: Evolution 2.7.3 release
 	updates.
 
-2006-07-21  Luca Ferretti  <elle.uca@libero.it>
-
-	* configure.in: add support for xulrunner and seamonkey (NSS and NSPR).
-	(committed by Karsten Bräckelmann)
-
 2006-07-22  Julio M. Merino Vidal  <jmmv@NetBSD.org>
 
 	* configure.in: Do not assume that only SunOS has pkill because
@@ -20,31 +10,6 @@
 	looks for an utility to kill a process by name to properly detect
 	either pkill or killall.  Fixes bug #336853.
 
-2006-07-13  Andre Klapper  <a9016009@gmx.de>
-
-	* configure.in:
-	
-	adding localized (german) quick reference card. see bug #307856.
-
-2006-07-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Update EDS requirement to
-	1.7.4.
-	
-2006-07-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in, NEWS: Evolution 2.7.4 release 
-	updates.
-
-2006-07-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* evolution-shell.pc.in: 
-	defined @datarootdir@. Patch submitted by 
-	Frederic Peters. 
-	
-	* evolution-plugin.pc.in : Similar change.
-	Fixes #345083.
-
 2006-06-15  Tor Lillqvist  <tml@novell.com>
 
 	* plugin.mk: Must expand also @GETTEXT_PACKAGE@ and @LOCALEDIR@,
@@ -63,43 +28,15 @@
 	
 	* configure.in: Use libgnomeprint-2.2 >= 2.7.0.
 
-2006-06-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS: Release updates.
-	* configure.in: Bump version. Evolution 2.7.3 release.
-
-2006-06-12  simon.zheng  <simon.zheng@sun.com>
-
-	Fix for #336453
-
-	* acinclude.m4:
-	* configure.in:
-	Add SunLDAP library support - a variant of Netscape LDAP.
-
 2006-06-02 Iain Buchanan <iaindb@netspace.net.au>
 
 	* configure.in: Fix typo that caused experimental plugins
 	to be skipped.
 
-2006-05-27  Thomas Vander Stichele  <thomas at apestaart dot org>
-
-	* widgets/misc/e-attachment-bar.c: (update):
-	  Fix compilation by adding missing (
-
-2006-05-22  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Update intltool requirements.
+2006-05-29  Harish Krishnaswamy  <kharish@novell.com>
 
-2006-05-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Patch from Brian Pepple to achieve
-	GNOME Goal for po/LINGUAS. Closes bug #337965.
-	* po/LINGUAS: New file.
-
-2006-05-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	configure.in: Fix compilation with modern openldap releases.
-	Partially fixes bug #325957. Patch from Sushuma Rai.
+	* NEWS, configure.in: Release updates and version
+	bump. Release - Evolution 2.6.2
 
 2006-04-28  Sven Herzberg  <herzi@gnome-de.org>
 
@@ -110,41 +47,47 @@
 	* shell/e-shell-window.c: added window state saving and updated window
 	size saving to work as expected (fixes bug 243962)
 
-2006-04-27  Tor Lillqvist  <tml@novell.com>
-
-	* win32/libemiscwidgets.def: Add e_expander_get_type which now is
-	needed when linking libevolution-widgets-a11y.
-
 2006-04-25  Jeffrey Stedfast  <fejj@novell.com>
 
 	* configure.in: Figure out auto-magically what the mozilla-nss
 	pkg-config module name is.
 
-2006-04-24  Harish Krishnaswamy  <kharish@novell.com>
+2006-04-10  Harish Krishnaswamy <kharish@novell.com>
 
-	* NEWS, configure.in: Release updates. Bump version.
-	***** Release 2.7.1 *****
+	--------------------------
+	Release : Evolution 2.6.1
+	--------------------------
 
-2006-04-19  Philip Van Hoof  <pvanhoof@gnome.org>
+	* NEWS, configure.in: Release updates and version bump.
 
-	* shell/main.c: Replaced popt with GOption API
+2006-04-08  Jérémy Ar Floc'h  <jeremy.lefloch@gmail.com>
 
-2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Remove obsolete entry for no_NO.
-
-2006-03-27  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* MAINTAINERS: Changing the maintainers file to reflect
-	the current mail maintainers.
+	* configure.in (ALL_LINGUAS): Added Breton (br).
 
 2006-03-22  Tommi Vainikainen  <thv@iki.fi>
 
 	* configure.in (ALL_LINGUAS): Added Dzongkha (dz).
 
-2006-03-12  Vladimer Sichinava  <alinux@siena.linux.it>
+2006-03-22  Tor Lillqvist  <tml@novell.com>
+
+	* evolution-zip.in: The evolution.keys and evolution.mime files
+	don't have any version number in their name. I doubt these files
+	actually get used on Win32, though, so prolly silly to put them in
+	the zip file.
+
+2006-03-14  Vladimer Sichinava  <alinux@siena.linux.it>
 
-	* configure.in: Added "ka" Georgian
+        * configure.in: Added "ka" Georgian tu ALL_LINGUAS
+	
+2006-03-13  Harish Krishnaswamy  <kharish@novell.com>
+
+	* NEWS, configure.in : Release updates and version bump.
+	--------------------------
+	Release : Evolution 2.6.0
+	--------------------------
+	
+	* data/Makefile.am: Delink the version from the desktop file
+	to enable smoother upgrades.
 
 2006-03-12  Benoît Dejean  <benoit@placenet.org>
 
@@ -152,7 +95,7 @@
 	* mail/default/Makefile.am:
 	* mail/default/fr/Inbox:
 	* mail/default/fr/Makefile.am: Added French welcome message.
-	
+
 2006-03-03  Andre Klapper  <a9016009@gmx.de>
 
 	* configure.in,
diff --git a/NEWS b/NEWS
index 1f0f79c899..b65be0fab1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,82 +1,100 @@
-Evolution 2.7.90 2006-07-24
----------------------------
+Evolution 2.6.3 2006-07-31 
+--------------------------
 
 Updated Translations:
 
-Zygimantas Berucka (lt), 
-Christophe Merlet (fr),
-Francisco Javier F. Serrador (es),
-Changwoo Ryu (ko), Jonathan Ernst (fr),
-Nikos Charonitakis (el), Funda Wang (zh_CN),
-Ankit Patel (gu), Ilkka Tuohela (fi),
-Raivis Dejus (lv), Kostas Papadimas (el),
-Dzongkhalinux team, DIT (dz), Hendrik Richter (de),
-Daniel Nylander (sv), Ivar Smolin (et),
-Theppitak Karoonboonyanan (th), Simos Xenitellis (el),
-Chao-Hsuing Liao (zh_HK, zh_TW)
+Christophe Merlet (fr)
+Zygimantas Beručka (lt), Hendrik Richter (de),
+Ivar Smolin (et), Ilkka Tuohela (fi), Clytie Siddall (vi),
+Ankit Patel (gu), Francisco Javier F. Serrador (es),
+I. Felix (ta), Hendrik Richter (de), Daniel Nylander (sv),
+Hendrik Richter (de), Ignacio Casal Quinteiro (gl),
+Kjartan Maraas (nb), Pawan Chitrakar (ne), Funda Wang 
+Ahmad Riza H Nst (id), Pema Geyleg (dz)
 
 Bug fixes and features :
 
-Arvind, Andre Klapper, Boby Wang, Yuri Pankov, 
-Harish Krishnaswamy, Srinivasa Ragavan, Johnny Jacob,
-Raghavendran, Shree Krishnan, Ushveen Kaur, Karsten
-Brackelmann, Michael Zucchi, Hiroyuki Ikezoe,
-Rajeev Ramanathan, Chenthill Palanisamy, Li Yuan,
-Devashish Sharma, Mikhail Zabaluev, Ross Burton,  
-Sankar, Benoît Dejean, Vandana Shenoy, Julio M. Merino
-Vidal, Luca Ferretti.
+#336963 - Srinivasa Ragavan
+#324241 - Johnny Jacob
+#336963 - Ushveen Kaur
+#260354 - Arvind_evo
+#335423 - Chris Heath
+#331694 - Harish 
+#341381 - Li Yuan
+#341334 - Srinivasa Ragavan
+#341525 - Li Yuan
+#268592 - Arvind_evo 
+#333003 - Gary Coady
+#330633 - Arvind_evo
+#345969 - Li Yuan
+#345510 - Li Yuan
+#345923 - Li Yuan
+#34522 - Wang Xin
+#339217 - Aishwarya K
+#304648 - Rajeev
+#344630 - Wang Xin
+#341961 - Hiroyuki Ikezoe
+#341369 - Hiroyuki Ikezoe
+#347381 - Boby Wang
+#332909 - Ushveen Kaur
+#338710 - Devashish
+#344227 - Hiroyuki Ikezoe
+#342646 - Hiroyuki Ikezoe
+#332347 - Oswald Rodrigues
+#335423 - Chris Heath
+#310489 - Chenthill 
+#336853 - Julio M. Merino Vidal
+#333821 - Varadhan
+#329740 - Chenthill
+#347973 - Chenthill
+#332387 - Bastien Nocera
+
+
+#335410 - (Andre, Vincent Fretin, Olav Vitters)
+A typo fix that was causing experimental plugins
+to be skipped (Iain Buchanan)
+
+Other major fixes :
+
+* Use pango Layout for printing - Dave Malcolm
+* Tons for Win32 related fixes - Tor Lillqvist
+
+Evolution 2.6.2 2006-05-29 
+---------------------------
+Bug fixes since last release :
+http://go-evolution.org/Evo2.6.2#Evolution
 
-Evolution 2.7.4 2006-07-10
---------------------------
-Updated Translations:
+Evolution 2.6.1 2006-04-10 
+---------------------------
 
-Francisco Javier F. Serrador, Jovan Naumovski,
-Changwoo Ryu, Nikos Charonitakis, Rostislav
-Raykov, Ilkka Tuohela, Ivar Smolin, Ahmad Riza
-H Nst, Inaki Larranaga, Ankit Patel, Vincent
-van Adrighem, Runa Bhattacharjee, Benoît Dejean,
-Theppitak Karoonboonyanan, Pawan Chitrakar, I.Felix,
-Rajesh Ranjan, Kjartan Maraas, Chao-Hsiung Liao,
-Clytie Siddall, Hendrik Richter, Daniel Nylander.
-
-Bug fixes :
-
-Andreas Köhler, Harish Krishnaswamy, Ushveen Kaur,
-Andre Klapper, Johnny Jacob, Mathew Barnes, Arvind_evo,
-Srinivasa Ragavan, Tor Lillqvist, Li Yuan, Chenthill,
-Wang Xin, Rajeev Ramanathan, Aishwarya K, Hiroyuki Ikezoe,
-Simon Zheng, Devashish Sharma, Oswald Rodrigues, Harry Lu,
-Oswald, Sushma Rai, Mathew Barnes, Karsten Bräckelmann,
-Sankar P, Frederic Peters.
-
-Evolution 2.7.3 2006-06-12
---------------------------
+Bug fixes since last release :
+http://go-evolution.org/Evo2.6.1#Evolution
 
-Updated Translations contributed by
-Ilkka Tuohela, Ignacio Casal Quinteiro, Kjartan Maraas,
-Ankit Patel, Francisco Javier F. Serrador,
-Funda Wang, Pema Geyleg, Vincent van Adrighem,
-Clytie Siddall, Stanislav Brabec, Priit Laes,
-Alexander Shopov.
-
-Bug fixes and other changes : 
-Srinivasa Ragavan, Li Yuan, Harish Krishnaswamy,
-Chris Heath, Jeffrey Stedfast, Gary Coady, Tor Lillqvist,
-Frederic Peters, Wang Xin, Hiroyuki Ikezoe, Li Yuan,
-Parthasarathi Susarla,  Simon Zheng, Devashish Sharma,
-Roozbeh Pournader, Johnny Jacob, Federico Mena Quintero
-Ed Catmur,  Carlos Garcia Campos, Sushma Rai, Sankar P,
-David Richards, Chenthill Palanisamy, 
-
-Evolution 2.7.1 2006-04-24
+Evolution 2.6.0 2006-03-13 
 ---------------------------
 
-First release of 2.7 development series.
+What is new since Evolution 2.4 ?
+---------------------------------
+
+	- a new Memo Component
+	- a new Look for the Event/Task/Meeting Editor
+	- Calendar Publishing support
+	- CalDAV support
+	- Network Manager support
+	- HULA connectivity support
+	- Improved GroupWise support
+	- Improved Event Recurrence support
+	- Calendar Tooltips
+	- CSV/tab importers for Mozilla, Outlook and Evolution formats
+	- Contact list support for LDAP addressbooks
+	- Support for saving Advanced Searches for Address books
+	- Support for Prioritizing messages in the composer
+	- Lots of bug fixes and lots of other User Interface Improvements
+	- Updated Translations
 
-What is new ?
--------------
+Bug fixes since last release :
+http://go-evolution.org/Evo2.6.0#Evolution
 
-* Integration of Evolution Calendar with Cairo
 
 Evolution 2.5.92 2006-02-27
 ---------------------------
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index 3a2b259572..51e9079c30 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,38 +1,3 @@
-2006-07-13  Andre Klapper  <a9016009@gmx.de>
-
-	* calendar/ea-day-view.c: Added translator comments to
-	some strings. Fixes bug #331016. Thanks to Boby Wang.
-
-2006-06-22  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-table/gal-a11y-e-cell-text.c: (ect_check):
-	Revert Rajeev's patch for #330728, #332727..
-
-2006-06-12  Li Yuan <li.yuan@sun.com>
-
-	* Makefile.am, e-table/Makefile.am,
-	e-text/Makefile.am: Do not install header files, and make sure
-	they will be included in the tarball when make dist.
-
-2006-05-16  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am, e-table/Makefile.am
-	e-text/Makefile.am: Revert the earlier patch.
-	They are needed, after all.
-
-2006-05-15  Harish Krishnaswamy  <kharish@novell.com>
-
-	Patch submitted by Li Yuan <li.yuan@sun.com>
-	* Makefile.am, e-table/Makefile.am, 
-	e-text/Makefile.am: Do not install header files.
-
-2006-05-08  Li Yuan <li.yuan@sun.com>
-
-	Fix for #333279.
-
-	* e-table/gal-a11y-e-table-item.c: (table_is_row_selected):
-	If row<0, just return FALSE.
-
 2006-04-28  Boby Wang <boby.wang@sun.com>
 
 	Fix for #339136
@@ -60,16 +25,6 @@
 	* ea-factory.h: Disable accessible code when accessibility is not enabled
 	* gal-a11y-factory.h: Remove some unused code
 
-2006-04-27  Boby Wang <boby.wang@sun.com>
-
-	Fix for #332821
-
-	* widgets/Makefile.am:
-	* widgets/ea-expander.[ch]:
-	Add two new files to implement the accessibility of EExpander.
-	* widgets/ea-widgets.[ch]:(e_expander_a11y_init):
-	Implement the accessibility of EExpander.
-
 2006-04-24  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
 
 	reviewed by: Harish Krishnaswamy <kharish@novell.com> 
@@ -78,12 +33,6 @@
 	Fixes the corrupted reference to cell_view->ecell
 	Fix for #330728, #332727.
 
-2006-03-20  Boby Wang <boby.wang@sun.com>
-	Fix for #319308
-
-	* addressbook/ea-minicard-view.c: (ea_minicard_view_get_name):
-	add the folder name to the name of current minicard view
-
 2006-03-06  Harry Lu <harry.lu@sun.com>
 
 	Fix for 331550.
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index fa5631a859..be56309eae 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* vim:expandtab:shiftwidth=8:tabstop=8:
+ */
 /* Evolution Accessibility: ea-cal-view-event.c
  *
  * Copyright (C) 2003 Ximian, Inc.
@@ -131,7 +133,7 @@ ea_cal_view_event_class_init (EaCalViewEventClass *klass)
 
 	parent_class = g_type_class_peek_parent (klass);
 
-	gobject_class->dispose = ea_cal_view_event_dispose;
+        gobject_class->dispose = ea_cal_view_event_dispose;
 
 	class->get_name = ea_cal_view_event_get_name;
 	class->get_description = ea_cal_view_event_get_description;
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
index d10deb49bd..b85b40087f 100644
--- a/a11y/calendar/ea-day-view.c
+++ b/a11y/calendar/ea-day-view.c
@@ -146,25 +146,15 @@ ea_day_view_get_name (AtkObject *accessible)
 	/* the child main item is always there */
 	--n_events;
 	if (n_events >= 1)
-		/* To translators: Here, "It" is either like "Work Week View: July 
-		10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006." */
 		event_str = g_strdup_printf (ngettext ("It has %d event.", "It has %d events.", n_events), n_events);
 	else
-		/* To translators: Here, "It" is either like "Work Week View: July 
-		10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006." */
 		event_str = g_strdup (_("It has no events."));
 
 	view_type = gnome_calendar_get_view (gcal);
 	if (view_type == GNOME_CAL_WORK_WEEK_VIEW)
-		/* 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." */
 		name_str = g_strdup_printf (_("Work Week View: %s. %s"),
 						label_text, event_str);
 	else
-		/* 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." */
 		name_str = g_strdup_printf (_("Day View: %s. %s"),
 						label_text, event_str);
 
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index e1a485cd55..4a845b6d22 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -66,7 +66,7 @@ ect_check (gpointer a11y)
 		|| gaec->model_col <0 || gaec->model_col >= e_table_model_column_count (item->table_model))
 		return FALSE;
 
-	if (!E_IS_CELL_TEXT (gaec->cell_view->ecell))
+	if (!GAL_A11Y_IS_E_CELL_TEXT (gaec->cell_view->ecell))
 		return FALSE;
 
 	return TRUE;
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
index 34b7f4ceff..0ff6872350 100644
--- a/a11y/ea-factory.h
+++ b/a11y/ea-factory.h
@@ -111,7 +111,7 @@ type_as_function ## _factory_get_type (void)					\
                 atk_registry_set_factory_type (atk_get_default_registry (),     \
                                       obj_type,                                 \
                                       type_as_function ## _factory_get_type ());\
-        }									\
+        }                                                                       \
 }
 
 #endif /* _EA_FACTORY_H__ */
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 1a4796bfb1..8ba72fdaa2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,100 +1,27 @@
-2006-07-24  Sushma Rai  <rsushma@novell.com>
-
-	* gui/widgets/e-addressbook-view.c (search_activated): Commented out
-	reference to undefined function eab_search_dialog_new(). See #347910. 
-
-2006-07-24  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-editor/e-contact-editor-im.c: Added support for gadu gadu im 
-	in contact entry.
-
-2006-07-22  Mikhail Zabaluev <mhz@altlinux.org>
-
-	Reviewed by Harish Krishnaswamy <kharish@novell.com>
-
-	* printing/Makefile.am: Add missing .la files
-	Fixes #334206.	
-
-2006-07-20  Boby Wang <boby.wang@sun.com>
+2006-07-22  Boby Wang <boby.wang@sun.com>
 
 	Reviewed by Harish Krishnaswamy <kharish@novell.com>
-	
-	** Fix bug #347381
+	** Fixes bug #347381
 
 	* gui/contact-editor/e-contact-editor.c: (image_clicked):
 	Set the image chooser dialog to modal dialog, then we can focus back to
 	the chooser dialog by <ALT + TAB>
 
-2006-07-19  Devashish Sharma  <sdevashish@novell.com>
-
-	* addressbook/gui/widgets/e-minicard.c :
-	* addressbook/gui/widgets/eab-contact-display.c : In the minicard view
-	and preview pane, show the type(home, work) of email instead of showing 
-	email1,email2.
-	Fixes Bug 343816.
-
-2006-07-18  Ross Burton  <ross@openedhand.com>
-
-	* addressbook/gui/contact-editor/e-contact-editor.c:
-	* addressbook/gui/contact-list-editor/e-contact-list-editor.c:
-	* addressbook/gui/widgets/eab-contact-display.c:
-	Fix for EContactPhoto changes.  Partially fixed by Hiroyuki Ikezoe
-	<poincare@ikezoe.net>, finished by myself.  (#347870).
-
-2006-07-18  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/contact-editor/contact-editor.glade: 
-	* gui/contact-editor/fulladdr.glade: 
-	* gui/contact-editor/fullname.glade: 
-	* gui/contact-editor/im.glade: 
-	* gui/contact-list-editor/contact-list-editor.glade: 
-	remove "*" from translation. Fixes bug #331147.
-
-2006-19-06 Ushveen Kaur <kushveen@novell.com>
+2006-07-14  Ushveen Kaur <kushveen@novell.com>
 
-	** Fixes bug #332909
+	** Fix for bug #332909
 	
-	* gui/contact-editor/e-contact-editor.[ch]: once asked for resizing, it 
-	wont ask again.
-
-2006-07-08  Aishwarya K  <aishkalyan@gmail.com>
-
-	Fix for #332963
-	* e-contact-editor.c: Set the mnemonic character for "No image"
-
-2006-06-30  Johnny Jacob  <jjohnny@novell.com>
-	* gui/cal-search-bar.c: (get_current_category),
-	(get_category_sexp), (notify_e_cal_view_contains),
-	(notify_category_is), (regen_query), (regen_view_query),
-	(make_suboptions), (cal_search_bar_construct): Added/Removed code
-	for new search ui.
-	* gui/e-tasks.c: (search_bar_sexp_changed_cb):
-	Added/Removed code for search ui.
-
-2006-06-29  simon.zheng  <simon.zheng@sun.com>
-
-	* gui/widgets/eab-gui-util.c: (file_exists): Convert filename
-	from glib encoding to utf8 encoding.
-	Fixes Bug #339151
-
-2006-06-27  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/widgets/eab-gui-util.c (do_delete) :Fix for 
-	Bug #333691.
-
-2006-06-16  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c :
-	Fix for Bug #317511
-
-2006-06-15  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/component/addressbook-view.c : Drag-n-drop contacts now
-	defaults to Moving the contact and the contacts moved will be 
-	instantly removed from the source addressbook.
-	Fixes Bug #337085 and #337086
+	* gui/contact-editor/e-contact-editor.[ch]: (image_chooser_changed),
+	(fill_in_simple_field), (extract_simple_field), (image_selected),
+	(image_cleared), (e_contact_editor_init): Remember the image change
+	and prompt only if changed.
 
+2006-07-06  Devashish Sharma  <sdevashish@novell.com>
+  	 
+	** Fixes bug #338710
+	* gui/contact-editor/e-contact-quick-add.c : Right click add to
+	contacts doesnt work on email addresses in received mails.
+  	 
 2006-06-14  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes bug #344227
@@ -114,66 +41,19 @@
 	created patch to make _F,_m,_S mnemonics in contact-quick add 
 	dialog work. Fixes bug #332347.
 
-2006-06-12  simon.zheng  <simon.zheng@sun.com>
-
-        Fix for #336453
-
-	* gui/component/addressbook-config.c: (addressbook_ldap_init):
-        Add SunLDAP library support - a variant of Netscape LDAP.
-
-2006-06-12  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c : If company name
-	is set and full name and file as are not set, set company name
-	as full name and fle name.
-	Fixes Bug #206320, 342903
-	
-2006-06-12  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-quick-add.c :Fix for Bug #341465
-
 2006-06-09  Chris Heath <chris@heathens.co.nz>
 
-	* gui/widgets/eab-popup-control.c (eab_popup_control_set_free_form): Fix
+	* gui/widgets/eab-popup-control.c (eab_popup_control_set_free_form): Fix 
 	memory leak
 	* gui/contact-editor/e-contact-quick-add.c (quick_add_merge_contact): Ditto.
 	Fixes bug #335423.
 
-2006-05-25  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-quick-add.c : Right click add to
-	contacts doesnt work on email addresses in received mails.
-
-2006-05-25  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/widgets/eab-contact-display.c : Name of some fields differ 
-	when seen in preview pane and contact editor (Video Chat in contact
-	editor and Video Conferencing in preview pane).
-
-2006-05-25  Devashish Sharma  <sdevashish@novel.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c : Contacts
-	added to a contact list cant be added again.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added code to save vcards/addressbooks to remote shares
-
-	* gui/widgets/eab-gui-util.c: (save_it), (eab_contact_save),
-	(eab_contact_list_save):
-
 2006-05-17  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	Fix for gnome bug #341931, farsiweb #562
 	* gui/contact-editor/e-contact-editor.c: Mark a few messages for
 	  translation.
 
-2006-05-12  simon.zheng  <simon.zheng@sun.com>
-
-	Fix for Bug 341521
-	* gui/contact-editor/contact-editor.glade: Change the label
-	name of categories button.
-
 2006-04-27  Boby Wang <boby.wang@sun.com>
 
 	** Fix for bug # 336470
@@ -181,50 +61,12 @@
 	* gui/contact-editor/fullname.glade:
 	Add labelled-by relationship to gtkcombo.
 
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Patch from PR Suman to add icons missing in menu items.
-
-	* gui/component/addressbook-view.c: Added icons for forward and send.
-
-2006-02-18  M Victor Aloysius J <victoraloy@gmail.com>
-
-	** Fixes bug #317512
-	
-	* gui/eab-contact-editot.c:
-	* gui/eab-popup.h:
-	* gui/eab-popup.c:
-	Hyperlinked email-addresses and websites in preview pane support right 
-	click mouse options. 
-
-2006-04-21  Simon Zheng  <simon.zheng@sun.com>
-
-	Fix for bug #337604
-	* printing/e-contact-print.c: (e_contact_print_response):
-	Should destory the print dialog window after clicking Print
-	Preview button.
-
-2006-04-21  Devashish Sharma  <sdevashish@novell.com>
-
-	Fix for Bug 333869.
-	* printing/e-contact-print-types.h: Remove member letter_tabs in
-	struct _EContactPrintStyle.
-	* printing/e-contact-print.c (e_contact_start_new_page),
-	(e_contact_get_contact_size), (e_contact_print_contact),
-	(e_contact_start_new_column), (complete_sequence),
-	(e_contact_build_style), (e_contact_print_response),
-	(e_contact_print_preview):
-	To be consistent with minicard view, remove functions and data structure 
-	associated with letter tab printing.
-	Patch by Simon Zheng <simon.zheng@sun.com>.
-
-2006-04-21  Devashish Sharma  <sdevashish@novell.com>
+2006-04-21  simon.zheng  <simon.zheng@sun.com>
 
 	Fix for Bug 336713
-	* gui/merging/eab-contact-merging.c: (cancelit): After selecting 
-	"cancel duplicate" when pasting contacts, can't remove those
-	EContactMergingLookup. Make finished_lookup() available. 
-	Patch by Simon Zheng <simon.zheng@sun.com>.
+        * gui/merging/eab-contact-merging.c: (cancelit): After selecting
+        "cancel duplicate" when pasting contacts, can't remove those
+        EContactMergingLookup. Make finished_lookup() available.
 
 2006-03-29  Li Yuan <li.yuan@sun.com>
 
@@ -234,21 +76,6 @@
 	we should return false if it is not a del event to make gtktreeview
 	deal the rest of keys.
 
-2006-03-10  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/component/ldap-config.glade : ldap port numbers
-	were marked for translation. Fixes 331020.
-
-2006-03-10  Devashish Sharma  <sdevashish@novell.com>
-
-	Fix for bug #333855
-	* gui/contact-editor/e-contact-editor.c (full_name_response),
-	(full_name_key_press_event), (full_name_editor_delete_event_cb),
-	(full_name_clicked):
-	The fullname dialog should be non-modal as well as categories dialog.
-	Patch by Simon Zheng <simon.zheng@sun.com>. Made some changes to the 
-	patch and committed.
-
 2006-03-06  Devashish Sharma <sdevashish@novell.com>
 
 	* gui/contact-editor/e-contact-editor.c (fill_in_address_textview):
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index d6da6a09cc..82c4c50f2b 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -622,10 +622,7 @@ static EPixmap pixmaps [] = {
 	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "stock_copy", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "stock_paste", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "stock_delete", E_ICON_SIZE_MENU),
-	
-	E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendContactToOther", "stock_mail-forward", E_ICON_SIZE_MENU),	
-	E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendMessageToContact", "stock_mail-send", E_ICON_SIZE_MENU),
-	
+
 	E_PIXMAP ("/Toolbar/ContactsPrint", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/ContactDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR),
 	
@@ -633,7 +630,7 @@ static EPixmap pixmaps [] = {
 	E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/FolderPlaceholder/Folder/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderSave", "stock_save-as", E_ICON_SIZE_MENU),
-	
+
 	E_PIXMAP_END
 };
 
@@ -1193,9 +1190,15 @@ selector_tree_drag_data_received (GtkWidget *widget,
 
 	eab_book_and_contact_list_from_string (data->data, &source_book, &contactlist);
 
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	g_object_get (v->model, "book",&source_book, NULL);
+	if (source_book) {
+		if (!e_book_open (source_book, FALSE, NULL)) {
+			g_warning (G_STRLOC ": Couldn't open source EBook.");
+			g_object_unref (source_book);
+			source_book = NULL;
+		}
+	} else {
+		g_warning (G_STRLOC ": No source EBook provided.");
+	}
 
 	/* Set up merge context */
 
@@ -1207,7 +1210,7 @@ selector_tree_drag_data_received (GtkWidget *widget,
 	merge_context->current_contact = contactlist->data;
 	merge_context->remaining_contacts = g_list_delete_link (contactlist, contactlist);
 
-	merge_context->remove_from_source = context->suggested_action == GDK_ACTION_MOVE ? FALSE : TRUE;
+	merge_context->remove_from_source = context->suggested_action == GDK_ACTION_MOVE ? TRUE : FALSE;
 
 	/* Start merge */
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index b40f780564..5e12cecaee 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -186,7 +186,6 @@ im_service [] =
 	{ E_CONTACT_IM_AIM,       N_ ("AIM")       },
 	{ E_CONTACT_IM_JABBER,    N_ ("Jabber")    },
 	{ E_CONTACT_IM_YAHOO,     N_ ("Yahoo")     },
-	{ E_CONTACT_IM_GADUGADU,  N_ ("Gadu-Gadu") },
 	{ E_CONTACT_IM_MSN,       N_ ("MSN")       },
 	{ E_CONTACT_IM_ICQ,       N_ ("ICQ")       },
 	{ E_CONTACT_IM_GROUPWISE, N_ ("GroupWise") }
@@ -608,23 +607,15 @@ sensitize_ok (EContactEditor *ce)
 	gboolean   allow_save;
 	GtkWidget *entry_fullname;
 	GtkWidget *entry_file_as;
-	GtkWidget *company_name;
 	entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" );
 	entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as");
-	company_name = glade_xml_get_widget (ce->gui, "entry-company");
 	const char *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname));
 	const char *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as));
-	const char *company_name_string = gtk_entry_get_text (GTK_ENTRY (company_name));
 
 	allow_save = ce->target_editable && ce->changed ? TRUE : FALSE;
 
-	if (!strcmp (name_entry_string, "") || !strcmp (file_as_entry_string, "")) {
-		if (strcmp (company_name_string , "")) {
-			allow_save = TRUE;
-		}
-		else
-			allow_save = FALSE;
-	}
+	if (!strcmp (name_entry_string, "") || !strcmp (file_as_entry_string, ""))
+		allow_save = FALSE;
 	widget = glade_xml_get_widget (ce->gui, "button-ok");
 	gtk_widget_set_sensitive (widget, allow_save);
 }
@@ -2193,10 +2184,10 @@ fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
 	}
 	else if (E_IS_IMAGE_CHOOSER (widget)) {
 		EContactPhoto *photo = e_contact_get (contact, field_id);
-		if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+		if (photo) {
 			e_image_chooser_set_image_data (E_IMAGE_CHOOSER (widget),
-							photo->data.inlined.data,
-							photo->data.inlined.length);
+							photo->data,
+							photo->length);
 			editor->image_set = TRUE;
 		}
 		else {
@@ -2260,16 +2251,15 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
 	}
 	else if (E_IS_IMAGE_CHOOSER (widget)) {
 		EContactPhoto photo;
-		photo.type = E_CONTACT_PHOTO_TYPE_INLINED;
 		if (editor->image_changed)
 		{
 			if (editor->image_set &&
 			    e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget),
-							    &photo.data.inlined.data, &photo.data.inlined.length)) {
+							    &photo.data, &photo.length)) {
 				GdkPixbuf *pixbuf, *new;
 				GdkPixbufLoader *loader = gdk_pixbuf_loader_new();
 				
-				gdk_pixbuf_loader_write (loader, photo.data.inlined.data, photo.data.inlined.length, NULL);
+				gdk_pixbuf_loader_write (loader, photo.data, photo.length, NULL);
 				gdk_pixbuf_loader_close (loader, NULL);
 				
 				pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
@@ -2293,8 +2283,8 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
 						
 						new = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
 						if (new) {
-							g_free(photo.data.inlined.data);
-							gdk_pixbuf_save_to_buffer (new, &photo.data.inlined.data, &photo.data.inlined.length, "jpeg", NULL, "quality", "100", NULL);
+							g_free(photo.data);
+							gdk_pixbuf_save_to_buffer (new, &photo.data, &photo.length, "jpeg", NULL, "quality", "100", NULL);
 							g_object_unref (new);
 						}
 						
@@ -2307,7 +2297,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
 				
 				e_contact_set (contact, field_id, &photo);
 				
-				g_free (photo.data.inlined.data);
+				g_free (photo.data);
 				
 			}
 			else {
@@ -2566,19 +2556,40 @@ source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor
 						   (EBookCallback) new_target_cb, editor);
 }
 
+static gboolean
+full_name_key_press_event( GtkWidget *widget, GdkEventKey *event, EContactEditor *editor)
+{
+	if (event->keyval == GDK_Return) {
+		gtk_dialog_response (GTK_DIALOG (widget), GTK_RESPONSE_OK);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static void
-full_name_response (GtkDialog *dialog, int response, EContactEditor *editor)
+full_name_clicked (GtkWidget *button, EContactEditor *editor)
 {
-	EContactName *name;
-	GtkWidget *fname_widget;
-	int style = 0;
-	gboolean editable = FALSE;
+	GtkDialog *dialog = GTK_DIALOG (e_contact_editor_fullname_new (editor->name));
+	gboolean fullname_supported;
+	int result;
 
-	g_object_get (dialog, 
-		      "editable", &editable,
+	fullname_supported = is_field_supported (editor, E_CONTACT_FULL_NAME);
+
+	g_object_set (dialog,
+		      "editable", fullname_supported & editor->target_editable,
 		      NULL);
 
-	if (editable && response == GTK_RESPONSE_OK) {
+	g_signal_connect (GTK_WIDGET (dialog), "key-press-event", G_CALLBACK (full_name_key_press_event), editor);
+
+	gtk_widget_show (GTK_WIDGET(dialog));
+	result = gtk_dialog_run (dialog);
+	gtk_widget_hide (GTK_WIDGET (dialog));
+
+	if (fullname_supported && editor->target_editable && result == GTK_RESPONSE_OK) {
+		EContactName *name;
+		GtkWidget *fname_widget;
+		int style = 0;
+
 		g_object_get (dialog,
 			      "name", &name,
 			      NULL);
@@ -2600,45 +2611,11 @@ full_name_response (GtkDialog *dialog, int response, EContactEditor *editor)
 
 		file_as_set_style(editor, style);
 	}
-	gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
-static gint
-full_name_editor_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	if (widget) {
-		if (GTK_IS_WIDGET (widget))
-			gtk_widget_destroy(widget);
-		}
-	return TRUE;
-}
-
-static void
-full_name_clicked (GtkWidget *button, EContactEditor *editor)
-{
-	GtkDialog *dialog = GTK_DIALOG (e_contact_editor_fullname_new (editor->name));
-	gboolean fullname_supported;
-	
-	
-	fullname_supported = is_field_supported (editor, E_CONTACT_FULL_NAME);
-
-	g_object_set (dialog,
-		      "editable", fullname_supported & editor->target_editable,
-		      NULL);
-
-	g_signal_connect(dialog, "response",
-			G_CALLBACK (full_name_response), editor);
-	
-	/* Close the fullname dialog if the editor is closed */
-	g_signal_connect_swapped (EAB_EDITOR (editor), "editor_closed",
-			    G_CALLBACK (full_name_editor_delete_event_cb), GTK_WIDGET (dialog));
-
-	gtk_widget_show (GTK_WIDGET(dialog));
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
-
 static void
-categories_response (GtkDialog *dialog, int response, EContactEditor *editor)
+response (GtkDialog *dialog, int response, EContactEditor *editor)
 {
 	const char *categories;
 	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
@@ -2653,13 +2630,22 @@ categories_response (GtkDialog *dialog, int response, EContactEditor *editor)
 	gtk_widget_hide(GTK_WIDGET(dialog));
 }
 
+static gboolean
+categories_key_press_event( GtkWidget *widget, GdkEventKey *event, EContactEditor *editor)
+{
+	if (event->keyval == GDK_Return) {
+		gtk_dialog_response (GTK_DIALOG (widget), GTK_RESPONSE_OK);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static gint
-categories_editor_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
+editor_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-	if (widget) {
+	if (widget)
 		if (GTK_IS_WIDGET (widget))
 			gtk_widget_destroy(widget);
-		}
 	return TRUE;
 }
 
@@ -2681,12 +2667,14 @@ categories_clicked (GtkWidget *button, EContactEditor *editor)
 		return;
 	}
 	
+	g_signal_connect (GTK_WIDGET (dialog), "key-press-event", G_CALLBACK (categories_key_press_event), editor);
+
 	g_signal_connect(dialog, "response",
-			G_CALLBACK (categories_response), editor);
+			G_CALLBACK (response), editor);
 	
 	/* Close the category dialog if the editor is closed*/
 	g_signal_connect_swapped (EAB_EDITOR (editor), "editor_closed",
-			    G_CALLBACK (categories_editor_delete_event_cb), GTK_WIDGET (dialog));
+			    G_CALLBACK (editor_delete_event_cb), GTK_WIDGET (dialog));
 	
 	gtk_widget_show(GTK_WIDGET(dialog));
 	g_free (categories);
@@ -2790,7 +2778,7 @@ static void
 image_clicked (GtkWidget *button, EContactEditor *editor)
 {
 	const gchar *title = _("Please select an image for this contact");
-	const gchar *no_image = _("_No image");
+	const gchar *no_image = _("No image");
 	GtkImage *preview;
 
 	if (!editor->file_selector) {
@@ -2996,24 +2984,6 @@ save_contact (EContactEditor *ce, gboolean should_close)
 		if (e_error_run (GTK_WINDOW (ce->app), "addressbook:prompt-move", NULL) == GTK_RESPONSE_NO)
 			return;
 	}
-
-	GtkWidget *entry_fullname;
-	GtkWidget *entry_file_as;
-	GtkWidget *company_name;
-	entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" );
-	entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as");
-	company_name = glade_xml_get_widget (ce->gui, "entry-company");
-	const char *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname));
-	const char *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as));
-	const char *company_name_string = gtk_entry_get_text (GTK_ENTRY (company_name));
-
-	if (strcmp (company_name_string , "")) {
-		if (!strcmp (name_entry_string, "")) 
-			gtk_entry_set_text (GTK_ENTRY (entry_fullname), company_name_string);
-		if (!strcmp (file_as_entry_string, ""))
-			gtk_entry_set_text (GTK_ENTRY (entry_file_as), company_name_string);
-	}
-
 	extract_all (ce);
 	
 	if (!e_contact_editor_is_valid (EAB_EDITOR (ce))) {
@@ -3060,7 +3030,6 @@ static const EContactField  non_string_fields [] = {
 	E_CONTACT_IM_GROUPWISE,
 	E_CONTACT_IM_JABBER,
 	E_CONTACT_IM_YAHOO,
-	E_CONTACT_IM_GADUGADU,
 	E_CONTACT_IM_MSN,
 	E_CONTACT_IM_ICQ,
 	E_CONTACT_PHOTO,
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 07be81fd1d..e6c3c6b777 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -345,7 +345,7 @@ build_quick_add_dialog (QuickAdd *qa)
 			  1, 2, 0, 1,
 			  GTK_EXPAND | GTK_FILL, 0, xpad, ypad);
 
-	label = gtk_label_new_with_mnemonic (_("E_mail"));
+	label = gtk_label_new_with_mnemonic (_("E-_mail"));
 	gtk_label_set_mnemonic_widget ((GtkLabel *)label, qa->email_entry);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 
@@ -373,6 +373,7 @@ build_quick_add_dialog (QuickAdd *qa)
 			    GTK_WIDGET (table),
 			    FALSE, FALSE, 0);
 	gtk_widget_show_all (GTK_WIDGET (table));
+			  
 	
 	return dialog;
 }
diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade
index 2271304017..ae6bc76ef6 100644
--- a/addressbook/gui/contact-editor/fullname.glade
+++ b/addressbook/gui/contact-editor/fullname.glade
@@ -93,7 +93,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
+		  <property name="invisible_char" translatable="yes">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 	      </child>
@@ -289,7 +289,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
+		  <property name="invisible_char" translatable="yes">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 	      </child>
@@ -495,7 +495,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
+	      <property name="invisible_char" translatable="yes">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -516,7 +516,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
+	      <property name="invisible_char" translatable="yes">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -537,7 +537,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
+	      <property name="invisible_char" translatable="yes">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 66df83b9eb..bf541bb05c 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -166,9 +166,10 @@ enum {
 };
 
 static ESearchBarItem addressbook_search_option_items[] = {
-	{ N_("Name begins with"), ESB_FULL_NAME, ESB_ITEMTYPE_RADIO },
-	{ N_("Email begins with"), ESB_EMAIL, ESB_ITEMTYPE_RADIO },
-	{ N_("Any field contains"), ESB_ANY, ESB_ITEMTYPE_RADIO },
+	{ N_("Name begins with"), ESB_FULL_NAME, NULL },
+	{ N_("Email begins with"), ESB_EMAIL, NULL },
+	{ N_("Category is"), ESB_CATEGORY, NULL }, /* We attach subitems below */
+	{ N_("Any field contains"), ESB_ANY, NULL },
 	{ NULL, -1, NULL }
 };
 
@@ -1389,7 +1390,6 @@ create_treeview_view (EABView *view)
 	scrolled = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_shadow (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN);
 	treeview = gtk_tree_view_new_with_model (adapter);
-	g_object_unref (adapter);
 
 	gtk_widget_show (treeview);
 
@@ -1483,17 +1483,19 @@ static void
 search_activated (ESearchBar *esb, EABView *v)
 {
 	GList *master_list;
-	char *search_word, *search_query, *view_sexp;
+	char *search_word, *search_query;
 	const char *category_name;
 	int search_type, subid;
 
+	g_message ("in search_activated");
+
 	g_object_get(esb,
 		     "text", &search_word,
 		     "item_id", &search_type,
 		     NULL);
 
 	if (search_type == E_FILTERBAR_ADVANCED_ID) {
-		// gtk_widget_show(eab_search_dialog_new(v));
+		//gtk_widget_show(eab_search_dialog_new(v));
 	}
 	else {
 		if ((search_word && strlen (search_word)) || search_type == ESB_CATEGORY) {
@@ -1512,26 +1514,26 @@ search_activated (ESearchBar *esb, EABView *v)
 				search_query = g_strdup_printf ("(beginswith \"email\" %s)",
 								s->str);
 				break;
+			case ESB_CATEGORY:
+				subid = e_search_bar_get_subitem_id (esb);
+
+				if (subid < 0 || subid == G_MAXINT) {
+					/* match everything */
+					search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
+				} else {
+					master_list = get_master_list ();
+					category_name = g_list_nth_data (master_list, subid);
+					search_query = g_strdup_printf ("(is \"category_list\" \"%s\")", category_name);
+				}
+				break;
 			default:
 				search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
 				break;
 			}
 			g_string_free (s, TRUE);
-
-		} else 
+		} else
 			search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
 
-		/* Merge view and sexp */
-		subid = e_search_bar_get_viewitem_id (esb);
-
-		if (subid) {
-			master_list = get_master_list (); 
-			category_name = g_list_nth_data (master_list, subid-1);
-			view_sexp = g_strdup_printf ("(is \"category_list\" \"%s\")", category_name);
-			search_query = g_strconcat ("(and ", view_sexp, search_query, ")", NULL);
-			g_free (view_sexp);
-		}
-
 		if (search_query)
 			g_object_set (v,
 				      "query", search_query,
@@ -1570,8 +1572,8 @@ query_changed (ESearchBar *esb, EABView *view)
 static int
 compare_subitems (const void *a, const void *b)
 {
-	const ESearchBarItem *subitem_a = a;
-	const ESearchBarItem *subitem_b = b;
+	const ESearchBarSubitem *subitem_a = a;
+	const ESearchBarSubitem *subitem_b = b;
 	char *collate_a, *collate_b;
 	int ret;
 
@@ -1587,32 +1589,33 @@ compare_subitems (const void *a, const void *b)
 }
 
 static void
-
 make_suboptions (EABView *view)
 {
-	ESearchBarItem *subitems, *s;
+	ESearchBarSubitem *subitems, *s;
 	GList *master_list;
 	gint i, N;
 
 	master_list = get_master_list ();
 	N = g_list_length (master_list);
-	subitems = g_new (ESearchBarItem, N+2);
+	subitems = g_new (ESearchBarSubitem, N+2);
 
-	subitems[0].id = 0;
+	subitems[0].id = G_MAXINT;
 	subitems[0].text = g_strdup (_("Any Category"));
+	subitems[0].translate = FALSE;
 
 	for (i=0; i<N; ++i) {
 		const char *category = g_list_nth_data (master_list, i);
-		subitems[i+1].id = i+1;
+
+		subitems[i+1].id = i;
 		subitems[i+1].text = g_strdup (category);
+		subitems[i+1].translate = FALSE;
 	}
-
 	subitems[N+1].id = -1;
 	subitems[N+1].text = NULL;
 
 	qsort (subitems + 1, N, sizeof (subitems[0]), compare_subitems);
 
-	e_search_bar_set_viewoption ( (ESearchBar *) view->search, ESB_CATEGORY, subitems);
+	e_search_bar_set_suboption ( (ESearchBar *) view->search, ESB_CATEGORY, subitems);
 
 	for (s = subitems; s->id != -1; s++) {
 		if (s->text)
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 9729b97eb4..d20318648a 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "eab-contact-display.h"
-#include "eab-popup.h"
 
 #include "eab-gui-util.h"
 #include "e-util/e-html-utils.h"
@@ -43,21 +42,8 @@
 
 struct _EABContactDisplayPrivate {
 	EContact *contact;
-
-        GtkWidget *invisible;
-	char *selection_uri;
 };
 
-static struct {
-	gchar *name;
-	gchar *pretty_name;
-}
-common_location [] =
-{
-	{ "WORK",  N_ ("Work")  },
-	{ "HOME",  N_ ("Home")  },
-	{ "OTHER", N_ ("Other") }
-};
 
 #define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n"  \
                     "<head>\n<meta name=\"generator\" content=\"Evolution Addressbook Component\">\n</head>\n"
@@ -71,163 +57,11 @@ common_location [] =
 #define JABBER_ICON       "im-jabber"
 #define MSN_ICON          "im-msn"
 #define YAHOO_ICON        "im-yahoo"
-#define GADUGADU_ICON	    "im-gadugadu"
 #define VIDEOCONF_ICON    "stock_video-conferencing"
 
 #define MAX_COMPACT_IMAGE_DIMENSION 48
 
 static void
-eab_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data)
-{
-	EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target;
-	GError *err = NULL;
-		
-	gnome_url_show(t->uri, &err);
-	if (err) {
-		g_warning("gnome_url_show: %s", err->message);
-		g_error_free(err);
-	}
-}
-
-static void
-eab_uri_popup_email_address_copy(EPopup *ep, EPopupItem *item, void *data)
-{
-	EABContactDisplay *display = data;
-	struct _EABContactDisplayPrivate *p = display->priv;
-        EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target;
-        const char *url;
-        char *html=NULL; 
-        int i=0; 
-        GList *email_list, *l;
-	url = t->uri; 
-        int email_num = atoi (url + strlen ("internal-mailto:"));
-	
-	email_list = e_contact_get (p->contact, E_CONTACT_EMAIL);
-	for (l = email_list; l; l=l->next) {
-		if(i==email_num)
-			html = e_text_to_html (l->data, 0);
-	i++;
-        }
-
-       	g_free(p->selection_uri);
-	p->selection_uri = g_strdup(html);  
-	g_free (html);
-			
-	gtk_selection_owner_set(p->invisible, GDK_SELECTION_PRIMARY, gtk_get_current_event_time());
-	gtk_selection_owner_set(p->invisible, GDK_SELECTION_CLIPBOARD, gtk_get_current_event_time());
-}
-
-static void
-eab_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	EABContactDisplay *display = data;
-	struct _EABContactDisplayPrivate *p = display->priv;
-
-	g_free(p->selection_uri);
-	p->selection_uri = g_strdup(pitem->user_data);
-
-	gtk_selection_owner_set(p->invisible, GDK_SELECTION_PRIMARY, gtk_get_current_event_time());
-	gtk_selection_owner_set(p->invisible, GDK_SELECTION_CLIPBOARD, gtk_get_current_event_time());
-}
-
-static void
-eab_uri_popup_address_send(EPopup *ep, EPopupItem *item, void *data)
-{
-         EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target;
-         const char *url;
-         EABContactDisplay *display = data;
-  	 struct _EABContactDisplayPrivate *p = display->priv;
- 
-         url = t->uri; 
-	 int mail_num = atoi (url + strlen ("internal-mailto:"));
-         
-         if (mail_num == -1)
-         return; 
-         
-         eab_send_contact (p->contact, mail_num, EAB_DISPOSITION_AS_TO);
-
-}
-
-static void
-eab_selection_get(GtkWidget *widget, GtkSelectionData *data, guint info, guint time_stamp, EABContactDisplay *display)
-{
-	struct _EABContactDisplayPrivate *p = display->priv;
-
-	if (p->selection_uri == NULL)
-		return;
-
-	gtk_selection_data_set(data, data->target, 8, p->selection_uri, strlen(p->selection_uri));
-}
-
-static void
-eab_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, EABContactDisplay *display)
-{
-#if 0 
-	struct _EABContactDisplayPrivate *p = display->priv;
-
-	g_free(p->selection_uri);
-	p->selection_uri = NULL;
-#endif
-}
-
-static EPopupItem eab_uri_popups[] = {
-	{ E_POPUP_ITEM, "05.open", N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO },
-        { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO },
-        { E_POPUP_ITEM, "15.send", N_("_Send New Message To ..."), eab_uri_popup_address_send, NULL, NULL, EAB_POPUP_URI_MAILTO}, 
-	{ E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "gtk-copy", EAB_POPUP_URI_MAILTO},
-        };
-
-
-static void
-eab_uri_popup_free(EPopup *ep, GSList *list, void *data)
-{
-	while (list){
-		GSList *n = list->next;
-		struct _EPopupItem *item = list->data;
-
-		g_free(item->user_data);
-		item->user_data = NULL;
-		g_slist_free_1(list);
-
-		list = n;
-         	}
-}
-
-static int
-eab_uri_popup_event(EABContactDisplay *display, GdkEvent *event, const char *uri)
-{
-	EABPopup *emp;
-	EABPopupTargetURI *t ;
-	GtkMenu *menu;
-  
-        
-      	        emp = eab_popup_new("org.gnome.evolution.addressbook.contactdisplay.popup");
-	
-		GSList *menus = NULL;
-		int i;
-		
-                t = eab_popup_target_new_uri(emp, uri);
-	        t->target.widget = (GtkWidget *)display;
-
-		for (i=0;i<sizeof(eab_uri_popups)/sizeof(eab_uri_popups[0]);i++) {
-			eab_uri_popups[i].user_data = g_strdup(t->uri);
-			menus = g_slist_prepend(menus, &eab_uri_popups[i]);
-		}
-		e_popup_add_items((EPopup *)emp, menus, NULL, eab_uri_popup_free, display);
-	
-
-        menu = e_popup_create_menu_once((EPopup *)emp,(EPopupTarget*)t, 0);
-	
-        if (event == NULL) {
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
-	} else {
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button.button, event->button.time);
-	}
-
-	return TRUE;
-}
-
-static void
 on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
 		  EABContactDisplay *display)
 {
@@ -238,7 +72,7 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
 		if (!photo)
 			photo = e_contact_get (display->priv->contact, E_CONTACT_LOGO);
 
-		gtk_html_stream_write (handle, photo->data.inlined.data, photo->data.inlined.length);
+		gtk_html_stream_write (handle, photo->data, photo->length);
 
 		gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
 
@@ -272,7 +106,7 @@ on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display)
 
 		if (mail_num == -1)
 			return;
- 
+
 		eab_send_contact (display->priv->contact, mail_num, EAB_DISPOSITION_AS_TO);
 
 		return;
@@ -300,7 +134,7 @@ render_address (GtkHTMLStream *html_stream, EContact *contact, const char *html_
 
 		gtk_html_stream_printf (html_stream, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">%s</td></tr>", html_label, _("(map)"), html);
 
-This shoul		g_free (html);
+		g_free (html);
 		return;
 	}
 
@@ -417,26 +251,6 @@ accum_attribute (GString *gstr, EContact *contact, const char *html_label, ECont
 }
 
 static void
-accum_time_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
-{
-	EContactDate *date;
-	struct tm tdate;
-	char sdate[100];
-	
-	date = e_contact_get (contact, field);
-	memset (&tdate, 0, sizeof (struct tm));
-
-	if (date) {
-		tdate.tm_year = date->year-1900;
-		tdate.tm_mday = date->day;
-		tdate.tm_mon = date->month-1;
-		strftime (sdate, 100, "%x", &tdate);
-		accum_name_value (gstr, html_label, sdate, icon, html_flags);
-		e_contact_date_free (date);
-	}
-}
-
-static void
 accum_multival_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
 {
 	GList *val_list, *l;
@@ -482,28 +296,15 @@ end_block (GtkHTMLStream *html_stream)
 	gtk_html_stream_printf (html_stream, "<tr><td height=\"20\">&nbsp;</td></tr>");
 }
 
-static const char *
-get_email_location (EVCardAttribute *attr)
-{
-	gint i;
-
-	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		if (e_vcard_attribute_has_type (attr, common_location [i].name))
-			return common_location [i].pretty_name;
-	}
-
-	return NULL;
-}
-
 static void
 render_contact (GtkHTMLStream *html_stream, EContact *contact)
 {
 	GString *accum;
-	GList *email_list, *l, *email_attr_list, *al;
+	GList *email_list, *l;
 #ifdef HANDLE_MAILTO_INTERNALLY
 	int email_num = 0;
 #endif
-	char *nl, *nick=NULL;
+	char *nl;
 
 	gtk_html_stream_printf (html_stream, "<table border=\"0\">");
 
@@ -513,18 +314,16 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
 	start_block (html_stream, "");
 
 	email_list = e_contact_get (contact, E_CONTACT_EMAIL);
-	email_attr_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
-	
-	for (l = email_list, al=email_attr_list; l && al; l = l->next, al = al->next) {
+	for (l = email_list; l; l = l->next) {
 #ifdef HANDLE_MAILTO_INTERNALLY
 		char *html = e_text_to_html (l->data, 0);
-		g_string_append_printf (accum, "%s<a href=\"internal-mailto:%d\">%s</a> <font color=" HEADER_COLOR ">(%s)</font>", nl, email_num, html, get_email_location ((EVCardAttribute *) al->data));
+		g_string_append_printf (accum, "%s<a href=\"internal-mailto:%d\">%s</a>", nl, email_num, html);
 		email_num ++;
 		g_free (html);
 		nl = "<br>";
 		
 #else
-		g_string_append_printf (accum, "%s%s <font color=" HEADER_COLOR ">(%s)</font>", nl, (char*)l->data, get_email_location ((EVCardAttribute *) al->data));
+		g_string_append_printf (accum, "%s%s", nl, (char*)l->data);
 		nl = "\n";
 #endif
 	}
@@ -545,21 +344,13 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
 	}
 
 	g_string_assign (accum, "");
-	nick = e_contact_get (contact, E_CONTACT_NICKNAME);
-	if (nick && *nick) {
-		accum_name_value (accum, _("Nickname"), nick, NULL, 0);
-		if (accum->len > 0)
-			gtk_html_stream_printf (html_stream, "%s", accum->str);
-	}
-	
-	g_string_assign (accum, "");
+
 	accum_multival_attribute (accum, contact, _("AIM"), E_CONTACT_IM_AIM, AIM_ICON, 0);
 	accum_multival_attribute (accum, contact, _("GroupWise"), E_CONTACT_IM_GROUPWISE, GROUPWISE_ICON, 0);
 	accum_multival_attribute (accum, contact, _("ICQ"), E_CONTACT_IM_ICQ, ICQ_ICON, 0);
 	accum_multival_attribute (accum, contact, _("Jabber"), E_CONTACT_IM_JABBER, JABBER_ICON, 0);
 	accum_multival_attribute (accum, contact, _("MSN"), E_CONTACT_IM_MSN, MSN_ICON, 0);
 	accum_multival_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0);
-	accum_multival_attribute (accum, contact, _("Gadu-Gadu"), E_CONTACT_IM_GADUGADU, GADUGADU_ICON, 0);
 
 	if (accum->len > 0)
 		gtk_html_stream_printf (html_stream, "%s", accum->str);
@@ -569,37 +360,29 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
 	g_string_assign (accum, "");
 
 	accum_attribute (accum, contact, _("Organization"), E_CONTACT_ORG, NULL, 0);
-	accum_attribute (accum, contact, _("Department"), E_CONTACT_ORG_UNIT, NULL, 0);
-	accum_attribute (accum, contact, _("Profession"), E_CONTACT_ROLE, NULL, 0);
 	accum_attribute (accum, contact, _("Position"), E_CONTACT_TITLE, NULL, 0);
-	accum_attribute (accum, contact, _("Manager"), E_CONTACT_MANAGER, NULL, 0);
-	accum_attribute (accum, contact, _("Assistant"), E_CONTACT_ASSISTANT, NULL, 0);
-	accum_attribute (accum, contact, _("Video Chat"), E_CONTACT_VIDEO_URL, VIDEOCONF_ICON, E_TEXT_TO_HTML_CONVERT_URLS);
-	accum_attribute (accum, contact, _("Calendar"), E_CONTACT_CALENDAR_URI, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
-	accum_attribute (accum, contact, _("Free/Busy"), E_CONTACT_FREEBUSY_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);	
+	accum_attribute (accum, contact, _("Video Conferencing"), E_CONTACT_VIDEO_URL, VIDEOCONF_ICON, E_TEXT_TO_HTML_CONVERT_URLS);
 	accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_BUSINESS, NULL, 0);
 	accum_attribute (accum, contact, _("Fax"), E_CONTACT_PHONE_BUSINESS_FAX, NULL, 0);
 	accum_address   (accum, contact, _("Address"), E_CONTACT_ADDRESS_WORK, E_CONTACT_ADDRESS_LABEL_WORK);
 
 	if (accum->len > 0) {
-		start_block (html_stream, _("Work"));
+		start_block (html_stream, _("work"));
 		gtk_html_stream_printf (html_stream, "%s", accum->str);
 		end_block (html_stream);
 	}
 
 	g_string_assign (accum, "");
 
-	accum_attribute (accum, contact, _("Home Page"), E_CONTACT_HOMEPAGE_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
-	accum_attribute (accum, contact, _("Web Log"), E_CONTACT_BLOG_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
+	accum_attribute (accum, contact, _("WWW"), E_CONTACT_HOMEPAGE_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
+	accum_attribute (accum, contact, _("Blog"), E_CONTACT_BLOG_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
 
 	accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_HOME, NULL, 0);
 	accum_attribute (accum, contact, _("Mobile Phone"), E_CONTACT_PHONE_MOBILE, NULL, 0);
 	accum_address   (accum, contact, _("Address"), E_CONTACT_ADDRESS_HOME, E_CONTACT_ADDRESS_LABEL_HOME);
-	accum_time_attribute (accum, contact, _("Birthday"), E_CONTACT_BIRTH_DATE, NULL, 0);
-	accum_time_attribute (accum, contact, _("Anniversary"), E_CONTACT_ANNIVERSARY, NULL, 0);
-	accum_attribute (accum, contact, _("Spouse"), E_CONTACT_SPOUSE, NULL, 0);
+
 	if (accum->len > 0) {
-		start_block (html_stream, _("Personal"));
+		start_block (html_stream, _("personal"));
 		gtk_html_stream_printf (html_stream, "%s", accum->str);
 		end_block (html_stream);
 	}
@@ -637,8 +420,7 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
 		photo = e_contact_get (contact, E_CONTACT_PHOTO);
 		if (!photo)
 			photo = e_contact_get (contact, E_CONTACT_LOGO);
-		/* Only handle inlined photos for now */
-		if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+		if (photo) {
 			gtk_html_stream_printf (html_stream, "<img border=\"1\" src=\"internal-contact-photo:\">");
 			e_contact_photo_free (photo);
 		}
@@ -708,7 +490,7 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac
 			   image here.  we don't scale the pixbuf
 			   itself, just insert width/height tags in
 			   the html */
-			gdk_pixbuf_loader_write (loader, photo->data.inlined.data, photo->data.inlined.length, NULL);
+			gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL);
 			gdk_pixbuf_loader_close (loader, NULL);
 			pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
 			if (pixbuf)
@@ -842,26 +624,6 @@ eab_contact_display_render (EABContactDisplay *display, EContact *contact,
 	}
 }
 
-static int
-eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *display)
-{
-	char *uri;
-	gboolean res = FALSE;
-	
-
-	if (event->button.button!= 3 )
-		return FALSE;
-        
-       	uri = gtk_html_get_url_at (GTK_HTML (widget), event->button.x, event->button.y);
-	if (uri){
-		eab_uri_popup_event(display,event,uri);
-               	}
-
-         g_free(uri);
-
-	return res;
-}
-
 GtkWidget*
 eab_contact_display_new (void)
 {
@@ -869,8 +631,7 @@ eab_contact_display_new (void)
 
 	display = g_object_new (EAB_TYPE_CONTACT_DISPLAY, NULL);
 	
-	struct _EABContactDisplayPrivate *p;
-	p=display->priv = g_new0 (EABContactDisplayPrivate, 1);
+	display->priv = g_new0 (EABContactDisplayPrivate, 1);
 
 	gtk_html_set_default_content_type (GTK_HTML (display), "text/html; charset=utf-8");
 	
@@ -882,15 +643,6 @@ eab_contact_display_new (void)
 	g_signal_connect (display, "link_clicked",
 			  G_CALLBACK (on_link_clicked),
 			  display);
-        g_signal_connect(display, "button_press_event", 
-                          G_CALLBACK(eab_html_press_event),
-                           display);
-        p->invisible = gtk_invisible_new();
-	g_signal_connect(p->invisible, "selection_get", G_CALLBACK(eab_selection_get), display);
-	g_signal_connect(p->invisible, "selection_clear_event", G_CALLBACK(eab_selection_clear_event), display);
-	gtk_selection_add_target(p->invisible, GDK_SELECTION_PRIMARY, GDK_SELECTION_TYPE_STRING, 0);
-	gtk_selection_add_target(p->invisible, GDK_SELECTION_CLIPBOARD, GDK_SELECTION_TYPE_STRING, 1);
-	
 #if 0
 	g_signal_connect (display, "object_requested",
 			  G_CALLBACK (on_object_requested),
@@ -910,6 +662,7 @@ eab_contact_display_new (void)
 	return GTK_WIDGET (display);
 }
 
+
 static void
 eab_contact_display_init (GObject *object)
 {
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e894c375a3..f99889e169 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -12,14 +12,13 @@
 	Fixes #344927
 	* gui/dialogs/event-page.c: 
 	(event_page_fill_widgets): Set the classification.
-
+				   
 2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
 
-	Fixes #333423
-	* gui/alarm-notify/alarm-queue.c: 
-	(notify_dialog_cb): Need not get the next iter through
-	the tree model, as gtk list store would store the next 
-	valid iter in iter.
+	Fixes #323499
+	* gui/dialogs/recurrence-page.c: (interval_selection_done_cb),
+	(ending_selection_done_cb), (init_widgets): Listen to the
+	changed signal from the GtkOptionMenu.
 
 2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
 
@@ -28,194 +27,28 @@
 	(ending_selection_done_cb), (init_widgets): Listen to the
 	changed signal from the GtkOptionMenu.
 
-2006-07-27  Chenthill Palanisamy  <pchenthill@novell.com>
+2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #345646
 	* gui/dialogs/recurrence-page.c: 
 	(recurrence_page_finalize): Diconnect the signal handler
 	while destroying the page.
 
-2006-07-27  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* gui/e-calendar-view.h: Removed the hardcoded ENABLE_CAIRO
-	* gui/e-day-view.c (e_day_view_style_set) (e_day_view_init) 
-	(e_day_view_realize) (e_day_view_update_event_label) 
-	(e_day_view_on_long_event_click) (e_day_view_reshape_resize_long_event_rec) 
-	(e_day_view_reshape_resize_rect_item) (e_day_view_on_top_canvas_motion) 
-	(e_day_view_on_main_canvas_motion) (e_day_view_finish_long_event_resize) 
-	(e_day_view_finish_resize) (e_day_view_abort_resize)
-	 (e_day_view_reshape_main_canvas_resize_bars) (e_day_view_change_event_time) 
-	(e_day_view_on_editing_stopped) (e_day_view_on_main_canvas_drag_leave):
-	This adds a macro ENABLE_CAIRO to
-        disable cairo for slow rendering machines.	
-
-2006-07-27  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* gui/e-day-view.c (e_day_view_update_event_label):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Added code to draw time on top border with cairo, because of text reposition
-	when drawn in pango when events are overlapped.
-	
-2006-07-26  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* gui/apps_evolution_calendar.schemas.in.in: Fix for bug #348486. 
-	Corrected wrong description in /apps/evolution/calendar/display/
-	event_transparency GConf key.
-
-2006-07-26  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #347772
-	* gui/apps_evolution_calendar.schemas.in.in: Set the adjust
-	for daylight savings by default.
-
-2006-07-24  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Free the gconf client after use.
-	* gui/e-day-view.c (e_day_view_update_event_label) 
-	(e_day_view_on_text_item_event): Fix the gal tooltip and show the appt
-	header if the event spans over minutes per row.
-
-2006-07-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* calendar.error.xml:
-	* gui/calendar-component.c: (update_task_memo_selection),
-	(update_primary_task_memo_selection),
-	(config_tasks_selection_changed_cb),
-	(config_primary_tasks_selection_changed_cb),
-	(config_memos_selection_changed_cb),
-	(config_primary_memos_selection_changed_cb),
-	(create_component_view), (destroy_component_view),
-	(calendar_component_init):
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/comp-editor.h:
-	* gui/dialogs/memo-editor.c: (memo_editor_construct),
-	(memo_editor_edit_comp), (memo_editor_new):
-	* gui/dialogs/memo-editor.h:
-	* gui/dialogs/memo-page.c: (memo_page_init), (memo_page_finalize),
-	(memo_page_focus_main_widget), (clear_widgets),
-	(sensitize_widgets), (memo_page_fill_widgets),
-	(fill_comp_with_recipients), (get_current_account),
-	(memo_page_fill_component), (get_widgets), (to_button_clicked_cb),
-	(response_cb), (init_widgets), (get_to_entry),
-	(memo_page_construct), (memo_page_new),
-	(memo_page_create_date_edit):
-	* gui/dialogs/memo-page.glade:
-	* gui/dialogs/memo-page.h:
-	* gui/e-cal-component-memo-preview.c: (timet_to_str_with_zone),
-	(write_html):
-	* gui/e-cal-model.c: (ecm_value_at):
-	* gui/e-memo-table-config.c: (e_memo_table_config_set_table):
-	* gui/e-memo-table.c: (date_compare_cb), (e_memo_table_init),
-	(open_memo), (e_memo_table_get_current_time):
-	* gui/e-memo-table.etspec:
-	* gui/e-memo-table.h:
-	* gui/gnome-cal.c: (gnome_calendar_class_init),
-	(get_focus_location), (memo_canvas_focus_change_cb),
-	(memo_selection_change_cb), (update_memo_view), (setup_config),
-	(view_progress_cb), (view_done_cb), (setup_widgets),
-	(gnome_calendar_init), (gnome_calendar_destroy),
-	(gnome_calendar_set_pane_positions), (client_cal_opened_cb),
-	(default_client_cal_opened_cb), (open_ecal), (backend_died_cb),
-	(gnome_calendar_remove_source_by_uid),
-	(gnome_calendar_vpane_realized), (gnome_calendar_vpane_resized),
-	(gnome_calendar_cut_clipboard), (gnome_calendar_copy_clipboard),
-	(gnome_calendar_paste_clipboard),
-	(gnome_calendar_notify_dates_shown_changed),
-	(gnome_calendar_delete_selection),
-	(gnome_calendar_get_memopad_menu):
-	* gui/gnome-cal.h:
-	* gui/memos-component.c: (create_new_memo), (create_local_item_cb),
-	(impl__get_userCreatableItems), (impl_requestCreateItem): Added support
-	shared memos, Gw notes.							
-
-2006-07-21  Andre Klapper  <a9016009@gmx.de>
-
-	* calendar.error.xml: improve calendar read-only error message.
-	Fixes bug #342281.
-
-2006-07-19  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* gui/e-meeting-time-sel.c :(e_meeting_time_selector_construct)
-	* gui/e-meeting-time-sel-item.c : Drawn freebusy view in calendar with cairo,
-	and changed colors for better look and feel.
-
-2006-07-20  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* gui/e-day-view.c: Fixed the embossing issue on item selection.
-
-2006-07-19  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	** Fixes bug #347773
-
-	* gui/e-day-view-main-item.c: Bug in Appointment resize preview in calendar 
-	day/work-week view is fixed.
-
-2006-07-19  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/dialogs/calendar-setup.c: harmonize strings.
-	Fixes bug #346552.
-
-2006-07-18  Andre Klapper  <a9016009@gmx.de>
-
-	* calendar.error.xml: removing duplicated error messages, fixing
-	default answers. Fixes bug #347765.
-
-2006-07-18  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/dialogs/calendar-setup.glade:
-	* gui/dialogs/new-calendar.glade:
-	* gui/dialogs/new-task-list.glade:
-	* gui/dialogs/url-editor-dialog.glade:
-	remove "*" from translation. Fixes bug #331147.
+2006-06-17   Arvind <sa.phoenix@gmail.com>
 
-2006-07-17  Srinivasa Ragavan  <sragavan@novell.com>
+	** Fix for bug#330633
 
-	* gui/apps_evolution_calendar.schemas.in.in: Corrected the text in the
-	schema.
-
-2006-07-17  Li Yuan <li.yuan@sun.com>
-
-	* gui/dialogs/task-page.glade:
-	Add labelled_by relation to start-date and due-date.
-	Fix for #347473.
-
-2006-07-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/apps_evolution_calendar.schemas.in.in: Added key for storing tag
-	calendar position in the left pane.
-	* gui/calendar-component.c: (calcomp_vpane_realized),
-	(calcomp_vpane_resized), (create_component_view),
-	(calendar_component_init): Added tag calendar in the left pane
-	* gui/calendar-config-keys.h: Added keys to fetch conf 
-	* gui/calendar-config.c: (calendar_config_get_tag_vpane_pos),
-	(calendar_config_set_tag_vpane_pos):
-	* gui/calendar-config.h:
-	* gui/gnome-cal.c: (setup_config), (gnome_calendar_get_tag),
-	(setup_widgets), (gnome_calendar_set_pane_positions),
-	(gnome_calendar_hpane_realized): Removed code for tag calendar.
-
-2006-07-14   Arvind <sa.phoenix@gmail.com>
-
-        ** Fix for bug#330633
 	* gui/dialogs/event-page.c : Enabled save button when the timezone
 	  is changed from an existing meeting/appointment
 
 	* gui/e-timezone-entry.c : prevented the shrinking of the timezone
 	field when the timezone is set to the default timezone
 
-2006-06-14 Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #329772
-	
-	* gui/e-cal-model-tasks.c: function added to change status of a task 
-	as incomplete.
-	* gui/e-cal-popup.c: status of task checked and changed to incomplete 
-	if option selected.
-	* gui/e-cal-popup.h: E_CAL_POPUP_SELECT_COMPLETE added
-	* gui/e-calendar-table.c: function added to mark the task in selected 
-	row as incomplete.
-
+2006-07-11  Arvind_evo <sa.phoenix@gmail.com>
+  	 
+	* gui/dialogs/event-page.c: Enabled save button when the group is
+	changed from a previously saved meeting.
+ 
 2006-07-11  Li Yuan <li.yuan@sun.com>
 
 	* gui/e-week-view.c: (e_week_view_remove_event_cb):
@@ -238,109 +71,12 @@
 	If there is not any event in week view,
 	just grab week view itself.
 
-2006-07-10  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* gui/e-day-view.c:(e_day_view_update_event_label)
-	Added code for Day/Work Week view item, top border showing time
-	(e_day_view_realize), (e_day_view_on_event_click), 
-	(e_day_view_on_long_event_click), (e_day_view_reshape_resize_long_event_rect),
-	(e_day_view_reshape_resize_rect_item),(e_day_view_on_top_canvas_motion),
-	(e_day_view_finish_resize),(e_day_view_abort_resize),
-	(e_day_view_reshape_main_canvas_resize_bar):
-	Added code for Resize Transparency with Cairo drawing.
-
-	(e_day_view_on_text_item_event):
-	Fixed crashes because of tooltip during editing and resize.
-
-	* gui/e-day-view-main-canvas.c:
-	(e_day_view_main_item_draw_day_event):
-	Added code for Time displayed on resizing events and for Shadow 
-	Effect for item selection
-
-2006-07-10  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #332911
-	* gui/apps_evolution_calendar.schemas.in.in:
-	* gui/calendar-config-keys.h:
-	* gui/calendar-config.c: (set_standard_offsets),
-	(calendar_config_get_icaltimezone),
-	(calendar_config_add_notification_timezone),
-	(calendar_config_get_daylight_saving),
-	(calendar_config_set_daylight_saving),
-	(calendar_config_add_notification_daylight_saving):
-	* gui/calendar-config.h:
-	* gui/dialogs/cal-prefs-dialog.c: (timezone_changed),
-	(daylight_saving_changed), (setup_changes), (show_config),
-	(calendar_prefs_dialog_construct):
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/cal-prefs-dialog.h: Added the support
-	for optional daylight savings time with timezones.
-
-2006-07-08  Ushveen Kaur  <kushveen@novell.com>
-
-	Fixes #332230.
-	* gui/memos-component.c:
-	* gui/tasks-component.c:
-	Fixes mnemonic conflicts in the "New" menu.
-
-2006-07-07  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/e-cal-model.c: (e_cal_model_set_instance_times):
-	Handle the start_time_zone != end_time_zone scenario.
-	Fixes bugzilla.novell.com #190421.
-
 2006-07-07  Wang Xin  <jedy.wang@sun.com>
 
 	Fixes #345222
 
-	* gui/dialogs/alarm-dialog.c: (alarm_to_dialog),
-	(alarm_to_malarm_widgets); (populate_widgets_from_alarm):
-	Handle mail alarm.
-
-2006-06-30  Johnny Jacob  <jjohnny@novell.com>
-	* gui/cal-search-bar.c: (get_current_category),
-	(get_category_sexp), (notify_e_cal_view_contains),
-	(notify_category_is), (regen_query), (regen_view_query),
-	(make_suboptions), (cal_search_bar_construct): Added/Removed code
-	for new search ui.
-	* gui/e-tasks.c: (search_bar_sexp_changed_cb):
-	Added/Removed code for search ui.
-
-2006-06-28  Andre Klapper  <a9016009@gmx.de>
-
-	* gui/e-itip-control.glade: Adding translator comments to the
-	"--to--" string. Removing three strings from translations.
-	Fixes bug #325126.
-
-2006-06-28  Rajeev ramanathan  <rajeevramanathan_2004@yahoo.co.in>
-
-	**Fixes bug #329305
-
-	*gui/dialogs/event-page.glade: Changed mnemonic Atte_ndees to 
-	Attendee_s
-
-2006-06-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/calendar-setup.c: (calendar_setup_edit_calendar):
-	Remove GroupWise from the Calendar ESource Groups as it supports
-	a single calendar only. 
-
-2006-06-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/comp-editor.c (fill_widgets):
-	Free GSList and its data after calling 
-	e_cal_component_get_attachment_list.
-
-2006-06-14  Arvind_evo <sa.phoenix@gmail.com>
-
-	* gui/dialogs/event-page.c : Enabled save button when the group is 
-	changed from a previously saved meeting.
-
-2006-06-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/calendar-setup.c: (calendar_setup_edit_task_list):
-	Remove GroupWise from the list Task ESource Groups as it supports
-	a single Task list only. Fixes bug #176596 in bugzilla.novell.com.
+	* gui/dialogs/alarm-dialog.c: (alarm_to_malarm_widgets),
+	(populate_widgets_from_alarm): Handle mail alarm.
 
 2006-06-14  Aishwarya k <aishkalyan@gmail.com>
 
@@ -369,19 +105,31 @@
 	Committing the patch from Dave Malcolm <dmalcolm@redhat.com>
 	Fixed some compiler warnings.
 
+2006-06-13  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	Fixes #315860
+	* gui/alarm-notify/alarm-notify-dialog.c: 
+	(dialog_response_cb): pick the function info from
+	the the first iterator.
+	Backporting the fix made by sragavan@novell.com to
+	gnome-2-14 branch.
+	
+2006-06-07  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
+
+	** Fixes bug #304648
+
+	* gui/e-day-view.c :
+	* gui/e-week-view.c : Now the summary appears in white for dark 
+	event colors in all calendar views.
+
 2006-06-12  Wang Xin  <jedy.wang@sun.com>
 
 	**Fixes bug #344630
 	Change key confirm_expunge to confirm_purge.
+
 	* gui/apps_evolution_calendar.schemas.in.in:
 	* gui/migration.c:
 
-2006-06-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* gui/alarm-notify/alarm-queue.c: (remove_queued_alarm),
-	(alarm_trigger_cb), (tray_list_remove_async): 	Fixed atleast
-	6 crashes, that were in bnc.
-	
 2006-06-08  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes bug #341961.
@@ -396,55 +144,30 @@
 	(e_timezone_entry_set_timezone):
 	add relationship between label and entry.
 
-2006-06-05  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixed bug #268884
-	
-	* gui/e-calendar-table.c: (on_new_task): Added a new popup entry.
-	* gui/e-tasks.c: (setup_widgets): Added a reference to table
-
 2006-06-01  Harish Krishnaswamy  <kharish@novell.com>
 
 	* gui/dialogs/Makefile.am, gui/dialogs/event-editor.c,
-	gui/dialogs/task-editor.c: Remove redundant files 
+	gui/dialogs/task-editor.c: Remove redundant files
 	meeting-page.[ch], cal-attachment.glade and references
 	in includes.
 
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added support to save calendar/events/attachments to remote
-	shares in Calenda/Memo/Tasks components.
+2006-05-25  Tor Lillqvist  <tml@novell.com>
 
-	* gui/dialogs/cal-attachment-select-file.c: (run_selector),
-	(comp_editor_select_file_attachments):
-	* gui/dialogs/comp-editor.c: (drop_action), (cab_add),
-	(menu_insert_attachment_cb):
-	* gui/e-cal-popup.c: (temp_save_part):
-	* gui/e-calendar-table.c: (e_calendar_table_on_save_as):
-	* gui/e-calendar-view.c: (on_save_as),
-	(e_calendar_view_get_tooltips):
-	* gui/e-memo-table.c: (e_memo_table_on_save_as):
-
-2006-05-23  Srinivasa Ragavan  <sragavan@novell.com>
+	* gui/dialogs/event-editor.c (event_editor_init): Construct
+	pathname to query-free-busy.png at run-time. Fixes Win32 build
+	broken by the fix for #321832 below.
 
-	More alarm fixes
+2006-05-22  Harish Krishnaswamy  <kharish@novell.com>
 
-	* gui/alarm-notify/alarm-notify-dialog.c: (dialog_response_cb),
-	(notified_alarms_dialog_new), (tree_selection_changed_cb):
-	* gui/alarm-notify/alarm-queue.c: (query_objects_changed_async),
-	(free_tray_icon_data):
+	* gui/memos-component.c: Revert one change from the
+	previous commit as the string is not already translated
+	and breaks the string freeze.
 
 2006-05-22  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	**Fixes bug #331418
 	* gui/memos-component.c: Set mnemonics in popup menu.
 
-2006-05-13  Harish Krishnaswamy  <kharish@novell.com>
-
-	Patch suggested by Yu-Hui Liu
-	* conduits/todo/todo-conduit.c: (pre_sync):
-	Check for timezone before passing the context.
-
 2006-04-20  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes the events appearing in different timezone appear in
@@ -454,40 +177,6 @@
 	(e_calendar_view_get_tooltips): Get the timezone from the backend
 	using the tzid if its not present in the icalcomponent.
 
-2006-05-04  Rajeev Ramanathan <rajeevramanathan_2004@yahoo.co.in>
-	
-	Commited few pending cairo stuff. This adds a macro ENABLE_CAIRO to
-	disable cairo for slow performing machines. Also added a patch to
-	disable gradient and select foreground color based on the back ground
-	color.
-	
-	* gui/apps_evolution_calendar.schemas.in.in:
-	* gui/e-calendar-view.c:
-	* gui/e-calendar-view.h:
-	* gui/e-day-view-main-item.c: (e_day_view_main_item_draw),
-	(e_day_view_main_item_draw_events_in_vbars),
-	(e_day_view_main_item_draw_long_events_in_vbars),
-	(e_day_view_main_item_draw_day_events),
-	(e_day_view_main_item_draw_day_event):
-	* gui/e-day-view-time-item.c: (e_day_view_time_item_draw):
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw),
-	(e_day_view_top_item_draw_long_event),
-	(e_day_view_top_item_draw_triangle):
-	* gui/e-day-view.c: (e_day_view_get_text_color),
-	(e_day_view_style_set), (e_day_view_reshape_long_event),
-	(e_day_view_reshape_day_event):
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw),
-	(e_week_view_draw_time), (e_week_view_event_item_draw_icons),
-	(e_week_view_event_item_draw_triangle):
-	* gui/e-week-view-main-item.c: (e_week_view_main_item_draw_day):
-	* gui/e-week-view.c: (e_week_view_get_text_color),
-	(e_week_view_reshape_event_span):
-
-2006-05-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/event-page.glade: Set mnemonic to
-	L instead of the conflicting 'i'. Fixes #334056.
-
 2006-05-04  Chenthill Palanisamy  <pchenthill novell com>
 
 	Fixes #333689
@@ -495,165 +184,21 @@
 	(init_widgets): Check if the units is -1 before
 	adding the menu item.
 
-2006-05-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Committing change pointed by Li Yuan <Li.Yuan@Sun.COM>	
-	
-	* gui/e-calendar-table.c: (e_calendar_table_delete_selected): Corrected
-	argument passed to delete_component_dialog while deleting multiple
-	tasks.	
-
-2006-04-27  Tor Lillqvist  <tml@novell.com>
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_long_events_in_vbars): Fix crash:
-	Should use a GdkColor struct as such here, not a pointer.
-
-	* gui/dialogs/event-editor.c (event_editor_init): Construct
-	pathname to query-free-busy.png at run-time. Fixes Win32 build
-	broken by the fix for #321832 below.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fixes bug #328194
-
-	* gui/dialogs/calendar-setup.c: Added mnemonics.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #331510 from Victor
-	
-	* gui/cal-search-bar.h: Added a new flag for Memo Search
-	* gui/e-memos.c: (setup_widgets): Initiate memo search.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from PR Suman to add icons missing in menu items.
-
-	* gui/tasks-control.c: (tasks_control_activate): Added icon for
-	forward task.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from PR Suman to add icons missing in menu items.
-
-	* gui/dialogs/comp-editor.c: Added Attach icon to menu.
-	* gui/dialogs/event-editor.c: Added free/busy and recurrence icons.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	Cairo Updates from Rajeev. Now it draws a solid border around the
-	event.
-
-	* gui/e-day-view-main-item.c:
-	(e_day_view_main_item_draw_day_event):
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event):
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw):
-
-2006-04-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Cairo support for Calendar (Rajeev Ramanathan)
-	
-	* gui/apps_evolution_calendar.schemas.in.in: Added key for
-	transparency control.
-	* gui/e-calendar-view.c: (draw_curved_rectangle): A common code for
-	drawing curved rectangles
-	* gui/e-day-view-main-item.c: (e_day_view_main_item_draw),
-	(e_day_view_main_item_draw_events_in_vbars),
-	(e_day_view_main_item_draw_long_events_in_vbars),
-	(e_day_view_main_item_draw_day_event): Used cairo to draw day view events.
-	* gui/e-day-view-time-item.c: 
-	(e_day_view_time_item_get_column_width),
-	(e_day_view_time_item_draw): Used cairo to draw day view time items.
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw),
-	(e_day_view_top_item_draw_long_event),
-	(e_day_view_top_item_draw_triangle): Used cairo to draw day view long events.
-	* gui/e-day-view.c: (e_day_view_init), (e_day_view_destroy),
-	(e_day_view_style_set),
-	(e_day_view_reshape_main_canvas_resize_bars),
-	(e_day_view_get_num_events_selected): Used cairo to draw day controls.
-	* gui/e-day-view.h: Added a new font size variable
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw),
-	(e_week_view_draw_time), (e_week_view_event_item_draw_icons),
-	(e_week_view_event_item_draw_triangle): Used cairo to draw week view
-	controls.
-	* gui/e-week-view-main-item.c: (e_week_view_main_item_draw_day): Used 
-	cairo to draw week view events.
-
 2006-04-24  Chenthill Palanisamy  <pchenthill@novell.com>
 
-	Fixes #332409
+	Fixes #323409
 	* gui/calendar-component.c: (setup_create_ecal): Reset the ecal to NULL.
 	* gui/e-calendar-view.c: 
 	(e_calendar_view_new_appointment_for): If the default client does not
 	exist do not open the dialog.
-
+	
 2006-04-22  Harish Krishnaswamy  <kharish@novell.com>
 
 	* gui/dialogs/event-page.c (attendee_added_cb):
-	Added the delfrom property to the delegatee. Fixes
+	Add the delfrom property to the delegatee. Fixes
 	#165714 (bugzilla.novell.com)
 
-2006-04-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326434
-	
-	* gui/e-calendar-view.c: (e_calendar_view_move_tip),
-	(e_calendar_view_get_tooltips): Added New function to move tooltip
-	with respect to screen size.
-	* gui/e-day-view.c: (e_day_view_on_text_item_event): move the tooltip
-	* gui/e-week-view.c: (tooltip_event_cb),
-	(e_week_view_on_text_item_event): Move the tooltip
-
-2006-04-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Rewrite of Alarm daemon with EThread to make it thread safe. It also
-	fixes a lot of random crashes.
-
-	* gui/alarm-notify/alarm-notify.c: (process_removal_in_hash),
-	(list_changed_cb), (load_calendars), (alarm_notify_init),
-	(dequeue_client), (alarm_notify_finalize), (alarm_channel_setup),
-	(alarm_msg_destroy), (alarm_msgport_replied), (alarm_msg_received),
-	(alarm_notify_new), (cal_opened_cb), (alarm_notify_add_calendar),
-	(alarm_notify_remove_calendar):
-	* gui/alarm-notify/alarm-notify.h:
-	* gui/alarm-notify/alarm-queue.c: (queue_midnight_refresh),
-	(add_client_alarms_cb), (midnight_refresh_async),
-	(midnight_refresh_cb), (remove_queued_alarm), (alarm_trigger_cb),
-	(add_component_alarms), (load_alarms), (load_alarms_for_today),
-	(cal_opened_cb), (remove_alarms), (remove_comp), (duplicate_ical),
-	(duplicate_ecal), (query_objects_changed_async),
-	(query_objects_changed_cb), (query_objects_removed_async),
-	(query_objects_removed_cb), (create_snooze), (edit_component),
-	(on_dialog_objs_removed_async), (on_dialog_objs_removed_cb),
-	(tray_list_remove_cqa_async), (tray_list_remove_cqa),
-	(tray_list_remove_async), (tray_list_remove_icons),
-	(tray_list_remove_data_async), (tray_list_remove_data),
-	(notify_dialog_cb), (open_alarm_dialog), (tray_icon_clicked_cb),
-	(tray_list_add_async), (tray_list_add_new), (display_notification),
-	(popup_notification), (audio_notification), (mail_notification),
-	(procedure_notification_dialog), (procedure_notification),
-	(check_midnight_refresh), (alarm_queue_init),
-	(free_client_alarms_cb), (alarm_queue_done), (compare_ids),
-	(hash_ids), (alarm_queue_add_async), (alarm_queue_add_client),
-	(remove_cqa), (remove_comp_by_id), (remove_client_alarms),
-	(alarm_queue_remove_async), (alarm_queue_remove_client),
-	(update_cqa), (update_qa):
-	* gui/alarm-notify/alarm.c: (alarm_remove):
-
-2006-02-16  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	** Fixes #330955
-
-	* gui/e-memo-table.etspec : Change the column from summary to 
-	description.
-	* gui/e-cal-model.c : (ecm_duplicate_value) : Dup value for
-	description also.
-	(e_cal_model_create_component_with_defaults) : create a memo
-	component with defaults.
-	* gui/e-cal-model-memos.c : (ecmm_is_cell_editable).
-
-2006-04-10  Chenthill Palanisamy  <pchenthill@novell.com>
+2006-04-07  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #163039
 	* gui/e-meeting-store.c: (ems_finalize), (ems_init),
@@ -668,6 +213,11 @@
 
 2006-04-05  Chenthill Palanisamy  <pchenthill@novell.com>
 
+	* gui/e-day-view.c: (e_day_view_on_main_canvas_motion):
+	Enable drag and drop of recurring appointments.
+
+2006-04-05  Chenthill Palanisamy  <pchenthill@novell.com>
+
 	Fixes #328808
 	* gui/dialogs/event-editor.c: 
 	(event_editor_construct): Set the name selector dialog present in the schedule page
@@ -683,12 +233,7 @@
 	(e_meeting_list_view_set_name_selector): Functions to get and set the name
 	selector.
 
-2006-04-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-day-view.c: (e_day_view_on_main_canvas_motion):
-	Enable drag and drop of recurring appointments.
-
-2006-04-06  Chenthill Palanisamy  <pchenthill@novell.com>
+2006-04-05  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #162005
 	* gui/comp-util.c: (cal_comp_is_on_server): Pass the recurrence
@@ -701,47 +246,13 @@
 	Because the passing text is in UTF-8 encoding, it should be traversed
 	by utf-8 char order rather than one by one byte.
 
-2006-04-04  Irene Huang <Irene.Huang@sun.com>
+2006-03-20  Irene Huang <Irene.Huang@sun.com>
 
-       	Fixes bug 335214
+        Fixes bug 335214
 
 	* gui/e-cal-model.c: (e_cal_view_objects_added_cb):
         Call e_table_model_pre_change (E_TABLE_MODEL (model)); before
-       	deleting row.
-
-2006-04-03  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #158107
-	* gui/dialogs/delete-comp.c: (delete_component_dialog),
-	(cb_toggled_cb), (prompt_retract_dialog):
-	* gui/dialogs/delete-comp.h:
-	* gui/e-calendar-table.c: (add_retract_data), (check_for_retract),
-	(e_calendar_table_delete_selected):
-	* gui/e-calendar-view.c: (add_retract_data), (check_for_retract),
-	(delete_event), (e_calendar_view_delete_selected_occurrence): Added
-	retract support.
-
-2006-03-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #160357 [b.n.c]
-	* gui/e-meeting-store.c: 
-	(ems_init): Initialize the num queries.
-	(freebusy_async): maintain the num queries count.
-	(refresh_busy_periods): Set the store to FreeBusy data.
-	* gui/e-meeting-store.[ch]: 
-	(e_meeting_store_get_num_queries): Get the number of freebusy
-	queries currently going on.
-	* gui/e-meeting-time-sel-item.c:
-	(e_meeting_time_selector_item_init): Added a busy cursor.
-	(e_meeting_time_selector_item_destroy):
-	* gui/e-meeting-time-sel-item.h: Added a busy cursor and a function
-	to reset the normal cursor.
-	* gui/e-meeting-time-sel.c: 
-	* gui/e-meeting-time-sel.h:
-	(e_meeting_time_selector_construct): Get the main and top canvas items.
-	(e_meeting_time_selector_refresh_cb): Set the normal cursor checking the number
-	of FreeBusy queries.
-	(e_meeting_time_selector_refresh_free_busy):Set the Busy cursor.
+        deleting row.
 
 2006-03-28  Jeff Cai  <jeff.cai@sun.com> 
 	
@@ -757,7 +268,7 @@
 	* gui/calendar-component.c: (update_task_selection): need to see if
 	source is NULL to avoid a CRITICAL warning.
 
-2006-03-23  Chenthill Palanisamy  <pchenthill@novell.com>
+2006-03-22  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #329502
 	* gui/e-meeting-list-view.c: (attendee_edited_cb):
@@ -786,15 +297,6 @@
 	* gui/dialogs/alarm-dialog.c: (alarm_to_dalarm_widgets): call
 	set_text only when description.value is not NULL.
 
-2006-03-20  Boby Wang <boby.wang@sun.com>
-
-	** Fix for bug #268584
-
-	* gui/dialogs/cal-attachment-select-file.c: (run_selector):
-	* gui/dialogs/cal-attachment.glade:
-	set the accelerate key for "Suggest Suggest automatic display of
-	attachment"
-
 2006-03-09  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #334003
@@ -13533,4 +13035,3 @@
 
 	* gui/e-tasks.c (e_tasks_delete_completed): no need to do the
 	expunge asyn
-
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 5f3caec00f..b386f30c3c 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -74,7 +74,6 @@ typedef struct {
 	GtkWidget *dialog;
 	GtkWidget *snooze_time_min;
 	GtkWidget *snooze_time_hrs;
-	GtkWidget *snooze_btn; 
 	GtkWidget *minutes_label;
 	GtkWidget *hrs_label;
 	GtkWidget *description;
@@ -141,17 +140,17 @@ dialog_response_cb (GtkDialog *dialog, guint response_id, gpointer user_data)
 	GtkTreeModel *model = NULL;
 	AlarmFuncInfo *funcinfo = NULL;
 	GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (an->treeview));
-	
-	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-		gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);
-	}
 
+	if (gtk_tree_selection_get_selected (selection, &model, &iter))
+		gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);	
+	
 	if (!funcinfo) {
 		 GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (an->treeview));
-		 gboolean valid = gtk_tree_model_get_iter_first (model, &iter);
 		 gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);
 	}
+
 	g_return_if_fail (funcinfo);
+
 	switch (response_id) {
 	case GTK_RESPONSE_CLOSE:
 	case GTK_RESPONSE_DELETE_EVENT:
@@ -259,7 +258,6 @@ notified_alarms_dialog_new (void)
 	an->treeview = glade_xml_get_widget (an->xml, "appointments-treeview");
 	an->scrolledwindow = glade_xml_get_widget (an->xml, "treeview-scrolledwindow");
 	snooze_btn = glade_xml_get_widget (an->xml, "snooze-button");
-	an->snooze_btn = snooze_btn;
 	edit_btn = glade_xml_get_widget (an->xml, "edit-button");
 
 	if (!(an->dialog && an->scrolledwindow && an->treeview && an->snooze_time_min && an->snooze_time_hrs 
@@ -403,14 +401,13 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	AlarmNotify *an = user_data;
-	
+
 	if (gtk_tree_selection_get_selected (selection, &model, &iter))
 	{
+		AlarmNotify *an = user_data;
 		gchar *summary, *description, *location;
 		time_t occur_start, occur_end;
-
-		gtk_widget_set_sensitive (an->snooze_btn, TRUE);
+		
 		gtk_tree_model_get (model, &iter, ALARM_SUMMARY_COLUMN, &summary, -1);
 		gtk_tree_model_get (model, &iter, ALARM_DESCRIPTION_COLUMN, &description, -1);
 		gtk_tree_model_get (model, &iter, ALARM_LOCATION_COLUMN, &location, -1);
@@ -419,8 +416,6 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
 		gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &an->cur_funcinfo, -1);
 		
 		fill_in_labels (an, summary, description, location, occur_start, occur_end);
-	} else {
-		gtk_widget_set_sensitive (an->snooze_btn, FALSE);		 
 	}
 }
 
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 2ee3cdeaaf..1b7fcd0d53 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -82,9 +82,6 @@
 #include "e-util/e-error.h"
 
 
-
-#define d(x) x
-
 /* The dialog with alarm nofications */
 static AlarmNotificationsDialog *alarm_notifications_dialog = NULL;
 
@@ -115,9 +112,6 @@ static int tray_blink_id = -1;
 static int tray_blink_state = FALSE;
 static AlarmNotify *an;
 
-/* Main Tasks thread for dealing with the global structures */
-extern EThread *alarm_operation_thread;
-
 /* Structure that stores a client we are monitoring */
 typedef struct {
 	/* Monitored client */
@@ -191,8 +185,6 @@ static void query_objects_removed_cb (ECal *client, GList *objects, gpointer dat
 static void remove_client_alarms (ClientAlarms *ca);
 static void update_cqa (CompQueuedAlarms *cqa, ECalComponent *comp);
 static void update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa); 
-static void tray_list_remove_cqa (CompQueuedAlarms *cqa);
-static void on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data);
 
 /* Alarm queue engine */
 
@@ -213,13 +205,12 @@ queue_midnight_refresh (void)
 	}
 
 	zone = config_data_get_timezone ();
+
 	midnight = time_day_end_with_zone (time (NULL), zone);
 
-	d(printf("%s:%d (queue_midnight_refresh) - Refresh at %s \n",__FILE__, __LINE__, ctime(&midnight)));
-	
 	midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL);
 	if (!midnight_refresh_id) {
-		 d(printf("%s:%d (queue_midnight_refresh)) - Could not setup the midnight refresh alarm\n",__FILE__, __LINE__));
+		g_message ("queue_midnight_refresh(): Could not set up the midnight refresh alarm!");
 		/* FIXME: what to do? */
 	}
 }
@@ -229,31 +220,22 @@ static void
 add_client_alarms_cb (gpointer key, gpointer value, gpointer data)
 {
 	ClientAlarms *ca;
-	
-	d(printf("%s:%d (add_client_alarms_cb) - Adding %d\n",__FILE__, __LINE__, ca));
-	
+
 	ca = value;
 	load_alarms_for_today (ca);
 }
 
-struct _midnight_refresh_msg {
-	gboolean remove;
-};
-
 /* Loads the alarms for the new day every midnight */
 static void
-midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data)
+midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
 {
-	struct _midnight_refresh_msg *list = msg->data;
-
-	d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__));
-	
 	/* Re-load the alarms for all clients */
+
 	g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL);
 
 	/* Re-schedule the midnight update */
-	if (list->remove && midnight_refresh_id != NULL) {
-		d(printf("%s:%d (midnight_refresh_async)) - Reschedule the midnight update \n",__FILE__, __LINE__)); 
+
+	if (midnight_refresh_id != NULL) {
 		alarm_remove (midnight_refresh_id);
 		midnight_refresh_id = NULL;
 	}
@@ -261,25 +243,6 @@ midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data)
 	queue_midnight_refresh ();
 }
 
-static void
-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	AlarmMsg *msg;
-	struct _midnight_refresh_msg *list;
-	
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = midnight_refresh_async;
-
-	list = malloc (sizeof (struct _midnight_refresh_msg));
-
-	list->remove = TRUE;
-	msg->data = list;
-
-	d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__));
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-}
-
 /* Looks up a client in the client alarms hash table */
 static ClientAlarms *
 lookup_client (ECal *client)
@@ -309,14 +272,14 @@ lookup_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id)
 /* Removes an alarm from the list of alarms of a component.  If the alarm was
  * the last one listed for the component, it removes the component itself.
  */
-static gboolean
+static void
 remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id,
 		     gboolean free_object, gboolean remove_alarm)
 {
-	QueuedAlarm *qa=NULL;
+	QueuedAlarm *qa;
 	GSList *l;
 
-	d(printf("%s:%d (remove_queued_alarm) \n",__FILE__, __LINE__));
+	qa = NULL;
 
 	for (l = cqa->queued_alarms; l; l = l->next) {
 		qa = l->data;
@@ -325,7 +288,7 @@ remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id,
 	}
 
 	if (!l)
-		return FALSE;
+		return;
 
 	cqa->queued_alarms = g_slist_delete_link (cqa->queued_alarms, l);
 
@@ -343,10 +306,11 @@ remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id,
 	 */
 
 	if (cqa->queued_alarms != NULL)
-		return FALSE;
+		return;
 
-	d(printf("%s:%d (remove_queued_alarm)) - Last Component. Removing CQA- Free=%d\n",__FILE__, __LINE__, free_object));
 	if (free_object) {
+		g_hash_table_remove (cqa->parent_client->uid_alarms_hash, cqa->id);
+		e_cal_component_free_id (cqa->id);
 		cqa->id = NULL;
 		cqa->parent_client = NULL;
 		e_cal_component_alarms_free (cqa->alarms);
@@ -355,8 +319,6 @@ remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id,
 		e_cal_component_alarms_free (cqa->alarms);
 		cqa->alarms = NULL;
 	}
-
-	return TRUE;
 }
 
 /* Callback used when an alarm triggers */
@@ -373,7 +335,6 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 	comp = cqa->alarms->comp;
 
 	config_data_set_last_notification_time (trigger);
-	d(printf("%s:%d (alarm_trigger_cb) - Setting Last notification time to %s\n",__FILE__, __LINE__, ctime (&trigger)));
 	saved_notification_time = trigger;
 
 	qa = lookup_queued_alarm (cqa, alarm_id);
@@ -387,8 +348,10 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 	 */
 
 	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
-	if (!alarm)
-		 return;
+	g_assert (alarm != NULL);
+
+	/* Show it independent of what the notification is?*/
+	display_notification (trigger, cqa, alarm_id, TRUE);
 
 	e_cal_component_alarm_get_action (alarm, &action);
 	e_cal_component_alarm_free (alarm);
@@ -402,7 +365,6 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 #ifdef HAVE_LIBNOTIFY
 		popup_notification (trigger, cqa, alarm_id, TRUE);
 #endif
-		display_notification (trigger, cqa, alarm_id, TRUE);		
 		break;
 
 	case E_CAL_COMPONENT_ALARM_EMAIL:
@@ -417,7 +379,6 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 		g_assert_not_reached ();
 		break;
 	}
-	d(printf("%s:%d (alarm_trigger_cb) - Notification sent:%d\n",__FILE__, __LINE__, action));
 }
 
 /* Adds the alarms in a ECalComponentAlarms structure to the alarms queued for a
@@ -432,7 +393,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 
 	/* No alarms? */
 	if (alarms == NULL || alarms->alarms == NULL) {
-		d(printf("%s:%d (add_component_alarms) - No alarms to add\n",__FILE__, __LINE__));
+		g_message ("No alarms to add");
 		if (alarms)
 			e_cal_component_alarms_free (alarms);
 		return;
@@ -444,19 +405,19 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 	cqa->expecting_update = FALSE;
 
 	cqa->queued_alarms = NULL;
-	d(printf("%s:%d (add_component_alarms)) - Creating CQA %d\n",__FILE__, __LINE__, cqa));
-	
+
 	for (l = alarms->alarms; l; l = l->next) {
 		ECalComponentAlarmInstance *instance;
 		gpointer alarm_id;
 		QueuedAlarm *qa;
-		time_t tnow = time(NULL);
-		
+
 		instance = l->data;
 
+		g_message ("Adding alarm at %lu (%lu)", instance->trigger, time (NULL));
 		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
 		if (!alarm_id) {
-			d(printf("%s:%d (add_component_alarms)) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, ctime(&(instance->trigger))));
+			g_message ("add_component_alarms(): Could not schedule a trigger for "
+				   "%ld, discarding...", (long) instance->trigger);
 			continue;
 		}
 
@@ -467,7 +428,6 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 		qa->snooze = FALSE;
 
 		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-		d(printf("%s:%d (add_component_alarms)) - Adding alarm %d(%d)at %s (%s)\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), ctime(&tnow)));		
 	}
 
 	id = e_cal_component_get_id (alarms->comp);
@@ -476,15 +436,13 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 	if (cqa->queued_alarms == NULL) {
 		e_cal_component_alarms_free (cqa->alarms);
 		cqa->alarms = NULL;
-		d(printf("%s:%d (add_component_alarms)) - Failed to add all : %d\n",__FILE__, __LINE__, cqa));
-		g_message ("Failed to add all\n");
+
 		g_free (cqa);
 		return;
 	}
 
 	cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
 	cqa->id = id;
-	d(printf("%s:%d (add_component_alarms)) - Alarm added for %s\n",__FILE__, __LINE__, id->uid));
 	g_hash_table_insert (ca->uid_alarms_hash, cqa->id, cqa);
 }
 
@@ -494,8 +452,6 @@ load_alarms (ClientAlarms *ca, time_t start, time_t end)
 {
 	char *str_query, *iso_start, *iso_end;
 
-	d(printf("%s:%d (load_alarms) \n",__FILE__, __LINE__));
-	
 	iso_start = isodate_from_time_t (start);
 	if (!iso_start)
 		return;
@@ -513,7 +469,6 @@ load_alarms (ClientAlarms *ca, time_t start, time_t end)
 
 	/* create the live query */
 	if (ca->query) {
-		d(printf("%s:%d (load_alarms) - Disconnecting old queries \n",__FILE__, __LINE__));		
 		g_signal_handlers_disconnect_matched (ca->query, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, ca);
 		g_object_unref (ca->query);
 		ca->query = NULL;
@@ -523,8 +478,6 @@ load_alarms (ClientAlarms *ca, time_t start, time_t end)
 	if (!e_cal_get_query (ca->client, str_query, &ca->query, NULL)) {
 		g_warning (G_STRLOC ": Could not get query for client");
 	} else {
-		d(printf("%s:%d (load_alarms) - Setting Call backs \n",__FILE__, __LINE__));
-		
 		g_signal_connect (G_OBJECT (ca->query), "objects_added",
 				  G_CALLBACK (query_objects_changed_cb), ca);
 		g_signal_connect (G_OBJECT (ca->query), "objects_modified",
@@ -556,8 +509,8 @@ load_alarms_for_today (ClientAlarms *ca)
 	 */
 	from = MAX (config_data_get_last_notification_time () + 1, day_start);
 
+	g_message ("Loading alarms for today");
 	day_end = time_day_end_with_zone (now, zone);
-	d(printf("%s:%d (load_alarms_for_today) - From %s to %s\n",__FILE__, __LINE__, ctime (&from), ctime(&day_end)));	
 	load_alarms (ca, from, day_end);
 }
 
@@ -569,7 +522,6 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data)
 
 	ca = data;
 
-	d(printf("%s:%d (cal_opened_cb)) - Opened Calendar %d (Status %d)\n",__FILE__, __LINE__, client, status==E_CALENDAR_STATUS_OK));
 	if (status != E_CALENDAR_STATUS_OK)
 		return;
 
@@ -588,7 +540,6 @@ remove_alarms (CompQueuedAlarms *cqa, gboolean free_object)
 {
 	GSList *l;
 
-	d(printf("%s:%d (remove_alarms) - Removing for %d\n",__FILE__, __LINE__, cqa));
 	for (l = cqa->queued_alarms; l;) {
 		QueuedAlarm *qa;
 
@@ -608,17 +559,10 @@ remove_alarms (CompQueuedAlarms *cqa, gboolean free_object)
 
 /* Removes a component an its alarms */
 static void
-remove_comp (ClientAlarms *ca, ECalComponentId *id)
+remove_comp (ClientAlarms *ca, const ECalComponentId *id)
 {
 	CompQueuedAlarms *cqa;
 
-	d(printf("%s:%d (remove_comp) - Removing uid %s\n",__FILE__, __LINE__, id->uid));
-
-	if (id->rid && !(*(id->rid))) {
-		g_free (id->rid);
-		id->rid = NULL;
-	}
-	
 	cqa = lookup_comp_queued_alarms (ca, id);
 	if (!cqa) 
 		return;
@@ -627,49 +571,20 @@ remove_comp (ClientAlarms *ca, ECalComponentId *id)
 	 * for it.
 	 */
 	g_assert (cqa->queued_alarms != NULL);
-	
-	d(printf("%s:%d (remove_comp) - Removing CQA %d\n",__FILE__, __LINE__, cqa));
+
 	remove_alarms (cqa, TRUE);
+
+	/* The list should be empty now, and thus the queued component alarms
+	 * structure should have been freed and removed from the hash table.
+	 */
+	g_assert (lookup_comp_queued_alarms (ca, id) == NULL);
 }
 
 /* Called when a calendar component changes; we must reload its corresponding
  * alarms.
  */
-struct _query_msg {
-	ECal *client;
-	GList *objects;
-	gpointer data;
-};
-
-static GList * 
-duplicate_ical (GList *in_list)
-{
-	GList *l, *out_list = NULL;
-	for (l = in_list; l; l = l->next) {
-		out_list = g_list_prepend (out_list, icalcomponent_new_clone (l->data));
-	}
-	
-	return g_list_reverse (out_list);
-}
-
-static GList * 
-duplicate_ecal (GList *in_list)
-{
-	GList *l, *out_list = NULL;
-	for (l = in_list; l; l = l->next) {
-		ECalComponentId *id, *old;
-		old = l->data;
-		id = g_new0 (ECalComponentId, 1);
-		id->uid = g_strdup (old->uid);
-		id->rid = g_strdup (old->rid);
-		out_list = g_list_prepend (out_list, id);
-	}
-	
-	return g_list_reverse (out_list);
-}
-
 static void
-query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data)
+query_objects_changed_cb (ECal *client, GList *objects, gpointer data)
 {
 	ClientAlarms *ca;
 	time_t from, day_end;
@@ -678,14 +593,9 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data)
 	icaltimezone *zone;
 	CompQueuedAlarms *cqa;
 	GList *l;
-	struct _query_msg *list = msg->data;
-	ECal *client;
-	GList *objects;
-		
-	client = list->client;
-	ca = list->data;
-	objects = list->objects;
-	
+
+	ca = data;
+
 	from = config_data_get_last_notification_time ();
 	if (from == -1)
 		from = time (NULL);
@@ -695,24 +605,20 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data)
 	zone = config_data_get_timezone ();
 
 	day_end = time_day_end_with_zone (time (NULL), zone);
-	
-	d(printf("%s:%d (query_objects_changed_async) - Querying for object between %s to %s\n",__FILE__, __LINE__, ctime(&from), ctime(&day_end)));
-	
+	g_message ("Query response for alarms");
 	for (l = objects; l != NULL; l = l->next) {
 		ECalComponentId *id;
 		GSList *sl;
 		ECalComponent *comp = e_cal_component_new ();
 
-		e_cal_component_set_icalcomponent (comp, l->data);
+		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data));
 
 		id = e_cal_component_get_id (comp);
 		found = e_cal_get_alarms_for_object (ca->client, id, from, day_end, &alarms);
 
 		if (!found) {
-			d(printf("%s:%d (query_objects_changed_async) - No Alarm found for client %d\n",__FILE__, __LINE__, ca->client));
-			tray_list_remove_cqa (lookup_comp_queued_alarms (ca, id));
+			g_message ("No alarms found on object");
 			remove_comp (ca, id);
-			g_hash_table_remove (ca->uid_alarms_hash, id);
 			e_cal_component_free_id (id);
 			g_object_unref (comp);
 			comp = NULL;
@@ -721,14 +627,15 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data)
 
 		cqa = lookup_comp_queued_alarms (ca, id);
 		if (!cqa) {
-			d(printf("%s:%d (query_objects_changed_async) - No currently queued alarms for %s\n",__FILE__, __LINE__, id->uid));
+			g_message ("No currently queue alarms");
 			add_component_alarms (ca, alarms);
 			g_object_unref (comp);
 			comp = NULL;
 			continue;
 		}
 
-		d(printf("%s:%d (query_objects_changed_async) - Alarm Already Exist for %s\n",__FILE__, __LINE__, id->uid));
+		g_message ("Already existing alarms");
+
 		/* if the alarms or the alarms list is empty remove it after updating the cqa structure */
 		if (alarms == NULL || alarms->alarms == NULL) {
 		
@@ -755,7 +662,8 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data)
 
 			alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
 			if (!alarm_id) {
-				d(printf("%s:%d (query_objects_changed_async) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, ctime(&(instance->trigger)))); 
+				g_message (G_STRLOC ": Could not schedule a trigger for "
+					   "%ld, discarding...", (long) instance->trigger);
 				continue;
 			}
 
@@ -765,85 +673,29 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data)
 			qa->snooze = FALSE;
 			qa->orig_trigger = instance->trigger;	
 			cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-			d(printf("%s:%d (query_objects_changed_async) - Adding %d to queue \n",__FILE__, __LINE__, qa));
 		}
 		
 		cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
 		g_object_unref (comp);
 		comp = NULL;
 	}
-	g_list_free (objects);
-}
-
-static void
-query_objects_changed_cb (ECal *client, GList *objects, gpointer data)
-{
-	AlarmMsg *msg;
-	struct _query_msg *list;
-
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = query_objects_changed_async;
-	list = malloc (sizeof (struct _query_msg));
-	list->client = client;
-	list->objects = duplicate_ical (objects);
-	list->data = data;
-	msg->data = list;
-
-	d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__));	
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-
 }
 
 /* Called when a calendar component is removed; we must delete its corresponding
  * alarms.
  */
 static void
-query_objects_removed_async (EThread *e, AlarmMsg *msg, void *data)
+query_objects_removed_cb (ECal *client, GList *objects, gpointer data)
 {
 	ClientAlarms *ca;
 	GList *l;
-	struct _query_msg *list = msg->data;
-	ECal *client;
-	GList *objects;
-		
-	client = list->client;
-	ca = list->data;
-	objects = list->objects;
-	
-	d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects)));
-	
-	for (l = objects; l != NULL; l = l->next) { 
-		/* If the alarm is already triggered remove it. */
-		tray_list_remove_cqa (lookup_comp_queued_alarms (ca, l->data));
-		remove_comp (ca, l->data);
-		g_hash_table_remove (ca->uid_alarms_hash, l->data);		
-		e_cal_component_free_id (l->data);
-	}
-
-	g_list_free (objects);
-}
-
-static void
-query_objects_removed_cb (ECal *client, GList *objects, gpointer data)
-{
-	AlarmMsg *msg;
-	struct _query_msg *list;
-
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = query_objects_removed_async;
-
-	list = malloc (sizeof (struct _query_msg));
-	list->client = client;
-	list->objects = duplicate_ecal (objects);
-	list->data = data;	
-	msg->data = list;
 
-	d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__));	
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
+	ca = data;
 
+	for (l = objects; l != NULL; l = l->next)
+		remove_comp (ca, l->data);
 }
+
 
 
 /* Notification functions */
@@ -867,14 +719,14 @@ create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)
 
 	new_id = alarm_add (t, alarm_trigger_cb, cqa, NULL);
 	if (!new_id) {
-		d(printf("%s:%d (create_snooze) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, ctime(&t)));
+		g_message ("create_snooze(): Could not schedule a trigger for "
+			   "%ld, discarding...", (long) t);
 		return;
 	}
 
 	orig_qa->instance->trigger = t;
 	orig_qa->alarm_id = new_id;
 	orig_qa->snooze = TRUE;
-	d(printf("%s:%d (create_snooze) - Adding a alarm at %s\n",__FILE__, __LINE__, ctime(&t)));
 }
 
 /* Launches a component editor for a component */
@@ -888,8 +740,6 @@ edit_component (ECal *client, ECalComponent *comp)
 	GNOME_Evolution_Calendar_CompEditorFactory factory;
 	GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type;
 
-	d(printf("%s:%d (edit_component) - Client %d\n",__FILE__, __LINE__, client));
-	
 	e_cal_component_get_uid (comp, &uid);
 
 	uri = e_cal_get_uri (client);
@@ -972,8 +822,6 @@ free_tray_icon_data (TrayIconData *tray_data)
 	g_object_unref (tray_data->client);
 	tray_data->client = NULL;
 
-	g_signal_handlers_disconnect_matched (tray_data->query, G_SIGNAL_MATCH_FUNC,
-					      0, 0, NULL, on_dialog_objs_removed_cb, NULL);
 	g_object_unref (tray_data->query);
 	tray_data->query = NULL;
 
@@ -989,21 +837,12 @@ free_tray_icon_data (TrayIconData *tray_data)
 }
 
 static void
-on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data)
+on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data)
 {
 	const char *our_uid;
 	GList *l;
-	TrayIconData *tray_data;
-	struct _query_msg *list = msg->data;
-	ECal *client;
-	GList *objects;
+	TrayIconData *tray_data = data;
 
-	d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__));
-	
-	client = list->client;
-	tray_data = list->data;
-	objects = list->objects;
-	
 	e_cal_component_get_uid (tray_data->comp, &our_uid);
 	g_return_if_fail (our_uid && *our_uid);
 
@@ -1022,190 +861,19 @@ on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data)
 	}
 }
 
-static void
-on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data)
-{
-	AlarmMsg *msg;
-	struct _query_msg *list;
-
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = on_dialog_objs_removed_async;
-
-	list = malloc (sizeof (struct _query_msg));
-	list->client = client;
-	list->objects = objects;
-	list->data = data;
-	msg->data = list;
-
-	d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__));
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);	
-}
-
-struct _tray_cqa_msg {
-	CompQueuedAlarms *cqa;
-};
-
-static void
-tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data)
-{
-	struct _tray_cqa_msg *tmsg = msg->data;
-	CompQueuedAlarms *cqa = tmsg->cqa;
-	GList *list = tray_icons_list;
-
-	d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %d from tray list\n",__FILE__, __LINE__, cqa));
-	
-	while (list) {
-		TrayIconData *tray_data = list->data;
-		GList *tmp = list;
-		GtkTreeIter iter;
-		GtkTreeModel *model;
-		
-		list = list->next;
-		if (tray_data->cqa == cqa) {
-			d(printf("%s:%d (tray_list_remove_cqa_async) - Found.\n", __FILE__, __LINE__));
-			tray_icons_list = g_list_delete_link (tray_icons_list, tmp);
-			if (alarm_notifications_dialog) {
-				model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
-				gtk_list_store_remove (GTK_LIST_STORE (model), &(tray_data->iter));
-			}
-			free_tray_icon_data (tray_data);
-		}
-	}
-	
-	d(printf("%s:%d (tray_list_remove_cqa_async) - %d alarms left.\n", __FILE__, __LINE__, g_list_length (tray_icons_list)));
-	
-	if (alarm_notifications_dialog) {
-		if (!g_list_length (tray_icons_list)) {
-			gtk_widget_destroy (alarm_notifications_dialog->dialog);
-			g_free (alarm_notifications_dialog);
-			alarm_notifications_dialog = NULL;
-		} else {
-			GtkTreeIter iter;
-			GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
-			gboolean valid = gtk_tree_model_get_iter_first (model, &iter);		
-			GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
-			gtk_tree_selection_select_iter (sel, &iter);
-		}
-	}
-}
-
-static void
-tray_list_remove_cqa (CompQueuedAlarms *cqa)
-{
-	AlarmMsg *msg;
-	struct _tray_cqa_msg *list;
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = tray_list_remove_cqa_async;
-
-	list = malloc (sizeof (struct _tray_cqa_msg));
-	list->cqa = cqa;
-	msg->data = list;
-
-	d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__));
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-}
-
 /* Callback used from the alarm notify dialog */
 static void
-tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data)
-{
-	GList *list = tray_icons_list;
-
-	d(printf("%s:%d (tray_list_remove_async) - Removing %d alarms\n",__FILE__, __LINE__, g_list_length(list)));
-	while (list != NULL) {
-
-		TrayIconData *tray_data = list->data;
-	
-		if (!tray_data->snooze_set){
-			GList *temp = list->next;
-			gboolean status;
-			
-			tray_icons_list = g_list_remove_link (tray_icons_list, list);
-			status = remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, FALSE, TRUE);
-			if (status) {
-				g_hash_table_remove (tray_data->cqa->parent_client->uid_alarms_hash, tray_data->cqa->id);
-				e_cal_component_free_id (tray_data->cqa->id);
-				g_free (tray_data->cqa);
-			}
-			free_tray_icon_data (tray_data);
-			tray_data = NULL;
-			g_list_free_1 (list);
-			if (tray_icons_list != list)	/* List head is modified */
-				list = tray_icons_list;
-			else 
-				list = temp;
-		} else
-			list = list->next;
-	}	
-}
-
-static void
-tray_list_remove_icons ()
-{
-	AlarmMsg *msg;
-
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = tray_list_remove_async;
-
-	msg->data = NULL;
-
-	d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__));
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-}
-
-struct _tray_msg {
-	TrayIconData *data;
-};
-
-static void
-tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data)
-{
-	struct _tray_msg *tmsg = msg->data;
-	TrayIconData *tray_data = tmsg->data;
-
-	d(printf("%s:%d (tray_list_remove_data_async) - Removing %d from tray list\n",__FILE__, __LINE__, tray_data));
-	
-	tray_icons_list = g_list_remove_all (tray_icons_list, tray_data);
-	free_tray_icon_data (tray_data);
-	tray_data = NULL;
-}
-
-static void
-tray_list_remove_data (TrayIconData *data)
-{
-	AlarmMsg *msg;
-	struct _tray_msg *list;
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = tray_list_remove_data_async;
-
-	list = malloc (sizeof (struct _tray_msg));
-	list->data = data;
-	msg->data = list;
-
-	d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__));
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-}
-
-static void
 notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
 {
 	TrayIconData *tray_data = data;
-
-	d(printf("%s:%d (notify_dialog_cb) - Received from dialog\n",__FILE__, __LINE__));
 	
 	g_signal_handlers_disconnect_matched (tray_data->query, G_SIGNAL_MATCH_FUNC,
 					      0, 0, NULL, on_dialog_objs_removed_cb, NULL);
 
 	switch (result) {
 	case ALARM_NOTIFY_SNOOZE:
-		d(printf("%s:%d (notify_dialog_cb) - Creating a snooze\n",__FILE__, __LINE__)); 
 		create_snooze (tray_data->cqa, tray_data->alarm_id, snooze_mins);
 		tray_data->snooze_set = TRUE;
-		tray_list_remove_data (tray_data);
 		if (alarm_notifications_dialog) {
 			GtkTreeSelection *selection = 
 				gtk_tree_view_get_selection (
@@ -1237,7 +905,7 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
 		break;
 
 	case ALARM_NOTIFY_CLOSE:
-		d(printf("%s:%d (notify_dialog_cb) - Dialog close\n",__FILE__, __LINE__));
+
 		if (alarm_notifications_dialog) {
 			GList *list;
 			GtkTreeIter iter;
@@ -1255,8 +923,27 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
 			g_free (alarm_notifications_dialog);
 			alarm_notifications_dialog = NULL;
 		
-			/* Task to remove the tray icons */
-			tray_list_remove_icons ();
+			/* FIXME tray_icons_list is a global data structure - make this thread safe */
+
+			list = tray_icons_list;
+			while (list != NULL) {
+
+				tray_data = list->data;
+	
+				if (!tray_data->snooze_set){
+					GList *temp = list->next;
+					tray_icons_list = g_list_remove_link (tray_icons_list, list);
+					remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, TRUE, TRUE);
+					free_tray_icon_data (tray_data);
+					tray_data = NULL;
+					g_list_free_1 (list);
+					if (tray_icons_list != list)	/* List head is modified */
+						list = tray_icons_list;
+					else 
+						list = temp;
+				} else
+					list = list->next;
+			}
 	}
 
 		break;
@@ -1273,8 +960,7 @@ static gboolean
 open_alarm_dialog (TrayIconData *tray_data)
 {
 	QueuedAlarm *qa;
-
-	d(printf("%s:%d (open_alarm_dialog) \n",__FILE__, __LINE__));
+	
 	qa = lookup_queued_alarm (tray_data->cqa, tray_data->alarm_id);
 	if (qa) {
 
@@ -1323,7 +1009,6 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
 	TrayIconData *tray_data = user_data;
 
 	if (event->type == GDK_BUTTON_PRESS) {
-			d(printf("%s:%d (tray_icon_clicked_cb) - left click and %d alarms\n",__FILE__, __LINE__, g_list_length (tray_icons_list))); 		 
 		if (event->button == 1 && g_list_length (tray_icons_list) > 0) {
 			GList *tmp;
 			for (tmp = tray_icons_list; tmp; tmp = tmp->next) {
@@ -1332,11 +1017,11 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
 			
 			return TRUE;
 		} else if (event->button == 3) {
-			d(printf("%s:%d (tray_icon_clicked_cb) - right click\n",__FILE__, __LINE__)); 
+			
 			if (tray_blink_id > -1)
 				g_source_remove (tray_blink_id);
 			tray_blink_id = -1;
-			
+
 			gtk_widget_destroy (tray_icon);
 			tray_icon = NULL;
 #ifndef USE_GTK_STATUS_ICON
@@ -1387,35 +1072,6 @@ tray_icon_blink_cb (gpointer data)
 	return TRUE;
 }
 
-
-/* Add a new data to tray list */
-
-static void
-tray_list_add_async (EThread *e, AlarmMsg *msg, void *data)
-{
-	struct _tray_msg *list = msg->data;
-	d(printf("%s:%d (tray_list_add_async) - Add %d\n",__FILE__, __LINE__, list->data));	
-	tray_icons_list = g_list_prepend (tray_icons_list, list->data);
-}
-
-static void
-tray_list_add_new (TrayIconData *data)
-{
-	AlarmMsg *msg;
-	struct _tray_msg *list;
-
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = tray_list_add_async;
-
-	list = malloc (sizeof (struct _tray_msg));
-	list->data = data;
-	msg->data = list;
-	
-	d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__));	
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-}
-
 /* Performs notification of a display alarm */
 static void
 display_notification (time_t trigger, CompQueuedAlarms *cqa,
@@ -1435,8 +1091,6 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	icaltimezone *current_zone;
 	ECalComponentOrganizer organiser;
 
-	d(printf("%s:%d (display_notification)\n",__FILE__, __LINE__));
-	
 	comp = cqa->alarms->comp;
 	qa = lookup_queued_alarm (cqa, alarm_id);
 	if (!qa)
@@ -1521,8 +1175,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	g_object_ref (tray_data->client);
 	tray_data->tray_icon = tray_icon;
 
-	/* Task to add tray_data to the global tray_icon_list */
-	tray_list_add_new (tray_data);
+	tray_icons_list = g_list_prepend (tray_icons_list, tray_data);
 
 	if (g_list_length (tray_icons_list) > 1) {
 		char *tip;
@@ -1577,8 +1230,6 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 	icaltimezone *current_zone;
 	ECalComponentOrganizer organiser;
 	char *body;
-
-	d(printf("%s:%d (popup_notification)\n",__FILE__, __LINE__));
 	
 	comp = cqa->alarms->comp;
 	qa = lookup_queued_alarm (cqa, alarm_id);
@@ -1650,8 +1301,6 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
 	icalattach *attach;
 	int	flag = 0;
 
-	d(printf("%s:%d (audio_notification)\n",__FILE__, __LINE__));
-	
 	comp = cqa->alarms->comp;
 	qa = lookup_queued_alarm (cqa, alarm_id);
 	if (!qa)
@@ -1691,8 +1340,6 @@ mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
 
 	/* FIXME */
 
-	d(printf("%s:%d (mail_notification)\n",__FILE__, __LINE__));
-	
 	dialog = gtk_dialog_new_with_buttons (_("Warning"),
 					      NULL, 0,
 					      GTK_STOCK_OK, GTK_RESPONSE_CANCEL,
@@ -1713,8 +1360,6 @@ procedure_notification_dialog (const char *cmd, const char *url)
 	GtkWidget *dialog, *label, *checkbox;
 	char *str;
 	int btn;
-
-	d(printf("%s:%d (procedure_notification_dialog)\n",__FILE__, __LINE__));
 	
 	if (config_data_is_blessed_program (url))
 		return TRUE;
@@ -1765,8 +1410,6 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id
 	char *cmd;
 	int result;
 
-	d(printf("%s:%d (procedure_notification)\n",__FILE__, __LINE__));
-	
 	comp = cqa->alarms->comp;
 	qa = lookup_queued_alarm (cqa, alarm_id);
 	if (!qa)
@@ -1825,27 +1468,14 @@ check_midnight_refresh (gpointer user_data)
 	time_t new_midnight;
 	icaltimezone *zone;
 
-	d(printf("%s:%d (check_midnight_refresh)\n",__FILE__, __LINE__));
-	
 	zone = config_data_get_timezone ();
 	new_midnight = time_day_end_with_zone (time (NULL), zone);
 
 	if (new_midnight > midnight) {
-		AlarmMsg *msg;
-		struct _midnight_refresh_msg *list;
-	
-		/* These two structures will be freed by the msg destroy function*/
-		msg = malloc (sizeof (AlarmMsg));
-		msg->receive_msg = midnight_refresh_async;
+		/* Re-load the alarms for all clients */
+		g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL);
 
-		list = malloc (sizeof (struct _midnight_refresh_msg));
-
-		list->remove = FALSE;
-		/* We dont need it. So set it to NULL */
-		msg->data = list;
-
-		d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__));
-		e_thread_put(alarm_operation_thread, (EMsg *)msg);		
+		queue_midnight_refresh ();
 	}
 
 	return TRUE;
@@ -1863,15 +1493,12 @@ alarm_queue_init (gpointer data)
 	an = data;
 	g_return_if_fail (alarm_queue_inited == FALSE);
 
-	d(printf("%s:%d (alarm_queue_init)\n",__FILE__, __LINE__));
-	
 	client_alarms_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
 	queue_midnight_refresh ();
 
 	saved_notification_time = config_data_get_last_notification_time ();
 	if (saved_notification_time == -1) {
 		saved_notification_time = time (NULL);
-		d(printf("%s:%d (alarm_queue_init) - Setting last notification time to %s\n",__FILE__, __LINE__, ctime(&saved_notification_time)));
 		config_data_set_last_notification_time (saved_notification_time);
 	}
 
@@ -1890,21 +1517,15 @@ free_client_alarms_cb (gpointer key, gpointer value, gpointer user_data)
 {
 	ClientAlarms *ca = value;
 
-	d(printf("%s:%d (free_client_alarms_cb) - %d \n",__FILE__, __LINE__, ca));
-	
 	if (ca) {
 		remove_client_alarms (ca);
 		if (ca->client) {
-			d(printf("%s:%d (free_client_alarms_cb) - Disconnecting Client \n",__FILE__, __LINE__));
-						
 			g_signal_handlers_disconnect_matched (ca->client, G_SIGNAL_MATCH_DATA,
 							      0, 0, NULL, NULL, ca);
 			g_object_unref (ca->client);
 		}
 
 		if (ca->query) {
-			d(printf("%s:%d (free_client_alarms_cb) - Disconnecting Query \n",__FILE__, __LINE__));
-			
 			g_signal_handlers_disconnect_matched (ca->query, G_SIGNAL_MATCH_DATA,
 							      0, 0, NULL, NULL, ca);
 			g_object_unref (ca->query);
@@ -1934,8 +1555,6 @@ alarm_queue_done (void)
 	/* All clients must be unregistered by now */
 	g_return_if_fail (g_hash_table_size (client_alarms_hash) == 0);
 
-	d(printf("%s:%d (alarm_queue_done)\n",__FILE__, __LINE__));
-	
 	g_hash_table_foreach_remove (client_alarms_hash, (GHRFunc) free_client_alarms_cb, NULL);
 	g_hash_table_destroy (client_alarms_hash);
 	client_alarms_hash = NULL;
@@ -1955,9 +1574,9 @@ compare_ids (gpointer a, gpointer b)
 
 	id = a;
 	id1 = b;
+
 	if (id->uid != NULL && id1->uid != NULL) {
 		if (g_str_equal (id->uid, id1->uid)) {
-
 			if (id->rid && id1->rid)
 				return g_str_equal (id->rid, id1->rid);
 			else if (!(id->rid && id1->rid))
@@ -1967,23 +1586,24 @@ compare_ids (gpointer a, gpointer b)
 	return FALSE;
 }
 
-static guint 
-hash_ids (gpointer a)
-{
-	ECalComponentId *id =a;
-
-	return g_str_hash (id->uid);
-}
-
-struct _alarm_client_msg {
-	ECal *client;
-};
-
-static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data)
+/**
+ * alarm_queue_add_client:
+ * @client: A calendar client.
+ *
+ * Adds a calendar client to the alarm queueing system.  Alarm trigger
+ * notifications will be presented at the appropriate times.  The client should
+ * be removed with alarm_queue_remove_client() when receiving notifications
+ * from it is no longer desired.
+ *
+ * A client can be added any number of times to the alarm queueing system,
+ * but any single alarm trigger will only be presented once for a particular
+ * client.  The client must still be removed the same number of times from the
+ * queueing system when it is no longer wanted.
+ **/
+void
+alarm_queue_add_client (ECal *client)
 {
 	ClientAlarms *ca;
-	struct _alarm_client_msg *list = msg->data;
-	ECal *client = list->client;
 
 	g_return_if_fail (alarm_queue_inited);
 	g_return_if_fail (client != NULL);
@@ -1991,21 +1611,18 @@ static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data)
 
 	ca = lookup_client (client);
 	if (ca) {
-		/* We already have it. Unref the passed one*/
-		g_object_unref(client);
 		return;
 	}
 
-	d(printf("%s:%d (alarm_queue_add_async) - %d\n",__FILE__, __LINE__, client));
-	
 	ca = g_new (ClientAlarms, 1);
 
 	ca->client = client;
 	ca->query = NULL;
+	g_object_ref (ca->client);
 
 	g_hash_table_insert (client_alarms_hash, client, ca);
 
-	ca->uid_alarms_hash = g_hash_table_new ((GHashFunc) hash_ids, (GEqualFunc) compare_ids);
+	ca->uid_alarms_hash = g_hash_table_new (g_direct_hash, (GEqualFunc) compare_ids);
 
 	if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED) {
 		load_alarms_for_today (ca);
@@ -2013,69 +1630,14 @@ static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data)
 		g_signal_connect (client, "cal_opened",
 				  G_CALLBACK (cal_opened_cb),
 				  ca);
-	}	
-}
-
-/**
- * alarm_queue_add_client:
- * @client: A calendar client.
- *
- * Adds a calendar client to the alarm queueing system.  Alarm trigger
- * notifications will be presented at the appropriate times.  The client should
- * be removed with alarm_queue_remove_client() when receiving notifications
- * from it is no longer desired.
- *
- * A client can be added any number of times to the alarm queueing system,
- * but any single alarm trigger will only be presented once for a particular
- * client.  The client must still be removed the same number of times from the
- * queueing system when it is no longer wanted.
- **/
-void
-alarm_queue_add_client (ECal *client)
-{
-	AlarmMsg *msg;
-	struct _alarm_client_msg *list;
-
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = alarm_queue_add_async;
-
-	list = malloc (sizeof (struct _alarm_client_msg));
-	list->client = client;
-	g_object_ref (client);
-	msg->data = list;
-
-	d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__));
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
+	}
 }
 
-/* Removes a component an its alarms */
 static void
-remove_cqa (ClientAlarms *ca, ECalComponentId *id, CompQueuedAlarms *cqa)
-{
-
-	/* If a component is present, then it means we must have alarms queued
-	 * for it.
-	 */
-	g_assert (cqa->queued_alarms != NULL);
-
-	d(printf("%s:%d (remove_cqa) - removing %d alarms\n",__FILE__, __LINE__, g_list_length(cqa->queued_alarms)));
-	remove_alarms (cqa, TRUE);
-}
-
-static gboolean
 remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) {
 
 	ClientAlarms *ca = (ClientAlarms *)userdata;
-	
-	d(printf("%s:%d (remove_comp_by_id)\n",__FILE__, __LINE__));
-	
-/* 	if (!g_hash_table_size (ca->uid_alarms_hash)) */
-/* 		return; */
-	
-	remove_cqa (ca, (ECalComponentId *)key, (CompQueuedAlarms *) value);
-
-	return TRUE;
+	remove_comp (ca, (ECalComponentId *)key);
 }
 
 
@@ -2083,10 +1645,7 @@ remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) {
 static void
 remove_client_alarms (ClientAlarms *ca)
 {
-	d(printf("%s:%d (remove_client_alarms) - size %d \n",__FILE__, __LINE__, g_hash_table_size (ca->uid_alarms_hash))); 
-
-	g_hash_table_foreach_remove  (ca->uid_alarms_hash, (GHFunc)remove_comp_by_id, ca);
-	
+	g_hash_table_foreach (ca->uid_alarms_hash, (GHFunc)remove_comp_by_id, ca);
 	/* The hash table should be empty now */
 	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
 }
@@ -2097,12 +1656,10 @@ remove_client_alarms (ClientAlarms *ca)
  *
  * Removes a calendar client from the alarm queueing system.
  **/
-static void
-alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data)
+void
+alarm_queue_remove_client (ECal *client)
 {
 	ClientAlarms *ca;
-	struct _alarm_client_msg *list = msg->data;
-	ECal *client = list->client;
 
 	g_return_if_fail (alarm_queue_inited);
 	g_return_if_fail (client != NULL);
@@ -2111,13 +1668,10 @@ alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data)
 	ca = lookup_client (client);
 	g_return_if_fail (ca != NULL);
 
-	d(printf("%s:%d (alarm_queue_remove_async) \n",__FILE__, __LINE__));
 	remove_client_alarms (ca);
 
 	/* Clean up */
 	if (ca->client) {
-		d(printf("%s:%d (alarm_queue_remove_async) - Disconnecting Client \n",__FILE__, __LINE__));
-		
 		g_signal_handlers_disconnect_matched (ca->client, G_SIGNAL_MATCH_DATA,
 						      0, 0, NULL, NULL, ca);
 		g_object_unref (ca->client);
@@ -2125,8 +1679,6 @@ alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data)
 	}
 
 	if (ca->query) {
-		d(printf("%s:%d (alarm_queue_remove_async) - Disconnecting Query \n",__FILE__, __LINE__));
-			
 		g_signal_handlers_disconnect_matched (ca->query, G_SIGNAL_MATCH_DATA,
 						      0, 0, NULL, NULL, ca);
 		g_object_unref (ca->query);
@@ -2141,24 +1693,6 @@ alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data)
 	g_hash_table_remove (client_alarms_hash, client);
 }
 
-void
-alarm_queue_remove_client (ECal *client)
-{
-	AlarmMsg *msg;
-	struct _alarm_client_msg *list;
-
-	/* These two structures will be freed by the msg destroy function*/
-	msg = malloc (sizeof (AlarmMsg));
-	msg->receive_msg = alarm_queue_remove_async;
-
-	list = malloc (sizeof (struct _alarm_client_msg));
-	list->client = client;
-	msg->data = list;
-
-	d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-}
-
 /* Update non-time related variables for various structures on modification of an existing component 
    to be called only from query_objects_changed_cb */
 static void 
@@ -2177,7 +1711,7 @@ update_cqa (CompQueuedAlarms *cqa, ECalComponent *newcomp)
 	from = time_day_begin_with_zone (time (NULL), zone);
 	to = time_day_end_with_zone (time (NULL), zone);
 
-	d(printf("%s:%d (update_cqa) - Generating alarms between %s and %s\n",__FILE__, __LINE__, ctime(&from), ctime(&to)));
+
 	alarms = e_cal_util_generate_alarms_for_comp (newcomp, from, to, omit, 
 					e_cal_resolve_tzid_cb, cqa->parent_client->client, zone);
 
@@ -2191,7 +1725,7 @@ update_cqa (CompQueuedAlarms *cqa, ECalComponent *newcomp)
 		else {
 			if (e_cal_component_get_alarm (oldcomp, check_auid)) { /* Need to update QueuedAlarms */
 				if (alarms == NULL) {
-					d(printf("%s:%d (update_cqa) - No alarms found in the modified component\n",__FILE__, __LINE__)); 
+					g_warning ("No alarms found on the modified component\n");
 					break;
 				}
 				update_qa (alarms, qa);
@@ -2213,8 +1747,7 @@ update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa)
 {
 	ECalComponentAlarmInstance *al_inst;
 	GSList *instance_list;
-
-	d(printf("%s:%d (update_qa)\n",__FILE__, __LINE__));
+	
 	for (instance_list = alarms->alarms; instance_list; instance_list = instance_list->next) {
 		al_inst = instance_list->data;
 		if (al_inst->trigger == qa->orig_trigger) {  /* FIXME if two or more alarm instances (audio, note) 									  for same component have same trigger */
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in.in b/calendar/gui/apps_evolution_calendar.schemas.in.in
index 34730bd303..2f8bb740e9 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in.in
@@ -16,18 +16,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/calendar/display/use_daylight_saving</key>
-      <applyto>/apps/evolution/calendar/display/use_daylight_saving</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>daylight savings time</short>
-        <long>Whether to use daylight savings time while displaying events.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/evolution/calendar/display/use_24hour_format</key>
       <applyto>/apps/evolution/calendar/display/use_24hour_format</applyto>
       <owner>evolution-calendar</owner>
@@ -230,17 +218,7 @@
         <long>Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long>
       </locale>
     </schema>
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/tag_vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/tag_vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>float</type>
-      <default>0.5</default>
-      <locale name="C">
-        <short>Month view vertical pane position </short>
-        <long>Position of the vertical pane, between the calendar lists and the date navigator calendar.</long>
-      </locale>
-    </schema>
+
     <schema>
       <key>/schemas/apps/evolution/calendar/display/show_task_preview</key>
       <applyto>/apps/evolution/calendar/display/show_task_preview</applyto>
@@ -339,30 +317,6 @@
       </locale>
     </schema>
 
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/events_transparency</key>
-      <applyto>/apps/evolution/calendar/display/events_transparency</applyto>
-      <owner>evolution-calendar</owner>
-      <type>float</type>
-      <default>1.0</default>
-      <locale name="C">
-        <short>Event Transparency</short>
-        <long>Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque).</long>
-      </locale>
-    </schema>
-
-     <schema>
-      <key>/schemas/apps/evolution/calendar/display/events_gradient</key>
-      <applyto>/apps/evolution/calendar/display/events_gradient</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Event Gradient</short>
-        <long>Gradient of the events in calendar views.</long>
-      </locale>
-    </schema>
-
     <!-- Tasks -->
 
     <schema>
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index c125b0a241..b88850c8ce 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -86,11 +86,9 @@ typedef struct
 {
 	ESourceList *source_list;
 	ESourceList *task_source_list;
-	ESourceList *memo_source_list;
 	
 	GSList *source_selection;
 	GSList *task_source_selection;
-	GSList *memo_source_selection;
 	
 	GnomeCalendar *calendar;
 
@@ -106,8 +104,6 @@ typedef struct
 	EUserCreatableItemsHandler *creatable_items_handler;
 
 	EActivityHandler *activity_handler;
-	
-	float	     vpane_pos;
 } CalendarComponentView;
 
 struct _CalendarComponentPrivate {
@@ -119,7 +115,6 @@ struct _CalendarComponentPrivate {
 
 	ESourceList *source_list;
 	ESourceList *task_source_list;
-	ESourceList *memo_source_list;
 
 	GList *views;
 
@@ -132,22 +127,6 @@ struct _CalendarComponentPrivate {
 extern ECompEditorRegistry *comp_editor_registry;
 
 static void
-calcomp_vpane_realized (GtkWidget *vpane, CalendarComponentView *view)
-{
-	gtk_paned_set_position (GTK_PANED (vpane), view->vpane_pos*vpane->allocation.height);
-}
-
-static gboolean
-calcomp_vpane_resized (GtkWidget *vpane, GdkEventButton *e, CalendarComponentView *view)
-{
-
-	view->vpane_pos = gtk_paned_get_position (GTK_PANED (vpane));
-	calendar_config_set_tag_vpane_pos (view->vpane_pos/(float)vpane->allocation.height);
-
-	return FALSE;
-}
-
-static void
 ensure_sources (CalendarComponent *component)
 {
 	GSList *groups;
@@ -409,52 +388,39 @@ update_selection (CalendarComponentView *component_view)
 }
 
 static void
-update_task_memo_selection (CalendarComponentView *component_view, ECalSourceType type)
+update_task_selection (CalendarComponentView *component_view)
 {
-	GSList *uids_selected, *l, *source_selection;
-	ESourceList *source_list = NULL;
-
-	if (type == E_CAL_SOURCE_TYPE_TODO) {
-		/* Get the selection in gconf */
-		uids_selected = calendar_config_get_tasks_selected ();
-		source_list = component_view->task_source_list;
-		source_selection = component_view->task_source_selection;
-		
-	} else {
-		uids_selected = calendar_config_get_memos_selected ();
-		source_list = component_view->memo_source_list;
-		source_selection = component_view->memo_source_selection;
-	}
+	GSList *uids_selected, *l;
+
+	/* Get the selection in gconf */
+	uids_selected = calendar_config_get_tasks_selected ();
 
 	/* Remove any that aren't there any more */
-	for (l = source_selection; l; l = l->next) {
+	for (l = component_view->task_source_selection; l; l = l->next) {
 		char *uid = l->data;
 		ESource *source;
 
-		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
+		source = e_source_list_peek_source_by_uid (component_view->task_source_list, uid);
 		if (!source)
-			gnome_calendar_remove_source_by_uid (component_view->calendar, type, uid);
+			gnome_calendar_remove_source_by_uid (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, uid);
 		else if (!is_in_uids (uids_selected, source))
-			gnome_calendar_remove_source (component_view->calendar, type, source);
+			gnome_calendar_remove_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source);
 		
 		g_free (uid);
 	}
-	g_slist_free (source_selection);
+	g_slist_free (component_view->task_source_selection);
 
 	/* Make sure the whole selection is there */
 	for (l = uids_selected; l; l = l->next) {
 		char *uid = l->data;
 		ESource *source;
 
-		source = e_source_list_peek_source_by_uid (source_list, uid);
-		if (source && !gnome_calendar_add_source (component_view->calendar, type, source))
+		source = e_source_list_peek_source_by_uid (component_view->task_source_list, uid);
+		if (source && !gnome_calendar_add_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source))
 			/* FIXME do something */;
 	}
 
-	if (type == E_CAL_SOURCE_TYPE_TODO)
-		component_view->task_source_selection = uids_selected;
-	else
-		component_view->memo_source_selection = uids_selected;
+	component_view->task_source_selection = uids_selected;
 }
 
 static void
@@ -480,28 +446,20 @@ update_primary_selection (CalendarComponentView *component_view)
 }
 
 static void
-update_primary_task_memo_selection (CalendarComponentView *component_view, ECalSourceType type)
+update_primary_task_selection (CalendarComponentView *component_view)
 {
 	ESource *source = NULL;
 	char *uid;
-	ESourceList *source_list = NULL;
-
-	if (type == E_CAL_SOURCE_TYPE_TODO) {
-		uid = calendar_config_get_primary_tasks ();
-		source_list = component_view->task_source_list;
-	} else {
-		uid = calendar_config_get_primary_memos ();
-		source_list = component_view->memo_source_list;
-	}
 
+	uid = calendar_config_get_primary_tasks ();
 	if (uid) {
-		source = e_source_list_peek_source_by_uid (source_list, uid);
+		source = e_source_list_peek_source_by_uid (component_view->task_source_list, uid);
 
 		g_free (uid);
 	}
 	
 	if (source)
-		gnome_calendar_set_default_source (component_view->calendar, type, source);
+		gnome_calendar_set_default_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source);
 }
 
 /* Callbacks.  */
@@ -772,27 +730,14 @@ config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *
 static void
 config_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
-	update_task_memo_selection (data, E_CAL_SOURCE_TYPE_TODO);
+	update_task_selection (data);
 }
 
 
 static void
 config_primary_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
-	update_primary_task_memo_selection (data, E_CAL_SOURCE_TYPE_TODO);
-}
-
-static void
-config_memos_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_task_memo_selection (data, E_CAL_SOURCE_TYPE_JOURNAL);
-}
-
-
-static void
-config_primary_memos_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_primary_task_memo_selection (data, E_CAL_SOURCE_TYPE_JOURNAL);
+	update_primary_task_selection (data);
 }
 
 /* Evolution::Component CORBA methods.  */
@@ -1193,11 +1138,8 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView
 							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
 							 _("Unable to open the calendar '%s' for creating events and meetings"), 
 							 e_source_peek_name (source));
-
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
-			g_object_unref (priv->create_ecal);
-			priv->create_ecal = NULL;
 
 			return NULL;
 		}
@@ -1303,7 +1245,7 @@ create_component_view (CalendarComponent *calendar_component)
 {
 	CalendarComponentPrivate *priv;
 	CalendarComponentView *component_view;
-	GtkWidget *selector_scrolled_window, *vbox, *vpane;
+	GtkWidget *selector_scrolled_window, *vbox;
 	GtkWidget *statusbar_widget;
 	guint not;
 	AtkObject *a11y;
@@ -1313,17 +1255,9 @@ create_component_view (CalendarComponent *calendar_component)
 	/* Create the calendar component view */
 	component_view = g_new0 (CalendarComponentView, 1);
 	
-	vpane = gtk_vpaned_new ();
-	g_signal_connect_after (vpane, "realize",
-				G_CALLBACK(calcomp_vpane_realized), component_view);
-	g_signal_connect (vpane, "button_release_event",
-			  G_CALLBACK (calcomp_vpane_resized), component_view);
-	gtk_widget_show (vpane);
 	/* Add the source lists */
 	component_view->source_list = g_object_ref (priv->source_list);
 	component_view->task_source_list = g_object_ref (priv->task_source_list);
-	component_view->memo_source_list = g_object_ref (priv->memo_source_list);
-	component_view->vpane_pos = calendar_config_get_tag_vpane_pos ();
 	
 	/* Create sidebar selector */
 	component_view->source_selector = e_source_selector_new (calendar_component->priv->source_list);
@@ -1361,10 +1295,8 @@ create_component_view (CalendarComponent *calendar_component)
 	gtk_box_pack_start(GTK_BOX (vbox), GTK_WIDGET (component_view->info_label), FALSE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
 	gtk_widget_show (vbox);
-	
-	gtk_paned_pack1 (GTK_PANED (vpane), vbox, FALSE, TRUE);	
-	
-	component_view->sidebar_control = bonobo_control_new (vpane);
+
+	component_view->sidebar_control = bonobo_control_new (vbox);
 
 	/* Create main view */
 	component_view->view_control = control_factory_new_control ();
@@ -1373,10 +1305,8 @@ create_component_view (CalendarComponent *calendar_component)
 
 		return NULL;
 	}
-	
-	component_view->calendar = (GnomeCalendar *) bonobo_control_get_widget (component_view->view_control);
 
-	gtk_paned_pack2 (GTK_PANED (vpane), gnome_calendar_get_tag (component_view->calendar), FALSE, TRUE);	
+	component_view->calendar = (GnomeCalendar *) bonobo_control_get_widget (component_view->view_control);
 
 	/* This signal is thrown if backends die - we update the selector */
 	g_signal_connect (component_view->calendar, "source_added", 
@@ -1415,28 +1345,18 @@ create_component_view (CalendarComponent *calendar_component)
 	/* Load the selection from the last run */
 	update_selection (component_view);	
 	update_primary_selection (component_view);
-	update_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_TODO);
-	update_primary_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_TODO);
-	update_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_JOURNAL);
-	update_primary_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_JOURNAL);
+	update_task_selection (component_view);
+	update_primary_task_selection (component_view);
 
-	/* If the tasks/memos selection changes elsewhere, update it for the mini
+	/* If the tasks selection changes elsewhere, update it for the mini
 	   mini tasks view sidebar */
 	not = calendar_config_add_notification_tasks_selected (config_tasks_selection_changed_cb, 
 							       component_view);
 	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
 
-	not = calendar_config_add_notification_memos_selected (config_memos_selection_changed_cb, 
-							       component_view);
-	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
-
 	not = calendar_config_add_notification_primary_tasks (config_primary_tasks_selection_changed_cb, 
 							      component_view);
 	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
-	
-	not = calendar_config_add_notification_primary_memos (config_primary_memos_selection_changed_cb, 
-							      component_view);
-	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
 
 	return component_view;
 }
@@ -1451,9 +1371,6 @@ destroy_component_view (CalendarComponentView *component_view)
 
 	if (component_view->task_source_list)
 		g_object_unref (component_view->task_source_list);
-	
-	if (component_view->memo_source_list)
-		g_object_unref (component_view->memo_source_list);
 
 	if (component_view->source_selection)
 		e_source_selector_free_selection (component_view->source_selection);
@@ -1696,11 +1613,8 @@ calendar_component_init (CalendarComponent *component)
 
 	component->priv = priv;
 	ensure_sources (component);
-
 	if (!e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL))
 		;
-	if (!e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL))
-		;
 }
 
 
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index ad53c71668..6d39cbdff2 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -509,11 +509,11 @@ alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
             if (a->cn != NULL && *a->cn)
                 e_destination_set_name (dest, a->cn);
             if (a->value != NULL && *a->value) {
-                if (!strncasecmp (a->value, "MAILTO:", 7))
-                    e_destination_set_email (dest, a->value + 7);
-                else
-                    e_destination_set_email (dest, a->value);
-            }
+				if (!strncasecmp (a->value, "MAILTO:", 7))
+					e_destination_set_email (dest, a->value + 7);
+				else
+					e_destination_set_email (dest, a->value);
+			}
             e_destination_store_append_destination (destination_store, dest);
             g_object_unref(GTK_OBJECT (dest));
         }
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 92ca58e1c6..4d3d33b5e0 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -96,7 +96,7 @@
 	      <child>
 		<widget class="GtkTable" id="time">
 		  <property name="visible">True</property>
-		  <property name="n_rows">3</property>
+		  <property name="n_rows">2</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">6</property>
@@ -151,8 +151,8 @@
 		    <packing>
 		      <property name="left_attach">0</property>
 		      <property name="right_attach">1</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
+		      <property name="top_attach">1</property>
+		      <property name="bottom_attach">2</property>
 		      <property name="x_options">fill</property>
 		      <property name="y_options"></property>
 		    </packing>
@@ -226,32 +226,10 @@
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="daylight_cb">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Adjust for daylight sa_ving time</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
 		      <property name="top_attach">1</property>
 		      <property name="bottom_attach">2</property>
 		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 		</widget>
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 389834180f..537eb0618e 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -385,23 +385,20 @@ static BonoboUIVerb verbs [] = {
 };
 
 static EPixmap pixmaps[] = {
-	/* NOTE: If adding removing elements in this array, make sure
-	 * the indexes of the two elements where the pathname to the
+	/* NOTE: If adding or removing elements in this array, make
+	 * sure the index of the element where the pathname to the
 	 * icons is filled in at run-time in event_editor_init() are
 	 * updated, too.
 	 */
 	E_PIXMAP ("/Toolbar/ActionAlarm", "stock_alarm", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Options/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/Toolbar/ActionAllDayEvent", "stock_new-24h-appointment", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR),	
 	E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),	
-	E_PIXMAP ("/menu/Options/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),		
-	/* These two will have an absolute path to the png file filled
-	 * in at run-time, see event_editor_init().
+	/* This will have an absolute path to the png file filled in
+	 * at run-time, see event_editor_init().
 	 */
 	E_PIXMAP ("/Toolbar/ActionFreeBusy", NULL, E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Options/ActionFreeBusy", NULL, E_ICON_SIZE_MENU),			
 	E_PIXMAP_END
 };
 
@@ -523,13 +520,11 @@ event_editor_init (EventEditor *ee)
 		editor->uic, "ActionFreeBusy", 
 		menu_action_freebusy_cb, editor);
 
-	/* NOTE: Make sure the 7 and 8 below correspond to the correct
-	 * elements in the pixmaps array.
+	/* NOTE: Make sure the 5 below corresponds to the correct
+	 * element in the pixmaps array.
 	 */
-	if (!pixmaps[7].name) {
-		pixmaps[7].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
-		pixmaps[8].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
-	}
+	if (!pixmaps[5].name)
+		pixmaps[5].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
 	e_pixmaps_update (editor->uic, pixmaps);
 
 	bonobo_ui_component_thaw (editor->uic, NULL);	
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index 95fffa2eb8..b1cdcde6ee 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -77,7 +77,7 @@
 	      <child>
 		<widget class="GtkLabel" id="location-label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Location:</property>
+		  <property name="label" translatable="yes">Locat_ion:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -855,7 +855,7 @@
 			      <child>
 				<widget class="GtkLabel" id="attendees-label">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Attendee_s...</property>
+				  <property name="label" translatable="yes">Atte_ndees...</property>
 				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 2658124192..b98925c0c1 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -468,11 +468,6 @@ ecm_value_at (ETableModel *etm, int col, int row)
 		comp = e_cal_component_new ();
 		icalcomp = icalcomponent_new_clone (comp_data->icalcomp);
 		if (e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_JOURNAL) {
-				g_object_unref (comp);
-				return GINT_TO_POINTER (retval);
-			}
-				
 			if (e_cal_component_has_recurrences (comp))
 				retval = 1;
 			else if (itip_organizer_is_user (comp, comp_data->client))
@@ -785,7 +780,6 @@ ecm_duplicate_value (ETableModel *etm, int col, const void *value)
 	switch (col) {
 	case E_CAL_MODEL_FIELD_CATEGORIES :
 	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
 	case E_CAL_MODEL_FIELD_SUMMARY :
 		return g_strdup (value);
 	case E_CAL_MODEL_FIELD_HAS_ALARMS :
@@ -1838,9 +1832,6 @@ e_cal_model_create_component_with_defaults (ECalModel *model)
 	case ICAL_VTODO_COMPONENT :
 		comp = cal_comp_task_new_with_defaults (client);
 		break;
-	case ICAL_VJOURNAL_COMPONENT :
-	        comp = cal_comp_memo_new_with_defaults (client);
-		break;
 	default:
 		return NULL;
 	}
@@ -2138,27 +2129,5 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, icaltimezone *zon
 	
 	comp_data->instance_start = icaltime_as_timet_with_zone (start_time, zone);
 
-	if (end_time.zone)
-		zone = end_time.zone;
-	else {
-		icalparameter *param = NULL;
-		icalproperty *prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTSTART_PROPERTY);
-	
-	       if (prop)	{
-			param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-
-			if (param) {
-				const char *tzid = NULL;
-				icaltimezone *end_zone = NULL;
-
-				tzid = icalparameter_get_tzid (param);
-				e_cal_get_timezone (comp_data->client, tzid, &end_zone, NULL);
-
-				if (end_zone)
-					zone = end_zone;
-			}
-	       }
-
-	}
 	comp_data->instance_end = icaltime_as_timet_with_zone (end_time, zone);
 }
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index c8408c647c..825335ec04 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -859,60 +859,10 @@ e_calendar_view_paste_clipboard (ECalendarView *cal_view)
 }
 
 static void
-add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModType mod)
-{
-	icalcomponent *icalcomp = NULL;
-	icalproperty *icalprop = NULL;
-
-	icalcomp = e_cal_component_get_icalcomponent (comp);
-	if (retract_comment && *retract_comment)
-		icalprop = icalproperty_new_x (retract_comment);
-	else
-		icalprop = icalproperty_new_x ("0");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-RETRACT-COMMENT");
-	icalcomponent_add_property (icalcomp, icalprop);
-
-	if (mod == CALOBJ_MOD_ALL) 
-		icalprop = icalproperty_new_x ("All");
-	else
-		icalprop = icalproperty_new_x ("This");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-RECUR-MOD");
-	icalcomponent_add_property (icalcomp, icalprop);
-}
-
-static gboolean 
-check_for_retract (ECalComponent *comp, ECal *client)
-{
-	ECalComponentOrganizer org;
-	char *email = NULL;
-	const char *strip = NULL;
-	gboolean ret_val = FALSE;
-
-	if (!(e_cal_component_has_attendees (comp) && 
-				e_cal_get_save_schedules (client)))
-		return ret_val;
-
-	e_cal_component_get_organizer (comp, &org);
-	strip = itip_strip_mailto (org.value);
-	
-	if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
-		ret_val = TRUE;
-	}
-
-	if (!ret_val)
-		ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
-
-	g_free (email);
-	return ret_val;
-}
-
-static void
 delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 {
 	ECalComponent *comp;
 	ECalComponentVType vtype;
-	gboolean  delete = FALSE;
-	GError *error = NULL;
 
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
@@ -922,39 +872,9 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 	if (!e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER))
 		e_cal_component_set_recurid (comp, NULL);
 
-	if (check_for_retract (comp, event->comp_data->client)) {
-		char *retract_comment = NULL;
-		gboolean retract = FALSE;
-
-		retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view));
-		if (retract) {
-			GList *users = NULL;
-			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
-
-			add_retract_data (comp, retract_comment, CALOBJ_MOD_ALL);
-			icalcomp = e_cal_component_get_icalcomponent (comp);
-			icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
-			if (!e_cal_send_objects (event->comp_data->client, icalcomp, &users, 
-						&mod_comp, &error))	{
-				delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
-				g_clear_error (&error);
-				error = NULL;
-			} else {
-
-				if (mod_comp)
-					icalcomponent_free (mod_comp);
-
-				if (users) {
-					g_list_foreach (users, (GFunc) g_free, NULL);
-					g_list_free (users);
-				}
-			}
-		}
-	} else 
-		delete = delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view));
-
-	if (delete) {
+	if (delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view))) {
 		const char *uid;
+		GError *error = NULL;
 		
 		if (itip_organizer_is_user (comp, event->comp_data->client) 
 		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
@@ -968,13 +888,13 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 			g_object_unref (comp);
 			return;
 		}
-		
+
 		if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
 			e_cal_remove_object_with_mod (event->comp_data->client, uid, 
 				e_cal_component_get_recurid_as_string (comp), CALOBJ_MOD_ALL, &error);
 		else
 			e_cal_remove_object (event->comp_data->client, uid, &error);
-
+		
 		delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
 		g_clear_error (&error);
 	}
@@ -1024,49 +944,18 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 	GList *selected;
 	ECalComponent *comp;
 	ECalendarViewEvent *event;
-	ECalComponentVType vtype;
-	gboolean  delete = FALSE;
-	GError *error = NULL;
 		
 	selected = e_calendar_view_get_selected_events (cal_view);
 	if (!selected)
 		return;
+	
 	event = (ECalendarViewEvent *) selected->data;
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	vtype = e_cal_component_get_vtype (comp);
-
-	if (check_for_retract (comp, event->comp_data->client)) {
-		char *retract_comment = NULL;
-		gboolean retract = FALSE;
-
-		retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view));
-		if (retract) {
-			GList *users = NULL;
-			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
-
-			add_retract_data (comp, retract_comment, CALOBJ_MOD_THIS);
-			icalcomp = e_cal_component_get_icalcomponent (comp);
-			icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
-			if (!e_cal_send_objects (event->comp_data->client, icalcomp, &users, 
-						&mod_comp, &error))	{
-				delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
-				g_clear_error (&error);
-				error = NULL;
-			} else {
-				if (mod_comp)
-					icalcomponent_free (mod_comp);
-				if (users) {
-					g_list_foreach (users, (GFunc) g_free, NULL);
-					g_list_free (users);
-				}
-			}
-		}
-	} else 
-		delete = delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view));
 
-	if (delete) {
+	if (delete_component_dialog (comp, FALSE, 1, e_cal_component_get_vtype (comp), GTK_WIDGET (cal_view))) {
 		const char *uid, *rid = NULL;
+		GError *error = NULL;
 		ECalComponentDateTime dt;
 		icaltimezone *zone = NULL;
 		gboolean is_instance = FALSE;
@@ -1122,7 +1011,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 			e_cal_modify_object (event->comp_data->client, event->comp_data->icalcomp, CALOBJ_MOD_THIS,
 				       	&error);
 		}
-	
+
 		delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
 		g_clear_error (&error);
 	}
@@ -1239,8 +1128,9 @@ on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
 	GList *selected;
 	char *filename;
 	char *ical_string;
+	FILE *file;
 	ECalendarViewEvent *event;
-	
+
 	selected = e_calendar_view_get_selected_events (cal_view);
 	if (!selected)
 		return;
@@ -1255,9 +1145,16 @@ on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
 		g_warning ("Couldn't convert item to a string");
 		return;
 	}
-
-	e_write_file_uri (filename, ical_string);
+	
+	file = g_fopen (filename, "w");
+	if (file == NULL) {
+		g_warning ("Couldn't save item");
+		return;
+	}
+	
+	fprintf (file, "%s", ical_string);
 	g_free (ical_string);
+	fclose (file);
 
 	g_list_free (selected);
 }
@@ -1835,7 +1732,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
 
 	default_client = e_cal_model_get_default_client (priv->model);
 
-	if (!default_client || e_cal_get_load_state (default_client) != E_CAL_LOAD_LOADED) {
+	if (default_client && e_cal_get_load_state (default_client) != E_CAL_LOAD_LOADED) {
 		g_warning ("Default client not loaded \n");
 		return;
 	}
@@ -1898,7 +1795,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
 		flags |= COMP_EDITOR_USER_ORG;
 	}
 	
-	open_event_with_flags (cal_view, default_client,
+	open_event_with_flags (cal_view, e_cal_model_get_default_client (priv->model),
 			icalcomp, flags);
 
 	g_object_unref (comp);
@@ -2060,44 +1957,6 @@ get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone)
         return g_strdup (buffer);
 }
 
-void 
-e_calendar_view_move_tip (GtkWidget *widget, int x, int y)
-{
-  GtkRequisition requisition;
-  gint w, h;
-  GdkScreen *screen;
-  GdkScreen *pointer_screen;
-  gint monitor_num, px, py;
-  GdkRectangle monitor;	
-
-  screen = gtk_widget_get_screen (widget);
-
-  gtk_widget_size_request (widget, &requisition);
-  w = requisition.width;
-  h = requisition.height;
-
-  gdk_display_get_pointer (gdk_screen_get_display (screen),
-                           &pointer_screen, &px, &py, NULL);
-  if (pointer_screen != screen) 
-    {
-      px = x;
-      py = y;
-    }
-  monitor_num = gdk_screen_get_monitor_at_point (screen, px, py);
-  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-
-  if ((x + w) > monitor.x + monitor.width)
-    x -= (x + w) - (monitor.x + monitor.width);
-  else if (x < monitor.x)
-    x = monitor.x;
-
-  if ((y + h + widget->allocation.height + 4) > monitor.y + monitor.height)
-    y = y - h - 36;
-
-  gtk_window_move (GTK_WINDOW (widget), x, y);
-  gtk_widget_show (widget); 
-}
-
 /* 
  * It is expected to show the tooltips in this below format
  *
@@ -2128,10 +1987,9 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	if (widget)
 		gtk_widget_destroy (widget);
 
-	default_zone = e_calendar_view_get_timezone  (data->cal_view);
 	pevent = data->get_view_event (data->cal_view, data->day, data->event_num);
-
 	client = pevent->comp_data->client;
+	default_zone = e_calendar_view_get_timezone  (data->cal_view);
 
 	clone_comp = icalcomponent_new_clone (pevent->comp_data->icalcomp);
 	if (!e_cal_component_set_icalcomponent (newcomp, clone_comp))
@@ -2243,9 +2101,6 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	gtk_container_add ((GtkContainer *)pevent->tooltip, frame);
 			
 	gtk_widget_show_all (pevent->tooltip);	
-
-	e_calendar_view_move_tip (pevent->tooltip, pevent->x +16, pevent->y+16);
-
 	gdk_keyboard_grab (pevent->tooltip->window, FALSE, GDK_CURRENT_TIME);
 	g_signal_connect (pevent->tooltip, "key-press-event", G_CALLBACK (tooltip_grab), data->cal_view);
 	pevent->timeout = -1;
@@ -2257,54 +2112,4 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	return FALSE;
 }
 	
-#ifdef ENABLE_CAIRO
-void
-draw_curved_rectangle (cairo_t *cr, double x0, double y0,
-			double rect_width, double rect_height,
-			double radius)
-{
-	double x1, y1;
-	
-	x1 = x0 + rect_width; 
-	y1 = y0 + rect_height;
-
-	if (!rect_width || !rect_height)
-	    return;
-	if (rect_width / 2 < radius) {
-	    if (rect_height / 2 < radius) {
-	        cairo_move_to  (cr, x0, (y0 + y1)/2);
-        	cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
-	        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
-	        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
-	        cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
-	    } else {
-        	cairo_move_to  (cr, x0, y0 + radius);
-	        cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
-        	cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-	        cairo_line_to (cr, x1 , y1 - radius);
-	        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
-        	cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
-    		}
-	} else {
-	    if (rect_height / 2 < radius) {
-        	cairo_move_to  (cr, x0, (y0 + y1)/2);
-	        cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-	        cairo_line_to (cr, x1 - radius, y0);
-	        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
-        	cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-	        cairo_line_to (cr, x0 + radius, y1);
-        	cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
-	    } else {
-        	cairo_move_to  (cr, x0, y0 + radius);
-	        cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-        	cairo_line_to (cr, x1 - radius, y0);
-	        cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-        	cairo_line_to (cr, x1 , y1 - radius);
-	        cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-        	cairo_line_to (cr, x0 + radius, y1);
-	        cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
-    		}
-	}
-	cairo_close_path (cr);
-}
-#endif
+
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 5d3a552f44..34fa4c2ad3 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1,4 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
 /*
  * Authors :
  *  Damon Chaplin <damon@ximian.com>
@@ -77,7 +78,6 @@
 #define E_DAY_VIEW_DATE_X_PAD	4
 
 #define E_DAY_VIEW_LARGE_FONT_PTSIZE 18
-#define E_DAY_VIEW_SMALL_FONT_PTSIZE 10
 
 /* The offset from the top/bottom of the canvas before auto-scrolling starts.*/
 #define E_DAY_VIEW_AUTO_SCROLL_OFFSET	16
@@ -649,7 +649,6 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone,
 	e_day_view_update_query (day_view);
 }
 
-#ifndef ENABLE_CAIRO
 static void
 e_day_view_init (EDayView *day_view)
 {
@@ -740,7 +739,6 @@ e_day_view_init (EDayView *day_view)
 	day_view->auto_scroll_timeout_id = 0;
 
 	day_view->large_font_desc = NULL;
-	day_view->small_font_desc = NULL;
 
 	/* String to use in 12-hour time format for times in the morning. */
 	day_view->am_string = _("am");
@@ -895,314 +893,9 @@ e_day_view_init (EDayView *day_view)
 
 	day_view->drag_rect_item =
 		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),				       
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-
-	day_view->drag_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-
-	day_view->drag_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "editable", TRUE,
-				       "draw_background", FALSE,
-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-
-	/*
-	 * Times Canvas
-	 */
-	day_view->time_canvas = e_canvas_new ();
-	gtk_layout_set_vadjustment (GTK_LAYOUT (day_view->time_canvas),
-				    GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->time_canvas,
-			  0, 1, 1, 2,
-			  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->time_canvas);
-	g_signal_connect_after (day_view->time_canvas, "scroll_event",
-				G_CALLBACK (e_day_view_on_time_canvas_scroll), day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->time_canvas)->root);
-
-	day_view->time_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_time_item_get_type (),
-				       "EDayViewTimeItem::day_view", day_view,
-				       NULL);
-
-
-	/*
-	 * Scrollbar.
-	 */
-	day_view->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->vscrollbar);
-
-
-	/* Create the cursors. */
-	day_view->normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	day_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	day_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	day_view->resize_height_cursor = gdk_cursor_new (GDK_SB_V_DOUBLE_ARROW);
-	day_view->last_cursor_set_in_top_canvas = NULL;
-	day_view->last_cursor_set_in_main_canvas = NULL;
-
-	/* Set up the drop sites. */
-	gtk_drag_dest_set (day_view->top_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
-	gtk_drag_dest_set (day_view->main_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
-
-	/* Get the model */
-	model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view));
-
-	/* connect to ECalModel's signals */
-	g_signal_connect (G_OBJECT (model), "time_range_changed",
-			  G_CALLBACK (time_range_changed_cb), day_view);
-	g_signal_connect (G_OBJECT (model), "model_row_changed",
-			  G_CALLBACK (model_row_changed_cb), day_view);
-	g_signal_connect (G_OBJECT (model), "model_cell_changed",
-			  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);
-
-	/* connect to ECalendarView's signals */
-	g_signal_connect (G_OBJECT (day_view), "timezone_changed",
-			  G_CALLBACK (timezone_changed_cb), NULL);
-}
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_init (EDayView *day_view)
-{
-	gint day;
-	GnomeCanvasGroup *canvas_group;
-	ECalModel *model;
-	
-	GTK_WIDGET_SET_FLAGS (day_view, GTK_CAN_FOCUS);
-
-	day_view->long_events = g_array_new (FALSE, FALSE,
-					     sizeof (EDayViewEvent));
-	day_view->long_events_sorted = TRUE;
-	day_view->long_events_need_layout = FALSE;
-	day_view->long_events_need_reshape = FALSE;
-
-	day_view->layout_timeout_id = 0;
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++) {
-		day_view->events[day] = g_array_new (FALSE, FALSE,
-						     sizeof (EDayViewEvent));
-		day_view->events_sorted[day] = TRUE;
-		day_view->need_layout[day] = FALSE;
-		day_view->need_reshape[day] = FALSE;
-	}
-
-	/* These indicate that the times haven't been set. */
-	day_view->lower = 0;
-	day_view->upper = 0;
-
-	day_view->work_week_view = FALSE;
-	day_view->days_shown = 1;
-
-	day_view->mins_per_row = 30;
-	day_view->date_format = E_DAY_VIEW_DATE_FULL;
-	day_view->rows_in_top_display = 0;
-
-	/* Note that these don't work yet. It would need a few fixes to the
-	   way event->start_minute and event->end_minute are used, and there
-	   may be problems with events that go outside the visible times. */
-	day_view->first_hour_shown = 0;
-	day_view->first_minute_shown = 0;
-	day_view->last_hour_shown = 24;
-	day_view->last_minute_shown = 0;
-
-	day_view->main_gc = NULL;
-	e_day_view_recalc_num_rows (day_view);
-
-	day_view->working_days = E_DAY_VIEW_MONDAY | E_DAY_VIEW_TUESDAY
-		| E_DAY_VIEW_WEDNESDAY | E_DAY_VIEW_THURSDAY
-		| E_DAY_VIEW_FRIDAY;
-
-	day_view->work_day_start_hour = 9;
-	day_view->work_day_start_minute = 0;
-	day_view->work_day_end_hour = 17;
-	day_view->work_day_end_minute = 0;
-	day_view->show_event_end_times = TRUE;
-	day_view->week_start_day = 0;
-	day_view->scroll_to_work_day = TRUE;
-
-	day_view->show_marcus_bains_line = TRUE;
-	day_view->marcus_bains_day_view_color = NULL;
-	day_view->marcus_bains_time_bar_color = NULL;
-
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_event_num = -1;
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	day_view->last_edited_comp_string = NULL;
-
-	day_view->selection_start_row = -1;
-	day_view->selection_start_day = -1;
-	day_view->selection_end_row = -1;
-	day_view->selection_end_day = -1;
-	day_view->selection_is_being_dragged = FALSE;
-	day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-	day_view->selection_in_top_canvas = FALSE;
-
-	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
-
-	day_view->pressed_event_day = -1;
-
-	day_view->drag_event_day = -1;
-	day_view->drag_last_day = -1;
-
-	day_view->auto_scroll_timeout_id = 0;
-
-	day_view->large_font_desc = NULL;
-	day_view->small_font_desc = NULL;
-
-	/* String to use in 12-hour time format for times in the morning. */
-	day_view->am_string = _("am");
-
-	/* String to use in 12-hour time format for times in the afternoon. */
-	day_view->pm_string = _("pm");
-
-
-	/*
-	 * Top Canvas
-	 */
-	day_view->top_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (day_view), day_view->top_canvas,
-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->top_canvas);
-	g_signal_connect_after (day_view->top_canvas, "button_press_event",
-				G_CALLBACK (e_day_view_on_top_canvas_button_press), day_view);
-	g_signal_connect (day_view->top_canvas, "button_release_event",
-			  G_CALLBACK (e_day_view_on_top_canvas_button_release), day_view);
-	g_signal_connect (day_view->top_canvas, "motion_notify_event",
-			  G_CALLBACK (e_day_view_on_top_canvas_motion), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_motion",
-			  G_CALLBACK (e_day_view_on_top_canvas_drag_motion), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_leave",
-			  G_CALLBACK (e_day_view_on_top_canvas_drag_leave), day_view);
-
-	g_signal_connect (day_view->top_canvas, "drag_begin",
-			  G_CALLBACK (e_day_view_on_drag_begin), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_end",
-			  G_CALLBACK (e_day_view_on_drag_end), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_data_get",
-			  G_CALLBACK (e_day_view_on_drag_data_get), day_view);
-	g_signal_connect (day_view->top_canvas, "drag_data_received",
-			  G_CALLBACK (e_day_view_on_top_canvas_drag_data_received), day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root);
-
-	day_view->top_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_top_item_get_type (),
-				       "EDayViewTopItem::day_view", day_view,
-				       NULL);
-
-	day_view->drag_long_event_rect_item =
-		gnome_canvas_item_new (canvas_group,
 				       gnome_canvas_rect_get_type (),
 				       "width_pixels", 1,
 				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-
-	day_view->drag_long_event_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "max_lines", 1,
-				       "editable", TRUE,
-				       "draw_background", FALSE,
-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_item);
-
-	/*
-	 * Main Canvas
-	 */
-	day_view->main_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (day_view), day_view->main_canvas,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->main_canvas);
-	g_signal_connect (day_view->main_canvas, "realize",
-			  G_CALLBACK (e_day_view_on_canvas_realized), day_view);
-
-	g_signal_connect (day_view->main_canvas,
-			  "button_press_event",
-			  G_CALLBACK (e_day_view_on_main_canvas_button_press),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "button_release_event",
-			  G_CALLBACK (e_day_view_on_main_canvas_button_release),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "scroll_event",
-			  G_CALLBACK (e_day_view_on_main_canvas_scroll),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "motion_notify_event",
-			  G_CALLBACK (e_day_view_on_main_canvas_motion),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "drag_motion",
-			  G_CALLBACK (e_day_view_on_main_canvas_drag_motion),
-			  day_view);
-	g_signal_connect (day_view->main_canvas,
-			  "drag_leave",
-			  G_CALLBACK (e_day_view_on_main_canvas_drag_leave),
-			  day_view);
-
-	g_signal_connect (day_view->main_canvas, "drag_begin",
-			  G_CALLBACK (e_day_view_on_drag_begin), day_view);
-	g_signal_connect (day_view->main_canvas, "drag_end",
-			  G_CALLBACK (e_day_view_on_drag_end), day_view);
-	g_signal_connect (day_view->main_canvas, "drag_data_get",
-			  G_CALLBACK (e_day_view_on_drag_data_get), day_view);
-	g_signal_connect (day_view->main_canvas, "drag_data_received",
-			  G_CALLBACK (e_day_view_on_main_canvas_drag_data_received), day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root);
-
-	day_view->main_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_main_item_get_type (),
-				       "EDayViewMainItem::day_view", day_view,
-				       NULL);
-
-	day_view->drag_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),				       
-				       "width_pixels", 1,
-				       NULL);
 	gnome_canvas_item_hide (day_view->drag_rect_item);
 
 	day_view->drag_bar_item =
@@ -1293,7 +986,6 @@ e_day_view_init (EDayView *day_view)
 	g_signal_connect (G_OBJECT (day_view), "timezone_changed",
 			  G_CALLBACK (timezone_changed_cb), NULL);
 }
-#endif
 
 
 /* Turn off the background of the canvas windows. This reduces flicker
@@ -1341,11 +1033,6 @@ e_day_view_destroy (GtkObject *object)
 		day_view->large_font_desc = NULL;
 	}
 
-	if (day_view->small_font_desc) {
-		pango_font_description_free (day_view->small_font_desc);
-		day_view->small_font_desc = NULL;
-	}
-
 	if (day_view->normal_cursor) {
 		gdk_cursor_unref (day_view->normal_cursor);
 		day_view->normal_cursor = NULL;
@@ -1379,7 +1066,7 @@ e_day_view_destroy (GtkObject *object)
 	GTK_OBJECT_CLASS (e_day_view_parent_class)->destroy (object);
 }
 
-#ifndef ENABLE_CAIRO
+
 static void
 e_day_view_realize (GtkWidget *widget)
 {
@@ -1451,54 +1138,6 @@ e_day_view_realize (GtkWidget *widget)
 			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
 			       NULL);
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_realize (GtkWidget *widget)
-{
-	EDayView *day_view;
-	GdkColormap *colormap;
-
-	if (GTK_WIDGET_CLASS (e_day_view_parent_class)->realize)
-		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->realize)(widget);
-
-	day_view = E_DAY_VIEW (widget);
-	day_view->main_gc = gdk_gc_new (widget->window);
-
-	colormap = gtk_widget_get_colormap (widget);
-
-	/* Allocate the colors. */
-	
-	e_day_view_set_colors(day_view, widget);
-	
-	gdk_gc_set_colormap (day_view->main_gc, colormap);
-
-	/* Create the pixmaps. */
-	day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
-	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
-	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
-
-
-	/* Set the canvas item colors. */
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-}
-#endif
 
 static void
 e_day_view_set_colors(EDayView *day_view, GtkWidget *widget)
@@ -1548,37 +1187,7 @@ e_day_view_unrealize (GtkWidget *widget)
 		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->unrealize)(widget);
 }
 
-static GdkColor
-e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *widget)
-{
-	GdkColor color, bg_color;
-	guint16 red, green, blue; 
-	gdouble	cc = 65535.0;
-	
-	red = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red;
-       	green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green;
-       	blue = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue;
-
-	if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), event->comp_data),
-       	     &bg_color)) {
-                GdkColormap *colormap;
-       		colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
-	        if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
-       		        red = bg_color.red;
-			green = bg_color.green;
-	                blue = bg_color.blue;
-                }
-       	}
-
-	if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
-		color = widget->style->text[GTK_STATE_NORMAL];
-	else
-		color = widget->style->text[GTK_STATE_ACTIVE];
 
-	return color;
-}
-
-#ifndef ENABLE_CAIRO
 static void
 e_day_view_style_set (GtkWidget *widget,
 		      GtkStyle  *previous_style)
@@ -1599,7 +1208,6 @@ e_day_view_style_set (GtkWidget *widget,
 	PangoLayout *layout;
 	gint week_day, event_num;
 	EDayViewEvent *event;
-	GdkColor color;
 
 	if (GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)
 		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)(widget, previous_style);
@@ -1610,22 +1218,18 @@ e_day_view_style_set (GtkWidget *widget,
 	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++){
 		for (event_num = 0; event_num < day_view->events[week_day]->len; event_num++) {
 			event = &g_array_index (day_view->events[week_day], EDayViewEvent, event_num);
-			if (event->canvas_item) {
-				color = e_day_view_get_text_color (day_view, event, widget);
+			if (event->canvas_item)
 				gnome_canvas_item_set (event->canvas_item,
-						"fill_color_gdk", &color,
+						"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 						NULL);
-			}
 		}
 	}
 	for (event_num = 0; event_num < day_view->long_events->len; event_num++) {
 		event = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
-		if (event->canvas_item) {
-			color = e_day_view_get_text_color (day_view, event, widget);
+		if (event->canvas_item)
 			gnome_canvas_item_set (event->canvas_item,
-					"fill_color_gdk", &color,
+					"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 					NULL);
-		}
 	}
 	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
 			"fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
@@ -1650,14 +1254,6 @@ e_day_view_style_set (GtkWidget *widget,
 	day_view->large_font_desc = pango_font_description_copy (font_desc);
 	pango_font_description_set_size (day_view->large_font_desc,
 					 E_DAY_VIEW_LARGE_FONT_PTSIZE * PANGO_SCALE);
-	
-	/* Create the small fonts. */
-	if (day_view->small_font_desc != NULL)
-		pango_font_description_free (day_view->small_font_desc);
-
-	day_view->small_font_desc = pango_font_description_copy (font_desc);
-	pango_font_description_set_size (day_view->small_font_desc,
-					 E_DAY_VIEW_SMALL_FONT_PTSIZE * PANGO_SCALE);
 
 	/* Recalculate the height of each row based on the font size. */
 	day_view->row_height =
@@ -1781,204 +1377,7 @@ e_day_view_style_set (GtkWidget *widget,
 	g_object_unref (layout);
 	pango_font_metrics_unref (font_metrics);
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_style_set (GtkWidget *widget,
-		      GtkStyle  *previous_style)
-{
-	EDayView *day_view;
-	gint top_rows, top_canvas_height;
-	gint hour;
-	gint minute, max_minute_width, i;
-	gint month, day, width;
-	gint longest_month_width, longest_abbreviated_month_width;
-	gint longest_weekday_width, longest_abbreviated_weekday_width;
-	struct tm date_tm;
-	gchar buffer[128];
-	gint times_width;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	PangoLayout *layout;
-	gint week_day, event_num;
-	EDayViewEvent *event;
-	GdkColor color;
-
-	if (GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)(widget, previous_style);
-
-	day_view = E_DAY_VIEW (widget);
-	e_day_view_set_colors(day_view, widget);
-
-	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++){
-		for (event_num = 0; event_num < day_view->events[week_day]->len; event_num++) {
-			event = &g_array_index (day_view->events[week_day], EDayViewEvent, event_num);
-			if (event->canvas_item) {
-				color = e_day_view_get_text_color (day_view, event, widget);
-				gnome_canvas_item_set (event->canvas_item,
-						"fill_color_gdk", &color,
-						NULL);
-			}
-		}
-	}
-	for (event_num = 0; event_num < day_view->long_events->len; event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
-		if (event->canvas_item) {
-			color = e_day_view_get_text_color (day_view, event, widget);
-			gnome_canvas_item_set (event->canvas_item,
-					"fill_color_gdk", &color,
-					NULL);
-		}
-	}
-
-	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (widget)->font_desc;
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-	layout = pango_layout_new (pango_context);
-
-	/* Create the large font. */
-	if (day_view->large_font_desc != NULL) 
-		pango_font_description_free (day_view->large_font_desc);
-
-	day_view->large_font_desc = pango_font_description_copy (font_desc);
-	pango_font_description_set_size (day_view->large_font_desc,
-					 E_DAY_VIEW_LARGE_FONT_PTSIZE * PANGO_SCALE);
-	
-	/* Create the small fonts. */
-	if (day_view->small_font_desc != NULL)
-		pango_font_description_free (day_view->small_font_desc);
-
-	day_view->small_font_desc = pango_font_description_copy (font_desc);
-	pango_font_description_set_size (day_view->small_font_desc,
-					 E_DAY_VIEW_SMALL_FONT_PTSIZE * PANGO_SCALE);
-
-	/* Recalculate the height of each row based on the font size. */
-	day_view->row_height =
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
-		E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD * 2 + 2 /* FIXME */;
-	day_view->row_height = MAX (day_view->row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2);
-	GTK_LAYOUT (day_view->main_canvas)->vadjustment->step_increment = day_view->row_height;
-
-	day_view->top_row_height =
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
-		E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT * 2 + E_DAY_VIEW_LONG_EVENT_Y_PAD * 2 +
-		E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-	day_view->top_row_height = MAX (day_view->top_row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP);
-
-	/* Set the height of the top canvas based on the row height and the
-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/
-	top_rows = MAX (1, day_view->rows_in_top_display);
-	top_canvas_height = (top_rows + 2) * day_view->top_row_height;
-	gtk_widget_set_usize (day_view->top_canvas, -1, top_canvas_height);
-
-	/* Find the longest full & abbreviated month names. */
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-	date_tm.tm_mday = 1;
-	date_tm.tm_isdst = -1;
-
-	longest_month_width = 0;
-	longest_abbreviated_month_width = 0;
-	for (month = 0; month < 12; month++) {
-		date_tm.tm_mon = month;
-
-		e_utf8_strftime (buffer, sizeof (buffer), "%B", &date_tm);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-
-		if (width > longest_month_width) {
-			longest_month_width = width;
-			day_view->longest_month_name = month;
-		}
-
-		e_utf8_strftime (buffer, sizeof (buffer), "%b", &date_tm);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-
-		if (width > longest_abbreviated_month_width) {
-			longest_abbreviated_month_width = width;
-			day_view->longest_abbreviated_month_name = month;
-		}
-	}
-
-	/* Find the longest full & abbreviated weekday names. */
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-	date_tm.tm_mon = 0;
-	date_tm.tm_isdst = -1;
-
-	longest_weekday_width = 0;
-	longest_abbreviated_weekday_width = 0;
-	for (day = 0; day < 7; day++) {
-		date_tm.tm_mday = 2 + day;
-		date_tm.tm_wday = day;
-
-		e_utf8_strftime (buffer, sizeof (buffer), "%A", &date_tm);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-
-		if (width > longest_weekday_width) {
-			longest_weekday_width = width;
-			day_view->longest_weekday_name = day;
-		}
-
-		e_utf8_strftime (buffer, sizeof (buffer), "%a", &date_tm);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &width, NULL);
-
-		if (width > longest_abbreviated_weekday_width) {
-			longest_abbreviated_weekday_width = width;
-			day_view->longest_abbreviated_weekday_name = day;
-		}
-	}
-
-
-	/* Calculate the widths of all the time strings necessary. */
-	day_view->max_small_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		g_snprintf (buffer, sizeof (buffer), "%02i", hour);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &day_view->small_hour_widths [hour], NULL);
-
-		day_view->max_small_hour_width = MAX (day_view->max_small_hour_width, day_view->small_hour_widths[hour]);
-	}
-
-	max_minute_width = 0;
-	for (minute = 0, i = 0; minute < 60; minute += 5, i++) {
-		gint minute_width;
-
-		g_snprintf (buffer, sizeof (buffer), "%02i", minute);
-		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_get_pixel_size (layout, &minute_width, NULL);
-
-		max_minute_width = MAX (max_minute_width, minute_width);
-	}
-	day_view->max_minute_width = max_minute_width;
-
-	pango_layout_set_text (layout, ":", 1);
-	pango_layout_get_pixel_size (layout, &day_view->colon_width, NULL);
-	pango_layout_set_text (layout, "0", 1);
-	pango_layout_get_pixel_size (layout, &day_view->digit_width, NULL);
-
-	pango_layout_set_text (layout, day_view->am_string, -1);
-	pango_layout_get_pixel_size (layout, &day_view->am_string_width, NULL);
-	pango_layout_set_text (layout, day_view->pm_string, -1);
-	pango_layout_get_pixel_size (layout, &day_view->pm_string_width, NULL);
-
-	/* Calculate the width of the time column. */
-	times_width = e_day_view_time_item_get_column_width (E_DAY_VIEW_TIME_ITEM (day_view->time_canvas_item));
-	gtk_widget_set_usize (day_view->time_canvas, times_width, -1);
 
-	g_object_unref (layout);
-	pango_font_metrics_unref (font_metrics);
-}
-#endif
 
 /* This recalculates the sizes of each column. */
 static void
@@ -2340,9 +1739,6 @@ set_text_as_bold (EDayViewEvent *event)
 
 /* This updates the text shown for an event. If the event start or end do not
    lie on a row boundary, the time is displayed before the summary. */
-#ifndef ENABLE_CAIRO
-/* This updates the text shown for an event. If the event start or end do not
-   lie on a row boundary, the time is displayed before the summary. */
 static void
 e_day_view_update_event_label (EDayView *day_view,
 			       gint day,
@@ -2442,63 +1838,7 @@ e_day_view_update_event_label (EDayView *day_view,
 	if (free_text)
 		g_free (text);
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_update_event_label (EDayView *day_view,
-			       gint day,
-			       gint event_num)
-{
-	EDayViewEvent *event;
-	char *text;
-	gboolean free_text = FALSE, editing_event = FALSE, short_event = FALSE;
-	const gchar *summary;
-	gint interval;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
-
-	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
-		return;
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char *) summary : "";
-
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		editing_event = TRUE;
 
-	interval = event->end_minute - event->start_minute;
-
-	if ((interval/day_view->mins_per_row) >= 2) 
-		short_event = FALSE;
-	else if ((interval%day_view->mins_per_row)==0)
-		if (((event->end_minute%day_view->mins_per_row)==0) || ((event->start_minute%day_view->mins_per_row)==0)){
-			short_event = TRUE;	
-		}
-	else
-		short_event = FALSE;
-
-	if (!editing_event) {
-		if (!short_event) {
-			text = g_strdup_printf (" \n%s", text);
-			free_text = TRUE;
-		}
-	}
-
-	gnome_canvas_item_set (event->canvas_item,
-			       "text", text,
-			       NULL);
-
-/*	if (e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING) 
-				&& e_cal_util_component_has_attendee (event->comp_data->icalcomp)) 
-		set_text_as_bold (event); */
-
-	if (free_text)
-		g_free (text);
-}
-#endif
 
 static void
 e_day_view_update_long_event_label (EDayView *day_view,
@@ -3358,6 +2698,7 @@ e_day_view_convert_time_to_position (EDayView	*day_view,
 	return offset * day_view->row_height / day_view->mins_per_row;
 }
 
+
 static gboolean
 e_day_view_on_top_canvas_button_press (GtkWidget *widget,
 				       GdkEventButton *event,
@@ -3660,7 +3001,6 @@ e_day_view_on_event_button_press (EDayView	  *day_view,
 		} else if (event->type == GDK_2BUTTON_PRESS) {
 			e_day_view_on_event_double_click (day_view, day,
 							  event_num);
-
 			gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->main_canvas),
 						      "button_press_event");
 			return TRUE;
@@ -3683,7 +3023,7 @@ e_day_view_on_event_button_press (EDayView	  *day_view,
 	return FALSE;
 }
 
-#ifndef ENABLE_CAIRO
+
 static void
 e_day_view_on_long_event_click (EDayView *day_view,
 				gint event_num,
@@ -3757,80 +3097,7 @@ e_day_view_on_long_event_click (EDayView *day_view,
 		day_view->drag_event_offset = day - start_day;
 	}
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_on_long_event_click (EDayView *day_view,
-				gint event_num,
-				GdkEventButton  *bevent,
-				ECalendarViewPosition pos,
-				gint	     event_x,
-				gint	     event_y)
-{
-	EDayViewEvent *event;
-	gint start_day, end_day, day;
-	gint item_x, item_y, item_w, item_h;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_CALENDAR_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if ((e_cal_util_component_is_instance (event->comp_data->icalcomp) ||
-	     !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
-	    && (pos == E_CALENDAR_VIEW_POS_LEFT_EDGE
-		|| pos == E_CALENDAR_VIEW_POS_RIGHT_EDGE)) {
-		if (!e_day_view_find_long_event_days (event,
-						      day_view->days_shown,
-						      day_view->day_starts,
-						      &start_day, &end_day))
-			return;
-
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->top_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = E_DAY_VIEW_LONG_EVENT;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = start_day;
-			day_view->resize_end_row = end_day;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_long_event_rect_item (day_view);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-	} else if (e_day_view_get_long_event_position (day_view, event_num,
-						       &start_day, &end_day,
-						       &item_x, &item_y,
-						       &item_w, &item_h)) {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = E_DAY_VIEW_LONG_EVENT;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
 
-		e_day_view_convert_position_in_top_canvas (day_view,
-							   event_x, event_y,
-							   &day, NULL);
-		day_view->drag_event_offset = day - start_day;
-	}
-}
-#endif
 
 static void
 e_day_view_on_event_click (EDayView *day_view,
@@ -3882,6 +3149,10 @@ e_day_view_on_event_click (EDayView *day_view,
 
 			e_day_view_reshape_main_canvas_resize_bars (day_view);
 
+			/* Make sure the text item is on top. */
+			gnome_canvas_item_raise_to_top (day_view->resize_rect_item);
+			gnome_canvas_item_raise_to_top (day_view->resize_bar_item);
+
 			/* Raise the event's item, above the rect as well. */
 			gnome_canvas_item_raise_to_top (event->canvas_item);
 		}
@@ -3904,7 +3175,7 @@ e_day_view_on_event_click (EDayView *day_view,
 	}
 }
 
-#ifndef ENABLE_CAIRO
+
 static void
 e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
 {
@@ -3981,62 +3252,9 @@ e_day_view_reshape_resize_rect_item (EDayView *day_view)
 			       NULL);
 	gnome_canvas_item_show (day_view->resize_bar_item);
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
-{
-	gint event_num, start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_NONE
-	    || !e_day_view_get_long_event_position (day_view, event_num,
-						    &start_day, &end_day,
-						    &item_x, &item_y,
-						    &item_w, &item_h)) {
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-}
 
 
 static void
-e_day_view_reshape_resize_rect_item (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_NONE
-	    || !e_day_view_get_event_position (day_view, day, event_num,
-					       &item_x, &item_y,
-					       &item_w, &item_h)) {
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-}
-#endif
-
-static void
 e_day_view_on_event_double_click (EDayView *day_view,
 				  gint day,
 				  gint event_num)
@@ -4238,7 +3456,7 @@ e_day_view_update_calendar_selection_time (EDayView *day_view)
 #endif
 }
 
-#ifndef ENABLE_CAIRO
+
 static gboolean
 e_day_view_on_top_canvas_motion (GtkWidget *widget,
 				 GdkEventMotion *mevent,
@@ -4438,205 +3656,7 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
 
 	return FALSE;
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static gboolean
-e_day_view_on_top_canvas_motion (GtkWidget *widget,
-				 GdkEventMotion *mevent,
-				 EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	ECalendarViewPosition pos;
-	gint event_x, event_y, canvas_x, canvas_y;
-	gint day, event_num;
-	GdkCursor *cursor;
-
-#if 0
-	g_print ("In e_day_view_on_top_canvas_motion\n");
-#endif
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	canvas_x = event_x;
-	canvas_y = event_y;
-
-	pos = e_day_view_convert_position_in_top_canvas (day_view,
-							 canvas_x, canvas_y,
-							 &day, &event_num);
-	if (event_num != -1)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-	if (day_view->selection_is_being_dragged) {
-		e_day_view_update_selection (day_view, day, -1);
-		return TRUE;
-	} else if (day_view->resize_drag_pos != E_CALENDAR_VIEW_POS_NONE) {
-		if (pos != E_CALENDAR_VIEW_POS_OUTSIDE) {
-			e_day_view_update_long_event_resize (day_view, day);
-			return TRUE;
-		}
-	} else if (day_view->pressed_event_day == E_DAY_VIEW_LONG_EVENT) {
-		GtkTargetList *target_list;
-
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->pressed_event_num);
-
-		if (!e_cal_util_component_has_recurrences (event->comp_data->icalcomp)
-		    && (abs (canvas_x - day_view->drag_event_x)
-			> E_DAY_VIEW_DRAG_START_OFFSET
-			|| abs (canvas_y - day_view->drag_event_y)
-			> E_DAY_VIEW_DRAG_START_OFFSET)) {
-			day_view->drag_event_day = day_view->pressed_event_day;
-			day_view->drag_event_num = day_view->pressed_event_num;
-			day_view->pressed_event_day = -1;
-
-			/* Hide the horizontal bars. */
-			if (day_view->resize_bars_event_day != -1) {
-				day_view->resize_bars_event_day = -1;
-				day_view->resize_bars_event_num = -1;
-			}
-
-			target_list = gtk_target_list_new (target_table,
-							   n_targets);
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
-			gtk_target_list_unref (target_list);
-		}
-	} else {
-		cursor = day_view->normal_cursor;
-
-		/* Recurring events can't be resized. */
-		if (event && !e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
-			switch (pos) {
-			case E_CALENDAR_VIEW_POS_LEFT_EDGE:
-			case E_CALENDAR_VIEW_POS_RIGHT_EDGE:
-				cursor = day_view->resize_width_cursor;
-				break;
-			default:
-				break;
-			}
-		}
-
-		/* Only set the cursor if it is different to last one set. */
-		if (day_view->last_cursor_set_in_top_canvas != cursor) {
-			day_view->last_cursor_set_in_top_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
-		}
-
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_motion (GtkWidget *widget,
-				  GdkEventMotion *mevent,
-				  EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	ECalendarViewPosition pos;
-	gint event_x, event_y, canvas_x, canvas_y;
-	gint row, day, event_num;
-	GdkCursor *cursor;
-
-#if 0
-	g_print ("In e_day_view_on_main_canvas_motion\n");
-#endif
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	canvas_x = event_x;
-	canvas_y = event_y;
-
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  canvas_x, canvas_y,
-							  &day, &row,
-							  &event_num);
-	if (event_num != -1)
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	if (day_view->selection_is_being_dragged) {
-		if (pos != E_CALENDAR_VIEW_POS_OUTSIDE) {
-			e_day_view_update_selection (day_view, day, row);
-			e_day_view_check_auto_scroll (day_view,
-						      event_x, event_y);
-			return TRUE;
-		}
-	} else if (day_view->resize_drag_pos != E_CALENDAR_VIEW_POS_NONE) {
-		if (pos != E_CALENDAR_VIEW_POS_OUTSIDE) {
-			e_day_view_update_resize (day_view, row);
-			e_day_view_check_auto_scroll (day_view,
-						      event_x, event_y);
-			return TRUE;
-		}
-	} else if (day_view->pressed_event_day != -1
-		   && day_view->pressed_event_day != E_DAY_VIEW_LONG_EVENT) {
-		GtkTargetList *target_list;
-
-		event = &g_array_index (day_view->events[day_view->pressed_event_day], EDayViewEvent, day_view->pressed_event_num);
-
-		if ((abs (canvas_x - day_view->drag_event_x)
-			> E_DAY_VIEW_DRAG_START_OFFSET
-			|| abs (canvas_y - day_view->drag_event_y)
-			> E_DAY_VIEW_DRAG_START_OFFSET)) {
-			day_view->drag_event_day = day_view->pressed_event_day;
-			day_view->drag_event_num = day_view->pressed_event_num;
-			day_view->pressed_event_day = -1;
-
-			/* Hide the horizontal bars. */
-			if (day_view->resize_bars_event_day != -1) {
-				day_view->resize_bars_event_day = -1;
-				day_view->resize_bars_event_num = -1;
-			}
-
-			target_list = gtk_target_list_new (target_table,
-							   n_targets);
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
-			gtk_target_list_unref (target_list);
-		}
-	} else {
-		cursor = day_view->normal_cursor;
-
-		if (event) {
-			switch (pos) {
-			case E_CALENDAR_VIEW_POS_LEFT_EDGE:
-				cursor = day_view->move_cursor;
-				break;
-			case E_CALENDAR_VIEW_POS_TOP_EDGE:
-			case E_CALENDAR_VIEW_POS_BOTTOM_EDGE:
-				cursor = day_view->resize_height_cursor;
-				break;
-			default:
-				break;
-			}
-		}
-
-		/* Only set the cursor if it is different to last one set. */
-		if (day_view->last_cursor_set_in_main_canvas != cursor) {
-			day_view->last_cursor_set_in_main_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
-		}
-	}
 
-	return FALSE;
-}
-#endif
 
 /* This sets the selection to a single cell. If day is -1 then the current
    start day is reused. If row is -1 then the selection is in the top canvas.
@@ -4830,7 +3850,6 @@ e_day_view_update_resize (EDayView *day_view,
 
 /* This converts the resize start or end row back to a time and updates the
    event. */
-#ifndef ENABLE_CAIRO
 static void
 e_day_view_finish_long_event_resize (EDayView *day_view)
 {
@@ -5068,240 +4087,9 @@ e_day_view_abort_resize (EDayView *day_view)
 		gnome_canvas_item_hide (day_view->resize_bar_item);
 	}
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_finish_long_event_resize (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-	ECal *client;
-	CalObjModType mod = CALOBJ_MOD_ALL;
-	GtkWindow *toplevel;
-	int is_date;
-	
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	client = event->comp_data->client;
-
-	/* We use a temporary copy of the comp since we don't want to
-	   change the original comp here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	if (e_cal_component_has_attendees (comp) && !itip_organizer_is_user (comp, client)) {
-		g_object_unref (comp);
-		e_day_view_abort_resize (day_view);
-		return;
-	}
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_LEFT_EDGE) {
-		e_cal_component_get_dtstart (comp, &date);
-		is_date = date.value->is_date;
-		if (!is_date)
-			date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		dt = day_view->day_starts[day_view->resize_start_row];
-		*date.value = icaltime_from_timet_with_zone (dt, is_date,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtstart (comp, &date);
-	} else {
-		e_cal_component_get_dtend (comp, &date);
-		is_date = date.value->is_date;
-		if (!is_date)
-			date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		dt = day_view->day_starts[day_view->resize_end_row + 1];
-		*date.value = icaltime_from_timet_with_zone (dt, is_date,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtend (comp, &date);
-	}
-	
-	e_cal_component_commit_sequence (comp);
- 	if (e_cal_component_is_instance (comp)) {
- 		if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- 			gtk_widget_queue_draw (day_view->top_canvas);
-			goto out;
- 		}
-
-		if (mod == CALOBJ_MOD_THIS) {
-			/* set the correct DTSTART/DTEND on the individual recurrence */
-			if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
-				*date.value = icaltime_from_timet_with_zone (
-					event->comp_data->instance_end, FALSE,
-					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-				e_cal_component_set_dtend (comp, &date);
-			} else {
-				*date.value = icaltime_from_timet_with_zone (
-					event->comp_data->instance_start, FALSE,
-					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-				e_cal_component_set_dtstart (comp, &date);
-			}
-
-			e_cal_component_set_rdate_list (comp, NULL);
-			e_cal_component_set_rrule_list (comp, NULL);
-			e_cal_component_set_exdate_list (comp, NULL);
-			e_cal_component_set_exrule_list (comp, NULL);
-
-			e_cal_component_commit_sequence (comp);
-		}
-	}
-	
-	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
-	
- out:
- 	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
-
-	g_object_unref (comp);
-}
-
-
-/* This converts the resize start or end row back to a time and updates the
-   event. */
-static void
-e_day_view_finish_resize (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-	ECal *client;
-	CalObjModType mod = CALOBJ_MOD_ALL;
-	GtkWindow *toplevel;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	client = event->comp_data->client;
-
-	/* We use a temporary shallow copy of the ico since we don't want to
-	   change the original ico here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	if (e_cal_component_has_attendees (comp) && !itip_organizer_is_user (comp, client))	{
-		g_object_unref (comp);
-		e_day_view_abort_resize (day_view);
-		return;
-	}
-
-	date.value = &itt;
-	/* FIXME: Should probably keep the timezone of the original start
-	   and end times. */
-	date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-
-	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtend (comp, &date);
-	}
-
-	e_cal_component_commit_sequence (comp);
-
-	if (day_view->last_edited_comp_string != NULL) {
-		g_free (day_view->last_edited_comp_string);
-		day_view->last_edited_comp_string = NULL;
-	}
-
-	day_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
-
-
-	/* Hide the horizontal bars. */
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
-
- 	if (e_cal_component_is_instance (comp)) {
- 		if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- 			gtk_widget_queue_draw (day_view->top_canvas);
-			goto out;
- 		}
-
-		if (mod == CALOBJ_MOD_THIS) {
-			/* set the correct DTSTART/DTEND on the individual recurrence */
-			if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
-				*date.value = icaltime_from_timet_with_zone (
-					event->comp_data->instance_end, FALSE,
-					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-				e_cal_component_set_dtend (comp, &date);
-			} else {
-				*date.value = icaltime_from_timet_with_zone (
-					event->comp_data->instance_start, FALSE,
-					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-				e_cal_component_set_dtstart (comp, &date);
-			}
-
-			e_cal_component_set_rdate_list (comp, NULL);
-			e_cal_component_set_rrule_list (comp, NULL);
-			e_cal_component_set_exdate_list (comp, NULL);
-			e_cal_component_set_exrule_list (comp, NULL);
-		}
-	}
-	
-	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-
-	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
- out:	
-	g_object_unref (comp);
-}
 
 
 static void
-e_day_view_abort_resize (EDayView *day_view)
-{
-	gint day, event_num;
-
-	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_NONE)
-		return;
-
-	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-
-		day_view->last_cursor_set_in_top_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->top_canvas->window,
-				       day_view->normal_cursor);
-	} else {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-		gtk_widget_queue_draw (day_view->main_canvas);
-
-		day_view->last_cursor_set_in_main_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->main_canvas->window,
-				       day_view->normal_cursor);
-	}
-}
-#endif
-
-static void
 e_day_view_free_events (EDayView *day_view)
 {
 	gint day;
@@ -5593,7 +4381,6 @@ e_day_view_reshape_long_event (EDayView *day_view,
 			num_icons++;
 		if (event->different_timezone)
 			num_icons++;
-
 		if (e_cal_component_has_organizer (comp))
 			num_icons++;
 		if (e_cal_component_has_attachments (comp))
@@ -5613,12 +4400,8 @@ e_day_view_reshape_long_event (EDayView *day_view,
 
 	if (!event->canvas_item) {
 		GtkWidget *widget;
-		GdkColor color;
 
 		widget = (GtkWidget *)day_view;
-
-		color = e_day_view_get_text_color (day_view, event, widget);
-
 		event->canvas_item =
 			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root),
 					       e_text_get_type (),
@@ -5628,7 +4411,7 @@ e_day_view_reshape_long_event (EDayView *day_view,
 					       "editable", TRUE,
 					       "use_ellipsis", TRUE,
 					       "draw_background", FALSE,
-					       "fill_color_gdk", &color,
+					       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 					       "im_context", E_CANVAS (day_view->top_canvas)->im_context,
 					       NULL);
 		g_object_set_data (G_OBJECT (event->canvas_item), "event-num", GINT_TO_POINTER (event_num));
@@ -5800,12 +4583,8 @@ e_day_view_reshape_day_event (EDayView *day_view,
 
 		if (!event->canvas_item) {
 			GtkWidget *widget;
-			GdkColor color;
 
 			widget = (GtkWidget *)day_view;
-
-			color = e_day_view_get_text_color (day_view, event, widget);
-
 			event->canvas_item =
 				gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root),
 						       e_text_get_type (),
@@ -5815,7 +4594,7 @@ e_day_view_reshape_day_event (EDayView *day_view,
 						       "clip", TRUE,
 						       "use_ellipsis", TRUE,
 						       "draw_background", FALSE,
-						       "fill_color_gdk", &color,
+						       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 						       "im_context", E_CANVAS (day_view->main_canvas)->im_context,
 						       NULL);
 			g_object_set_data (G_OBJECT (event->canvas_item), "event-num", GINT_TO_POINTER (event_num));
@@ -5841,7 +4620,6 @@ e_day_view_reshape_day_event (EDayView *day_view,
 
 /* This creates or resizes the horizontal bars used to resize events in the
    main canvas. */
-#ifndef ENABLE_CAIRO
 static void
 e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view)
 {
@@ -5893,50 +4671,9 @@ e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view)
 			       "x2", x + w - 1,
 			       "y2", y + h + E_DAY_VIEW_BAR_HEIGHT - 1,
 			       NULL);
-
 	gnome_canvas_item_show (day_view->main_canvas_bottom_resize_bar_item);
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x, y, w, h;
-
-	day = day_view->resize_bars_event_day;
-	event_num = day_view->resize_bars_event_num;
-
-	/* If we're not editing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day != -1 && day == day_view->drag_event_day
-	    && event_num == day_view->drag_event_num) {
-		g_object_get (G_OBJECT (day_view->drag_rect_item),
-			      "x1", &x,
-			      "y1", &y,
-			      "x2", &w,
-			      "y2", &h,
-			      NULL);
-		w -= x;
-		x++;
-		h -= y;
-	} else if (day != -1
-		   && e_day_view_get_event_position (day_view, day, event_num,
-						     &item_x, &item_y,
-						     &item_w, &item_h)) {
-		x = item_x + E_DAY_VIEW_BAR_WIDTH;
-		y = item_y;
-		w = item_w - E_DAY_VIEW_BAR_WIDTH;
-		h = item_h;
 
-		gtk_widget_queue_draw (day_view->main_canvas);
-	} else {
-		return;
-	}
-}
-#endif
 
 static void
 e_day_view_ensure_events_sorted (EDayView *day_view)
@@ -7156,7 +5893,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (day_view), "tooltip-window");
 			
 			if (pevent->tooltip) {
-				e_calendar_view_move_tip (pevent->tooltip, pevent->x+16, pevent->y+16);
+				gtk_window_move ((GtkWindow *)pevent->tooltip, ((int)((GdkEventMotion *)event)->x_root)+16, ((int)((GdkEventMotion *)event)->y_root) +16);
 			}
 
 			return TRUE;
@@ -7246,7 +5983,6 @@ e_day_view_event_move (ECalendarView *cal_view, ECalViewMoveDirection direction)
 	return TRUE;
 }
 
-#ifndef ENABLE_CAIRO
 static void
 e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt)
 {
@@ -7324,84 +6060,6 @@ e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt
 out:	
 	g_object_unref (comp);
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	ECalComponent *comp;
-	ECalComponentDateTime date;
-	struct icaltimetype itt;
-	ECal *client;
-	CalObjModType mod = CALOBJ_MOD_ALL;
-	GtkWindow *toplevel;
-
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	client = event->comp_data->client;
-
-	/* We use a temporary shallow copy of the ico since we don't want to
-	   change the original ico here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	if (e_cal_component_has_attendees (comp) && !itip_organizer_is_user (comp, client))	{
-		g_object_unref (comp);
-		return;
-	}
-
-	date.value = &itt;
-	/* FIXME: Should probably keep the timezone of the original start
-	   and end times. */
-	date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	
-	*date.value = icaltime_from_timet_with_zone (start_dt, FALSE,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	e_cal_component_set_dtstart (comp, &date);
-	*date.value = icaltime_from_timet_with_zone (end_dt, FALSE,
-						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	e_cal_component_set_dtend (comp, &date);
-
-	e_cal_component_commit_sequence (comp);
-	
-	if (day_view->last_edited_comp_string != NULL) {
-		g_free (day_view->last_edited_comp_string);
-		day_view->last_edited_comp_string = NULL;
-	}
-		
-	day_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
-
-	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
-
- 	if (e_cal_component_is_instance (comp)) {
- 		if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- 			gtk_widget_queue_draw (day_view->top_canvas);
-			goto out;
- 		}
-
-		if (mod == CALOBJ_MOD_THIS) {
-			e_cal_component_set_rdate_list (comp, NULL);
-			e_cal_component_set_rrule_list (comp, NULL);
-			e_cal_component_set_exdate_list (comp, NULL);
-			e_cal_component_set_exrule_list (comp, NULL);
-		}
-	}
-	
-	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-
-	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
-
-out:	
-	g_object_unref (comp);
-}
-#endif
 
 static void 
 e_day_view_change_event_end_time_up (EDayView *day_view)
@@ -7503,7 +6161,6 @@ e_day_view_on_editing_started (EDayView *day_view,
 	g_signal_emit_by_name (day_view, "selection_changed");
 }
 
-#ifndef ENABLE_CAIRO
 static void
 e_day_view_on_editing_stopped (EDayView *day_view,
 			       GnomeCanvasItem *item)
@@ -7661,165 +6318,6 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 
 	g_signal_emit_by_name (day_view, "selection_changed");
 }
-#endif
-
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_on_editing_stopped (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-	EDayViewEvent *event;
-	gchar *text = NULL;
-	ECalComponentText summary;
-	ECalComponent *comp;
-	ECal *client;
-	gboolean on_server;
-	
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-
-#if 0
-	g_print ("In e_day_view_on_editing_stopped Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* If no item is being edited, just return. */
-	if (day == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	}
-
-	/* Reset the edit fields. */
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	g_object_set (event->canvas_item, "handle_popup", FALSE, NULL);
-	g_object_get (G_OBJECT (event->canvas_item),
-		      "text", &text,
-		      NULL);
-	g_assert (text != NULL);
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-
-	client = event->comp_data->client;
-	on_server = cal_comp_is_on_server (comp, client);
-	
-	if (string_is_empty (text) && !on_server) {
-		const char *uid;
-		
-		e_cal_component_get_uid (comp, &uid);
-		
-		e_day_view_foreach_event_with_uid (day_view, uid,
-						   e_day_view_remove_event_cb, NULL);
-		e_day_view_check_layout (day_view);
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-		goto out;
-	}
-
-	/* Only update the summary if necessary. */
-	e_cal_component_get_summary (comp, &summary);
-	if (summary.value && !strcmp (text, summary.value)) {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			e_day_view_reshape_long_event (day_view, event_num);
-		else
-			e_day_view_update_event_label (day_view, day,
-						       event_num);
-	} else if (summary.value || !string_is_empty (text)) {
-		icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp);
-
-		summary.value = text;
-		summary.altrep = NULL;
-		e_cal_component_set_summary (comp, &summary);
-		e_cal_component_commit_sequence (comp);
-
-		if (!on_server) {
-			if (!e_cal_create_object (client, icalcomp, NULL, NULL))
-				g_message (G_STRLOC ": Could not create the object!");
-			else
-				g_signal_emit_by_name (day_view, "user_created");
-
-			/* we remove the object since we either got the update from the server or failed */
-			e_day_view_remove_event_cb (day_view, day, event_num, NULL);
-		} else {
-			CalObjModType mod = CALOBJ_MOD_ALL;
-			GtkWindow *toplevel;
-			if (e_cal_component_is_instance (comp)) {
-				if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
-					goto out;
-				}
-
-				if (mod == CALOBJ_MOD_THIS) {
-					ECalComponentDateTime dt;
-
-					e_cal_component_get_dtstart (comp, &dt);
-					if (dt.value->zone) {
-						*dt.value = icaltime_from_timet_with_zone (
-							event->comp_data->instance_start,
-							dt.value->is_date,
-							dt.value->zone);
-					} else {
-						*dt.value = icaltime_from_timet_with_zone (
-							event->comp_data->instance_start,
-							dt.value->is_date,
-							e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-					}
-					e_cal_component_set_dtstart (comp, &dt);
-
-					e_cal_component_get_dtend (comp, &dt);
-					if (dt.value->zone) {
-						*dt.value = icaltime_from_timet_with_zone (
-							event->comp_data->instance_end,
-							dt.value->is_date,
-							dt.value->zone);
-					} else {
-						*dt.value = icaltime_from_timet_with_zone (
-							event->comp_data->instance_end,
-							dt.value->is_date,
-							e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-					}
-					e_cal_component_set_dtend (comp, &dt);
-
-					e_cal_component_set_rdate_list (comp, NULL);
-					e_cal_component_set_rrule_list (comp, NULL);
-					e_cal_component_set_exdate_list (comp, NULL);
-					e_cal_component_set_exrule_list (comp, NULL);
-
-					e_cal_component_commit_sequence (comp);
-				}
-			}
-			
-			/* FIXME When sending here, what exactly should we send? */
-			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
-		}
-		
-	}
-	gtk_widget_queue_draw (day_view->main_canvas);
-
- out:
-
-	g_object_unref (comp);
-	g_free (text);
-
-	g_signal_emit_by_name (day_view, "selection_changed");
-}
-#endif
 
 
 /* FIXME: It is possible that we may produce an invalid time due to daylight
@@ -8648,7 +7146,7 @@ e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
 	gnome_canvas_item_hide (day_view->drag_long_event_item);
 }
 
-#ifndef ENABLE_CAIRO
+
 static void
 e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
 				      GdkDragContext *context,
@@ -8670,29 +7168,7 @@ e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
 		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
 	}
 }
-#endif
 
-#ifdef ENABLE_CAIRO
-static void
-e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      guint           time,
-				      EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-	/* Hide the resize bars if they are being used in the drag. */
-	if (day_view->drag_event_day == day_view->resize_bars_event_day
-	    && day_view->drag_event_num == day_view->resize_bars_event_num) {
-	}
-}
-#endif
 
 static void
 e_day_view_on_drag_begin (GtkWidget      *widget,
@@ -9312,3 +7788,5 @@ e_day_view_get_num_events_selected (EDayView *day_view)
 
 	return (day_view->editing_event_day != -1) ? 1 : 0;
 }
+
+
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 738447b83b..2003240b6e 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -59,7 +59,6 @@ struct _EMeetingStorePrivate {
 	guint refresh_idle_id;
 
 	guint num_threads;
-	guint num_queries;
 };
 
 #define BUF_SIZE 1024
@@ -603,8 +602,6 @@ ems_init (EMeetingStore *store)
 
 	priv->mutex = g_mutex_new ();
 
-	priv->num_queries = 0;
-
 	start_addressbook_server (store);
 }
 
@@ -1139,7 +1136,6 @@ typedef struct {
 	char *email;
 	EMeetingAttendee *attendee;
 	EMeetingStoreQueueData *qdata;
-	EMeetingStore *store;
 } FreeBusyAsyncData;
 
 #define USER_SUB   "%u"
@@ -1152,15 +1148,12 @@ freebusy_async (gpointer data)
 	EMeetingAttendee *attendee = fbd->attendee;
 	gchar *default_fb_uri;
 	static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
-	EMeetingStorePrivate *priv = fbd->store->priv;
 
 	if (fbd->client) {
 		/* FIXME this a work around for getting all th free busy information for the users 
 		 we should be able to get free busy asynchronously */
 		g_static_mutex_lock (&mutex);		
-		priv->num_queries++;
 		e_cal_get_free_busy (fbd->client, fbd->users, fbd->startt, fbd->endt, &(fbd->fb_data), NULL);
-		priv->num_queries--;
 		g_static_mutex_unlock (&mutex);		
 
 		g_list_foreach (fbd->users, (GFunc)g_free, NULL);
@@ -1200,11 +1193,9 @@ freebusy_async (gpointer data)
 		g_free (default_fb_uri);
 		default_fb_uri = replace_string (tmp_fb_uri, DOMAIN_SUB, split_email[1]);
 
-		priv->num_queries++;
 		gnome_vfs_async_open (&handle, default_fb_uri, GNOME_VFS_OPEN_READ, 
 				      GNOME_VFS_PRIORITY_DEFAULT, start_async_read, 
 				      fbd->qdata);
-		priv->num_queries--;
 		
 		g_free (tmp_fb_uri);
 		g_strfreev (split_email);
@@ -1268,7 +1259,6 @@ refresh_busy_periods (gpointer data)
 	fbd->fb_data = NULL;	
 	fbd->qdata = qdata;
 	fbd->fb_uri = priv->fb_uri;
-	fbd->store = store;
 	fbd->email = g_strdup (itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
 
 	/* Check the server for free busy data */	
@@ -1468,11 +1458,3 @@ e_meeting_store_refresh_busy_periods (EMeetingStore *store,
 
 	refresh_queue_add (store, row, start, end, call_back, data);
 }
-
-guint
-e_meeting_store_get_num_queries (EMeetingStore *store)
-{
-	g_return_if_fail (E_IS_MEETING_STORE (store));
-
-	return store->priv->num_queries;
-}
diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h
index fb6d678fd0..791ad0f65e 100644
--- a/calendar/gui/e-meeting-store.h
+++ b/calendar/gui/e-meeting-store.h
@@ -106,7 +106,6 @@ void e_meeting_store_refresh_busy_periods (EMeetingStore *im,
 					   EMeetingStoreRefreshCallback call_back,
 					   gpointer data);
 
-guint e_meeting_store_get_num_queries (EMeetingStore *store);
 
 G_END_DECLS
 
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 6b683e25db..e5c7afad77 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -59,7 +59,6 @@
 
 #include <misc/e-dateedit.h>
 #include <e-util/e-gui-utils.h>
-#include <e-util/e-cursor.h>
 
 #include "calendar-component.h"
 #include "calendar-config.h"
@@ -391,13 +390,13 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_widget_show (mts->vscrollbar);
 
 	/* Create the item in the top canvas. */
-	mts->item_top = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_top)->root),
+	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_top)->root),
 			       e_meeting_time_selector_item_get_type (),
 			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
 			       NULL);
 
 	/* Create the item in the main canvas. */
-	mts->item_main = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_main)->root),
+	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_main)->root),
 			       e_meeting_time_selector_item_get_type (),
 			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
 			       NULL);
@@ -652,18 +651,18 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 
 	/* Allocate the colors. */
 	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));
-	e_meeting_time_selector_alloc_named_color (mts, "snow", &mts->bg_color);
-	e_meeting_time_selector_alloc_named_color (mts, "snow3", &mts->all_attendees_bg_color);
+	e_meeting_time_selector_alloc_named_color (mts, "gray75", &mts->bg_color);
+	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->all_attendees_bg_color);
 	gdk_color_black (colormap, &mts->grid_color);
 	gdk_color_white (colormap, &mts->grid_shadow_color);
 	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->grid_unused_color);
+	gdk_color_white (colormap, &mts->meeting_time_bg_color);
 	gdk_color_white (colormap, &mts->stipple_bg_color);
 	gdk_color_white (colormap, &mts->attendee_list_bg_color);
 
-	e_meeting_time_selector_alloc_named_color (mts, "snow4", &mts->meeting_time_bg_color);
-	e_meeting_time_selector_alloc_named_color (mts, "yellow", &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
+	e_meeting_time_selector_alloc_named_color (mts, "LightSkyBlue2", &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
 	e_meeting_time_selector_alloc_named_color (mts, "blue", &mts->busy_colors[E_MEETING_FREE_BUSY_BUSY]);
-	e_meeting_time_selector_alloc_named_color (mts, "orange4", &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);
+	e_meeting_time_selector_alloc_named_color (mts, "HotPink3", &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);
 
 	/* Create the stipple, for attendees with no data. */
 	mts->stipple = gdk_bitmap_create_from_data (NULL, (gchar*)stipple_bits,
@@ -1203,13 +1202,6 @@ e_meeting_time_selector_refresh_cb (gpointer data)
 {
 	EMeetingTimeSelector *mts = data;
 
-	if (e_meeting_store_get_num_queries (mts->model) == 0) {
-		e_cursor_set ((GtkWidget *)mts, E_CURSOR_NORMAL);
-		mts->last_cursor_set = GDK_LEFT_PTR;
-		e_meeting_time_selector_item_set_normal_cursor (E_MEETING_TIME_SELECTOR_ITEM (mts->item_top));
-		e_meeting_time_selector_item_set_normal_cursor (E_MEETING_TIME_SELECTOR_ITEM (mts->item_main));
-	}
-			
 	if (mts->display_top != NULL)
 		gtk_widget_queue_draw (mts->display_top);
 	if (mts->display_main != NULL)
@@ -1234,11 +1226,6 @@ e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, g
 	end.hour = 0;
 	end.minute = 0;	
 
-	/*  set the cursor to Busy, We need to reset it to normal once the free busy
-	    queries are complete */
-	e_cursor_set ((GtkWidget *)mts, E_CURSOR_BUSY);
-	mts->last_cursor_set = GDK_WATCH;
-
 	/* Ref ourselves in case we are called back after destruction,
 	 * we can do this because we will get a call back even after
 	 * an error */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 83c5821a71..c7fd8e17b6 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -767,36 +767,6 @@ get_digit_width (PangoLayout *layout)
 	return max_digit_width;
 }
 
-static GdkColor
-e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidget *widget)
-{
-	GdkColor color, bg_color;
-	guint16 red, green, blue; 
-	gdouble	cc = 65535.0;
-	
-	red = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red;
-       	green = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green;
-       	blue = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue;
-
-	if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)), event->comp_data),
-       	     &bg_color)) {
-                GdkColormap *colormap;
-       		colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));
-	        if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
-       		        red = bg_color.red;
-			green = bg_color.green;
-	                blue = bg_color.blue;
-                }
-       	}
-
-	if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
-		color = widget->style->text[GTK_STATE_NORMAL];
-	else
-		color = widget->style->text[GTK_STATE_ACTIVE];
-
-	return color;
-}
-
 static void
 e_week_view_style_set (GtkWidget *widget,
 		       GtkStyle  *previous_style)
@@ -2591,7 +2561,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
 			pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (view), "tooltip-window");
 			
 			if (pevent->tooltip) {
-				e_calendar_view_move_tip (pevent->tooltip, pevent->x+16, pevent->y+16);				
+				gtk_window_move ((GtkWindow *)pevent->tooltip, ((int)((GdkEventMotion *)event)->x_root)+16, ((int)((GdkEventMotion *)event)->y_root) +16);
 			}
 
 			return TRUE;
@@ -2712,12 +2682,8 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 	if (!span->text_item) {
 		ECalComponentText cal_text;
 		GtkWidget *widget;
-		GdkColor color;
 
 		widget = (GtkWidget *)week_view;
-
-		color = e_week_view_get_text_color (week_view, event, widget);
-		
 		e_cal_component_get_summary (comp, &cal_text);
 		span->text_item =
 			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
@@ -2728,7 +2694,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 					       "editable", TRUE,
 					       "text", cal_text.value ? cal_text.value : "",
 					       "use_ellipsis", TRUE,
-					       "fill_color_gdk", &color,
+					       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 					       "im_context", E_CANVAS (week_view->main_canvas)->im_context,
 					       NULL);
 		
@@ -3166,9 +3132,9 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 		pevent->y = ((GdkEventMotion *)gdkevent)->y_root;
 		pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (week_view), "tooltip-window");
 		
-		if (pevent->tooltip) {
-			e_calendar_view_move_tip (pevent->tooltip, pevent->x+16, pevent->y+16);			
-		}
+		if (pevent->tooltip)
+			gtk_window_move ((GtkWindow *)pevent->tooltip, ((int)((GdkEventMotion *)gdkevent)->x_root)+16, ((int)((GdkEventMotion *)gdkevent)->y_root) +16);
+
 		return TRUE;		
 	case GDK_FOCUS_CHANGE:
 		if (gdkevent->focus_change.in) {
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 5eb8cc5c97..7a11a397a8 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -56,7 +56,6 @@
 #include "calendar-component.h"
 
 #define CREATE_MEMO_ID               "memo"
-#define CREATE_SHARED_MEMO_ID	     "shared-memo"
 #define CREATE_MEMO_LIST_ID          "memo-list"
 
 enum DndTargetType {
@@ -448,7 +447,7 @@ edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem emc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
@@ -906,19 +905,12 @@ create_new_memo (MemosComponent *memo_component, gboolean is_assigned, MemosComp
 	ECal *ecal;
 	ECalComponent *comp;
 	MemoEditor *editor;
-	CompEditorFlags flags = 0;
 	
 	ecal = setup_create_ecal (memo_component, component_view);
 	if (!ecal)
 		return FALSE;
 
-	flags |= COMP_EDITOR_NEW_ITEM;
-	if (is_assigned) {
-		flags |= COMP_EDITOR_IS_SHARED;
-		flags |= COMP_EDITOR_USER_ORG;
-	}
-
-	editor = memo_editor_new (ecal, flags);
+	editor = memo_editor_new (ecal);
 	comp = cal_comp_memo_new_with_defaults (ecal);
 
 	comp_editor_edit_comp (COMP_EDITOR (editor), comp);
@@ -950,9 +942,8 @@ create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type
 	
 	if (strcmp (item_type_name, CREATE_MEMO_ID) == 0) {
 		create_new_memo (memos_component, FALSE, component_view);
-	} else if (strcmp (item_type_name, CREATE_SHARED_MEMO_ID) == 0) {
-		create_new_memo (memos_component, TRUE, component_view);
-	} else if (strcmp (item_type_name, CREATE_MEMO_LIST_ID) == 0) {
+	}
+	else if (strcmp (item_type_name, CREATE_MEMO_LIST_ID) == 0) {
 		calendar_setup_new_memo_list (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->memos))));
 	}
 }
@@ -1154,7 +1145,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 {
 	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
 
-	list->_length  = 3;
+	list->_length  = 2;
 	list->_maximum = list->_length;
 	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
 
@@ -1162,27 +1153,19 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_MEMO_ID;
 	list->_buffer[0].description = _("New memo");
-	list->_buffer[0].menuDescription = _("Mem_o");
+	list->_buffer[0].menuDescription = _("_Memo");
 	list->_buffer[0].tooltip = _("Create a new memo");
 	list->_buffer[0].menuShortcut = 'o';
 	list->_buffer[0].iconName = "stock_insert-note";
 	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[1].id = CREATE_SHARED_MEMO_ID;
-	list->_buffer[1].description = _("New shared memo");
-	list->_buffer[1].menuDescription = _("_Shared memo");
-	list->_buffer[1].tooltip = _("Create a shared new memo");
-	list->_buffer[1].menuShortcut = 's';
-	list->_buffer[1].iconName = "stock_insert-note";
-	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[2].id = CREATE_MEMO_LIST_ID;
-	list->_buffer[2].description = _("New memo list");
-	list->_buffer[2].menuDescription = _("Memo li_st");
-	list->_buffer[2].tooltip = _("Create a new memo list");
-	list->_buffer[2].menuShortcut = '\0';
-	list->_buffer[2].iconName = "stock_notes";
-	list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
+	list->_buffer[1].id = CREATE_MEMO_LIST_ID;
+	list->_buffer[1].description = _("New memo list");
+	list->_buffer[1].menuDescription = _("Memo l_ist");
+	list->_buffer[1].tooltip = _("Create a new memo list");
+	list->_buffer[1].menuShortcut = '\0';
+	list->_buffer[1].iconName = "stock_notes";
+	list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER;
 
 	return list;
 }
@@ -1201,9 +1184,6 @@ impl_requestCreateItem (PortableServer_Servant servant,
 	else if (strcmp (item_type_name, CREATE_MEMO_LIST_ID) == 0) {
 		/* FIXME Should we use the last opened window? */
 		calendar_setup_new_memo_list (NULL);
-	} else if (strcmp (item_type_name, CREATE_SHARED_MEMO_ID) == 0) {
-		if (!create_new_memo (memos_component, TRUE, NULL))
-			bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
 	}
 	else {
 		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_UnknownType);
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 6440b0d677..f1b3e05f9e 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,101 +1,12 @@
-2006-07-20  Devashish Sharma   <sdevashish@novell.com>
-
-	** Fixes bug 273921
-	* e-msg-composer-hdrs.c: Set the index number which indicates the
-	destination list (To or CC or BCC).
-
-2006-07-18  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for memory leak in bug #209254
-
-	* e-msg-composer.c: (e_msg_composer_show_help), (init): Used constant
-	string for help.
-
-2006-07-17  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #209254
-	
-	* e-msg-composer.c: (destroy): Check the memory corruption due to
-	previous commit.	
-
-2006-07-14  Arvind <sa.phoenix@gmail.com>
-
-	** Fixes bug #209254
-	
-	* e-msg-composer.c: (menu_help_cb), (destroy),
-	(e_msg_composer_show_help), (init): initiated help when clicked 
-	help menu
-
-2006-06-12  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	Fixes bug #177416 on bnc
-
-	* e-msg-composer.c (attachment_guess_mime_type): initialise type
-	to "" and not NULL.
-
-2006-05-26  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (drop_action): If 'str' is empty, continue
-	immediately rather than trying to parse it as a URL.
-
-2006-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (drop_action): Instead of g_free()ing 'str' in
-	the if and else blocks, just g_free it after the if-else block.
-
-	* e-msg-composer-select-file.c (select_attach_response): Replace
-	'if (!filename)' with 'if (filename)', fixes a bug in Srini's
-	patch.
-
-	* e-msg-composer-hdrs.c (header_new_recipient): Set the visible
-	field to FALSE.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-msg-composer-select-file.c (get_selector),
-	(select_attach_response): Added support to attach from remote
-	shares
-
-	* e-msg-composer.c (add_to_bar, drop_action): Added support to
-	attach from remote shares
-
-2006-03-09  Sam Yang  <sam.yang@sun.com>
-
-	** Fixes #333971
-
-	* e-msg-composer.c (e_msg_composer_insert_paragraph_after): Remove
-	text-default-color command that resets customized text color to
-	default, so stops composer color combo from receiving signal to
-	refresh color preview when inserting a new line.
-
-2006-04-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Adding support for ENameSelectorList in composer. It is a enhanced
-	version of Name Selector, which provides a list view to the entry
-	data.
-
-	* e-msg-composer-hdrs.c (create_addressbook_entry),
-	(header_new_recipient, attach_couple): Added ENameSelectorList to
-	composer.
-
 2006-04-05  Simon Zheng  <simon.zheng@sun.com>
 
 	** Fixes bug #333213
 
 	* e-msg-composer.c (best_encoding): According to POSIX.1
-	specfication, if iconv() encounts non-identical characters, it'll
-	return the number of non-identical conversation performed. i.e.
+	specfication, if iconv() encounting non-identical characters, it
+	returns the number of non-identical conversation performed. i.e.
 	returning positive value means exception as well as -1.
 
-2006-03-20  Boby Wang <boby.wang@sun.com>
-
-	** Fix for bug #268584
-	
-	* e-msg-composer-attachment.glade:
-	* e-msg-composer-select-file.c (get_selector):
-	set the accelerate key for "Suggest Suggest automatic display of
-	attachment"
-
 2006-02-16  Rohini S  <srohini@novell.com>
 
 	** Fixes bug #324742
@@ -122,29 +33,24 @@
 
 2006-01-24  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* e-msg-composer-hdrs.c (account_removed_cb),
+	* e-msg-composer-hdrs.c: (account_removed_cb),
 	(header_new_recipient): Use guint for 1 bit bitfield, use
 	g_slist_delete_link instead of g_slist_remove_link+g_slist_free1,
 	Remove some unused vars.
-
-	* e-msg-composer.c (build_message, set_editor_text),
+	* e-msg-composer.c: (build_message), (set_editor_text),
 	(autosave_manager_query_load_orphans),
 	(e_msg_composer_new_with_message): Remove unused vars and rename
 	a local variable with a name clash.
-
-	* evolution-composer.c (evolution_composer_init): Remove unused var
-
+	* evolution-composer.c: (evolution_composer_init): Remove unused var
 	* listener.c: Remove stray semi colon.
 
 2006-1-13  Johnny Jacob  <johnnyjacob@gmail.com>
 
 	** Fixes bug #323127
-
-	* e-msg-composer.c (create_composer): Add a Expander for
-	attachments bar.
+	* e-msg-composer.c (create_composer) : Add a Expander
+	for attachments bar.
 	(show_attachments): Show/Hide attachment bar.
-	(attachment_expander_activate_cb): Event handler for attachment
-	bar.
+	(attachment_expander_activate_cb) : Event handler for attachment bar.
 
 2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
 
@@ -157,21 +63,21 @@
 
 	** See bug #246237
 
-	* e-msg-composer.c (create_composer):
-	(subject_changed_cb): Modified to change window title to "Compose
-	Message"
+	* e-msg-composer.c 
+	(create_composer):
+	(subject_changed_cb):
+	Modified to change window title to "Compose Message"
 
 2006-01-06  Simon Zheng <simon.zheng@sun.com>
 
 	* e-msg-composer-hdrs.h: use libedataserver/e-account.h 
 	instead of e-util/e-account.h.
-
 	* evolution-composer.c: use libedataserver/e-account-list.h 
 	instead of e-util/e-account-list.h.
 
 2005-12-17  Tor Lillqvist  <tml@novell.com>
 
-	* e-msg-composer.c:
+	* e-msg-composer.c
 	* e-msg-composer-attachment.c: Include <gtk/gtk.h> instead of
 	attempting to hand-pick individual GTK headers. Use gstdio
 	wrappers. Use GDir instead of dirent. Use g_mkstemp() instead of
@@ -184,10 +90,8 @@
 2005-11-23  Johnny Jacob <johnnyjacob@gmail.com>
 	
 	** See Bug # 246245
-
-	* e-msg-composer-select-file.c
-	(e_msg_composer_select_file_attachments): Changed the title
-	caption from "Attach file(s)" to "Insert Attachment".
+	* e-msg-composer-select-file.c (e_msg_composer_select_file_attachments):   
+	Changed the title caption from "Attach file(s)" to "Insert Attachment".
 
 2005-12-07  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
@@ -196,17 +100,17 @@
 	(menu_insert_priority_cb):
 	(setup_ui):
 	(e_msg_composer_get_priority):
-	(e_msg_composer_set_priority): Add support for setting priority of
-	a message.
+	(e_msg_composer_set_priority):
+	Add support for setting priority of a message.
 
 2005-12-05  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	** See bug #322863
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Check if the
-	account indeed exists before freeing/duping it.  The account would
-	typically not exist, when redirecting mails originated from other
-	accounts which are not configured in ones machine.
+	* e-msg-composer.c: (e_msg_composer_new_with_message):
+	Check if the account indeed exists before freeing/duping it.
+	The account would typically not exist, when redirecting mails
+	originated from other accounts which are not configured in ones 
+	machine.
 
 2005-11-26  Tor Lillqvist  <tml@novell.com>
 
@@ -217,16 +121,16 @@
 	Windows. No effect on functionality on Unix.
 
 2005-10-22  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* e-msg-composer.c (get_file_content): use composer->priv->charset
-	instead of p->charset. This fixes a crash
+	
+	* e-msg-composer.c: (get_file_content):
+	use composer->priv->charset instead of p->charset. This fixes 
+	a crash
 
 2005-10-21 Vivek Jain <jvivek@novell.com>
 	
 	Comitted NotZed's patch given on #314701
 	
 	** See bug #314701.
-
 	* e-msg-composer-hdrs.c (get_account_store_url): don't dereference
 	a null url or create an empty one.
 
@@ -247,8 +151,9 @@
 	
 	** See bug #315987
 
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Load the account
-	info in the From header only if the account is enabled
+	* e-msg-composer-hdrs.c: (create_from_optionmenu):
+	Load the account info in the From header only if the
+	account is enabled
 
 2005-10-04  Srinivasa Ragavan <sragavan@novell.com>
 
@@ -261,9 +166,9 @@
 
 	** See bug 317337
 
-	* e-msg-composer.c (e_msg_composer_new_with_message): Set the
-	proper account name in account_name, so that the from header is
-	set properly.
+	* e-msg-composer.c: (e_msg_composer_new_with_message):
+	Set the proper account name in account_name, so that
+	the from header is set properly.
 	
 2005-08-22  Srinivasa Ragavan <sragavan@novell.com>
 
@@ -304,7 +209,7 @@
 
 2005-07-26  Jody Goldberg <jody@gnome.org>
 
-	* Makefile.am: Fix build breakage due to extra whitespace after a
+	* Makefile.am : Fix build breakage due to extra whitespace after a
 	  backslash.
 
 2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
@@ -312,7 +217,6 @@
 	* Makefile.am: Fix make distcheck issues.
 
 2005-07-21 Devashish Sharma <sdevashish@novell.com>
-
 	* e-message-composer.c: Added Shortcut for Save Draft
 	-(Ctrl+Shift+s) and a toolbar button for the same.
 	Fixes #219242
@@ -337,15 +241,14 @@
 
 	** See bug #309869
 
-	* e-msg-composer-hdrs.c: moves the focus to the corresponding
+        * e-msg-composer-hdrs.c: moves the focus to the corresponding
 	header buttons' entry fields.
 
 2005-07-13  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* e-msg-composer-select-file.c (select_attach_response): Don't
+	* e-msg-composer-select-file.c: (select_attach_response): Don't
 	leak the file name here.
-
-	* e-msg-composer.c (build_message): Don't allocate charset twice.
+	* e-msg-composer.c: (build_message): Don't allocate charset twice.
 
 2005-07-13  Tor Lillqvist  <tml@novell.com>
 
@@ -357,12 +260,11 @@
 	* Makefile.am: Removed em-attachment* from the build.
 	Remains in the CVS, just incase to revert in case of issues.
 	Should go away after 2.3.5.
-
-	* e-msg-composer.c (add_inlined_images, build_message):
-	(menu_file_close_cb, setup_ui, attach_message, drop_action):
-	(e_msg_composer_unrealize, create_composer, handle_mailto):
-	(e_msg_composer_add_header): Changed the code to use
-	e_attachment_* from em_attachment*
+	
+	* e-msg-composer.c: (add_inlined_images) (build_message) (menu_file_close_cb) 
+	(setup_ui) (attach_message) (drop_action) (e_msg_composer_unrealize) 
+	(create_composer) (handle_mailto) (e_msg_composer_add_header)
+	Changed the code to use e_attachment_* from em_attachment*
 
 	* e-msg-composer.h: Added removed old header includes
 
@@ -386,18 +288,15 @@
 
 	* e-msg-composer-select-file.c (select_attach_response): Show
 	attachment bar when attachments are added
-
-	* e-msg-composer.c (attachment_bar_changed_cb, drop_action),
-	(drag_data_received, create_composer): Added support to DnD
-	targets to the composer GtkHTML window. Also show the attachment
-	bar when there are attachments and hide when all attachments are
-	removed.
+	e-msg-composer.c (attachment_bar_changed_cb), (drop_action),
+	(drag_data_received), (create_composer): Added support to
+	DnD targets to the composer GtkHTML window. Also show the 
+	attachment bar when there are attachments and hide when all
+	attachments are removed.
 	 
 2005-05-24  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-msg-composer-attachment.c
-	(e_msg_composer_attachment_new_from_mime_part); Fixed a bug, which
-	considered forwarded mails as remote files.
+	* e-msg-composer-attachment.c (e_msg_composer_attachment_new_from_mime_part);
+	Fixed a bug, which considered forwarded mails as remote files.
 
 2005-05-24  Srinivasa Ragavan <sragavan@novell.com>
 
@@ -406,18 +305,18 @@
 
 2005-05-23  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-msg-composer-attachment-bar.[c,h]:
-	* e-msg-composer-attachment.[c,h]: 
-	* e-msg-composer.[c,h]:
-	* mail-composer.error.xml: Added attachment of remote URL. The dnd
-	  of url, downloads the files and attaches to the mail.
+	* e-msg-composer-attachment-bar.c, e-msg-composer-attachment-bar.h,
+	  e-msg-composer-attachment.c, e-msg-composer-attachment.h, e-msg-composer.c,
+	  e-msg-composer.h, mail-composer.error.xml : Added attachment of remote URL.
+	  The dnd of url, downloads the files and attaches to the mail.
+
 
 2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-msg-composer.c (set_editor_text, menu_edit_delete_all_cb)
-	(setup_ui, attachment_bar_changed_cb, create_composer)
-	(e_msg_composer_new_from_url): Removed the expander in the
-	composer attachment and made it visible all the times.
+	* e-msg-composer.c (set_editor_text) (menu_edit_delete_all_cb)
+	  (setup_ui) (attachment_bar_changed_cb) (create_composer)
+	  (e_msg_composer_new_from_url): Removed the expander in the 
+	  composer attachment and made it visible all the times.
 	  
 2005-05-16  Not Zed  <NotZed@Ximian.com>
 
@@ -501,8 +400,7 @@
 
 	* e-msg-composer-attachment-bar.c:
 	(e_msg_composer_attachment_bar_new):
-
-	* e-msg-composer.c (create_composer):
+	* e-msg-composer.c: (create_composer):
 
 2005-02-10  Not Zed  <NotZed@Ximian.com>
 
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 8a13f74450..c543244bc0 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -220,6 +220,9 @@ struct _EMsgComposerPrivate {
 	GtkWidget *saveas;	/* saveas async file requester */
 	GtkWidget *load;	/* same for load - not used */
 	
+	
+	
+	
 };
 
 enum {
@@ -290,8 +293,6 @@ static void handle_multipart_signed (EMsgComposer *composer, CamelMultipart *mul
 
 static void set_editor_signature (EMsgComposer *composer);
 
-/* used by e_msg_composer for showing the help menu item */
-static void e_msg_composer_show_help (EMsgComposer *composer);
 
 static EDestination**
 destination_list_to_vector_sized (GList *list, int n)
@@ -1775,37 +1776,14 @@ menu_file_close_cb (BonoboUIComponent *uic,
 	do_exit (composer);
 }
 
-/* this is the callback for the help menu */
-static void
-menu_help_cb (BonoboUIComponent *uic,
-	      void *data,
-	      const char *path)
-{
-	EMsgComposer *composer = (EMsgComposer *) data;
-	
-	e_msg_composer_show_help (composer);
-}
-
-
 static void
 add_to_bar (EMsgComposer *composer, GSList *names, int is_inline)
 {
 	EMsgComposerPrivate *p = composer->priv;
 
 	while (names) {
-		CamelURL *url;
-		
-		if (!(url = camel_url_new (names->data, NULL)))
-			continue;
-		
-		if (!g_ascii_strcasecmp (url->protocol, "file")) {		
-			e_attachment_bar_attach((EAttachmentBar *)p->attachment_bar, url->path, is_inline ? "inline" : "attachment");
-		} else {
-			e_attachment_bar_attach_remote_file ((EAttachmentBar *)p->attachment_bar, names->data, is_inline ? "inline" : "attachment");			
-		}
-		
-		camel_url_free (url);
-		names = names->next;
+		e_attachment_bar_attach((EAttachmentBar *)p->attachment_bar, names->data, is_inline ? "inline" : "attachment");
+		names = g_slist_next(names);
 	}
 }
 	
@@ -2121,7 +2099,7 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB ("FileSaveAs", menu_file_save_as_cb),
 	BONOBO_UI_VERB ("FileSaveDraft", menu_file_save_draft_cb),
 	BONOBO_UI_VERB ("FileClose", menu_file_close_cb),
-	BONOBO_UI_VERB ("Help", menu_help_cb), 
+	
 	BONOBO_UI_VERB ("FileAttach", menu_file_add_attachment_cb),
 	
 	BONOBO_UI_VERB ("FileSend", menu_file_send_cb),
@@ -2761,6 +2739,7 @@ destroy (GtkObject *object)
 		p->menu = NULL;
 	}
 
+	
 	if (p->load) {
 		gtk_widget_destroy(p->load);
 		p->load = NULL;
@@ -2846,23 +2825,6 @@ destroy (GtkObject *object)
 }
 
 
-/* show the help menu item of the composer */
-static void
-e_msg_composer_show_help (EMsgComposer *composer)
-{
-	GError *error = NULL;
-	EMsgComposerPrivate *p = composer->priv;
-
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    "usage-composer",
-				    &error);
-	if (error != NULL)
-		g_warning ("%s", error->message);
-}
-
-
 /* GtkWidget methods.  */
 
 static int
@@ -2927,7 +2889,7 @@ attachment_guess_mime_type (const char *file_name)
 {
 	GnomeVFSFileInfo *info;
 	GnomeVFSResult result;
-	char *type = "";
+	char *type = NULL;
 
 	info = gnome_vfs_file_info_new ();
 	result = gnome_vfs_get_file_info (file_name, info,
@@ -2951,9 +2913,8 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 	CamelURL *url;
 	CamelMimeMessage *msg;
 	char *content_type;
-	int i, success = FALSE, delete = FALSE;
+	int i, success=FALSE, delete=FALSE;
 	EMsgComposerPrivate *p = composer->priv;
-	gboolean is_image;
 	
 	switch (info) {
 	case DND_TYPE_MESSAGE_RFC822:
@@ -2982,33 +2943,37 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 		
 		for (i = 0; urls[i] != NULL; i++) {
 			str = g_strstrip (urls[i]);
-			if (str[0] == '#' || str[0] == '\0') {
-				g_free (str);
+			if (urls[i][0] == '#') {
+				g_free(str);
 				continue;
 			}
-			
+
 			if (!g_ascii_strncasecmp (str, "mailto:", 7)) {
 				handle_mailto (composer, str);
+				g_free (str);
 			} else {
-				if (!(url = camel_url_new (str, NULL))) {
+				url = camel_url_new (str, NULL);
+
+				if (url == NULL) {
 					g_free (str);
 					continue;
 				}
-				
+
 				if (!g_ascii_strcasecmp (url->protocol, "file")) {
-					type = attachment_guess_mime_type (str);
-					if (strncmp (type, "image", 5) || (!p->send_html && !strncmp (type, "image", 5)))
-						e_attachment_bar_attach (E_ATTACHMENT_BAR (p->attachment_bar),
-									 url->path, "attachment");
+						type=attachment_guess_mime_type (str);
+						if (strncmp (type, "image", 5) || (!p->send_html && !strncmp (type, "image", 5)))
+							e_attachment_bar_attach
+							(E_ATTACHMENT_BAR (p->attachment_bar),
+						 	url->path,
+							"attachment");
 				} else	{
-					e_attachment_bar_attach_remote_file (E_ATTACHMENT_BAR (p->attachment_bar),
-									     str, "attachment");
+					e_attachment_bar_attach_remote_file 
+						(E_ATTACHMENT_BAR (p->attachment_bar),
+						str);
 				}
-				
+				g_free (str);
 				camel_url_free (url);
 			}
-			
-			g_free (str);
 		}
 		
 		g_free (urls);
@@ -3023,11 +2988,13 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 		camel_mime_part_set_content (mime_part, selection->data, selection->length, content_type);
 		camel_mime_part_set_disposition (mime_part, "inline");
 		
-		e_attachment_bar_attach_mime_part (E_ATTACHMENT_BAR (p->attachment_bar), mime_part);
+		e_attachment_bar_attach_mime_part
+			(E_ATTACHMENT_BAR (p->attachment_bar),
+			 mime_part);
 		
 		camel_object_unref (mime_part);
 		g_free (content_type);
-		
+
 		success = TRUE;
 		break;
 	case DND_TYPE_X_UID_LIST: {
@@ -3121,9 +3088,10 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 		break;
 	}
 
-	if (e_attachment_bar_get_num_attachments(E_ATTACHMENT_BAR(p->attachment_bar)))
+	if (e_attachment_bar_get_num_attachments(E_ATTACHMENT_BAR(p->attachment_bar))) {
 		show_attachments (composer, TRUE);
-	
+	}
+
 	gtk_drag_finish(context, success, delete, time);
 }
 
@@ -6292,6 +6260,7 @@ e_msg_composer_insert_paragraph_after (EMsgComposer *composer)
 	if (!p->in_signature_insert) {
 	      CORBA_char *orig, *signature;
 	      /* FIXME check for insert-paragraph command */
+	      GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color", &ev);
 	      GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
 	
 	      orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "orig", &ev);
diff --git a/configure.in b/configure.in
index 92cbcd68b7..fafec73ec2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 2.7.90, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.6.3, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 
 # Gross hack to enable 'make dist' on automake 1.9+tar 1.14.
@@ -27,7 +27,7 @@ dnl This is for api/versioning tracking for things like bonobo .server files
 dnl
 dnl This should always be the major/minor of the stable version or stable version to be
 dnl *************************************************************************************************
-BASE_VERSION=2.8
+BASE_VERSION=2.6
 AC_SUBST(BASE_VERSION)
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
 
@@ -49,7 +49,7 @@ dnl The controls whether things like the development warning in shell/main.c are
 dnl
 dnl This should be set to 0 for stable releases and 1 for unstable releases
 dnl *************************************************************************************************
-AC_DEFINE(DEVELOPMENT, 1, [If we are in development mode or not])
+AC_DEFINE(DEVELOPMENT, 0, [If we are in development mode or not])
 AC_SUBST(DEVELOPMENT)
 
 AC_ISC_POSIX
@@ -80,8 +80,9 @@ AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes")
 AC_SUBST(HAVE_JW)
 
 dnl I18N stuff
-AC_PROG_INTLTOOL([0.35.0])
+AC_PROG_INTLTOOL([0.30])
 
+ALL_LINGUAS="am ar az be bg bn br bs ca cs cy da de dz el en_AU en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka ko ku lt lv mn mk ms nb ne nl nn no pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta te th tr uk vi wa xh zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 GETTEXT_PACKAGE=evolution-$BASE_VERSION
@@ -423,18 +424,8 @@ no)
 		;;
 	esac
 esac
-
-SAVE_CFLAGS="$CFLAGS"
-SAVE_LIBS="$LIBS"
-LDAP_CFLAGS="-DLDAP_DEPRECATED"
-CFLAGS="$CFLAGS $LDAP_CFLAGS"
-LIBS="$LIBS $LDAP_LIBS"
-AC_CHECK_FUNCS(ldap_ntlm_bind)
-CFLAGS="$SAVE_CFLAGS"
-LIBS="$SAVE_LIBS"
-
 else # Win32
-LDAP_CFLAGS="-DLDAP_DEPRECATED"
+LDAP_CFLAGS=""
 LDAP_LIBS="-lwldap32"
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
@@ -444,30 +435,6 @@ msg_ldap="yes"
 fi # Win32
 
 dnl **************************************************
-dnl SunLDAP support, but if OpenLDAP support, skip check SunLDAP.
-dnl **************************************************
-if test "$with_openldap" = no ; then
-	EVO_SUNLDAP_CHECK(no)
-	case $with_sunldap in
-	no)
-               msg_ldap=no
-               ;;
-       *)
-               case $with_static_sunldap in
-               yes)
-                       msg_ldap="$with_sunldap (static)"
-                       ;;
-               *)
-                       msg_ldap="$with_sunldap (dynamic)"
-                       ;;
-               esac
-       esac
-else
-       with_sunldap=no
-fi
-AM_CONDITIONAL(SUNLDAP, test "$with_sunldap" != no)
-
-dnl **************************************************
 dnl NNTP support.
 dnl **************************************************
 AC_ARG_ENABLE(nntp, 
@@ -507,19 +474,6 @@ fi
 AM_CONDITIONAL(ENABLE_IMAP4, test x$enable_imap4 = xyes)
 
 dnl **************************************************
-dnl Cairo Calendar support.
-dnl **************************************************
-AC_ARG_ENABLE(cairo-calendar,
-[  --enable-cairo-calendar=[no/yes]      Build evolution calendar with cairo support.],,enable_cairo_calendar="yes")
-if test "x$enable_cairo_calendar" = "xyes"; then
-        AC_DEFINE(ENABLE_CAIRO,1,[Build evolution with cairo support])
-        msg_cairo=yes
-else
-        msg_cairo=no
-fi
-AM_CONDITIONAL(ENABLE_CAIRO, test x$enable_cairo_calendar = xyes)
-
-dnl **************************************************
 dnl * Posix thread support
 dnl **************************************************
 
@@ -782,7 +736,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 	
 	if test "x${check_manually}" = "xno"; then
 		AC_MSG_CHECKING(Mozilla NSPR pkg-config module name)
-		mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr seamonkey-nspr"
+		mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr"
 		for pc in $mozilla_nspr_pcs; do
 			if $PKG_CONFIG --exists $pc; then
 				AC_MSG_RESULT($pc)
@@ -792,7 +746,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 		done
 		
 		AC_MSG_CHECKING(Mozilla NSS pkg-config module name)
-		mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss seamonkey-nss"
+		mozilla_nss_pcs="nss mozilla-nss firefox-nss"
 		for pc in $mozilla_nss_pcs; do
 			if $PKG_CONFIG --exists $pc; then
 				AC_MSG_RESULT($pc)
@@ -822,7 +776,6 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 	fi
 	
 	if test "x${check_manually}" = "xyes"; then
-		mozilla_nss=""
 		have_nspr_includes="no"
 		if test "x${with_nspr_includes}" != "xno"; then
 			CPPFLAGS_save="$CPPFLAGS"
@@ -1154,7 +1107,7 @@ dnl --- Required version numbers
 
 GTKHTML_REQUIRED=3.7.0
 GTKHTML_PACKAGE=3.8
-EDS_REQUIRED=1.7.90
+EDS_REQUIRED=1.3.1
 EDS_PACKAGE=1.2
 BONOBOUI_REQUIRED=2.4.2
 GNOME_VFS_REQUIRED=2.4
@@ -1703,7 +1656,6 @@ help/Makefile
 help/C/Makefile
 help/quickref/Makefile
 help/quickref/C/Makefile
-help/quickref/de/Makefile
 shell/Makefile
 shell/evolution-nognome
 ui/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 934d1c6a4b..7c4dde3d5d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,10 +25,10 @@ kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
 install-kde-applnk:
 	$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir);	\
 	$(INSTALL_DATA) $(kdedesktop_file) \
-		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
+		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
 
 uninstall-kde-applnk:
-	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
+	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
 
 else
 
@@ -45,16 +45,16 @@ SUBDIRS = cde_app_root
 install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
 	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
 	$(INSTALL_DATA) $(desktop_file)									\
-			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;	\
+			$(DESTDIR)$(desktopdir)/$(desktop_file) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
-	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
+	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
-	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
 
 uninstall-local: uninstall-kde-applnk
-	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
-	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
-	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file) ; 	\
+	rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ;	\
+	rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
 
 # CDE Stuff
 
diff --git a/doc/devel/executive-summary/evolution-services.hierarchy b/doc/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/doc/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/doc/devel/importer/evolution-shell-importer.hierarchy b/doc/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/doc/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index ad8aaee230..313470351b 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,13 +1,3 @@
-2006-07-22  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-util.c: (get_font_options): Handle cases when the
-	props are undefined. This bug is currently causing Evo
-	to crash as soon as it comes up.
-
-2006-07-20  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	* e-util.[ch]: (get_font_options): Added code to get font options.
-
 2006-06-15  Tor Lillqvist  <tml@novell.com>
 
 	* e-plugin.c (ep_construct): On Win32, if the compile-time
@@ -32,25 +22,6 @@
 	configure.in for the support of %l and %k has now been made more
 	reliable so it actually works also on Win32.)
 
-2006-06-02  Frederic Peters <fpeters@entrouvert.com>
-
-	* e-error.c: Set new scroll member to false in static 
-	declarations. Fixes build breaker #343446.
-
-2006-05-30  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	* e-error.c: (ee_load), (e_error_newv): Added a new property
-	called scroll, to show the messages in a scrolled view port.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-dialog-utils.c: (save_ok), (e_file_dialog_save),
-	(save_folder_ok), (e_file_dialog_save_folder): Added code
-	to enable file chooser to work with remote shares
-	* e-util.c: (e_write_file), (e_write_file_uri): Added
-	a new api to write to remote shares.
-	* e-util.h:
-
 2006-04-26  Li Yuan <li.yuan@sun.com>
 
 	* e-text-event-processor-emacs-like.c:
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index b645524569..9f24ca6eaa 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -195,7 +195,7 @@ ep_construct(EPlugin *ep, xmlNodePtr root)
 				if (!g_hash_table_lookup_extended(ep_plugins_pending_hooks, class, (void **)&oldclass, (void **)&l)) {
 					oldclass = class;
 					l = NULL;
-				}
+ 				}
 				else {
 					g_free(class);
 				}
diff --git a/e-util/e-util.c b/e-util/e-util.c
index b2c111589d..50094890c4 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -39,7 +39,6 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs.h>
 
 #ifdef G_OS_WIN32
 #include <windows.h>
@@ -240,35 +239,6 @@ e_write_file(const char *filename, const char *data, int flags)
 }
 
 gint
-e_write_file_uri (const char *filename, const char *data)
-{
-	guint64 length = strlen(data);
-	guint64 bytes;
-	GnomeVFSResult result;
-	GnomeVFSHandle *handle = NULL;
-
-	result = gnome_vfs_create (&handle, filename, GNOME_VFS_OPEN_WRITE, TRUE, 0755);
-	if (result != GNOME_VFS_OK) {
-		g_warning ("Couldn't save item");
-		return 1;
-	}
-	
-	while (length > 0) {
-		gnome_vfs_write(handle, data, length, &bytes);
-		if (bytes > 0) {
-			length -= bytes;
-			data += bytes;
-		} else {
-			gnome_vfs_close(handle);
-			return 1;
-		}
-	}
-
-	gnome_vfs_close (handle);
-	return 0;
-}
-
-gint
 e_write_file_mkstemp(char *filename, const char *data)
 {
 	int fd;
@@ -1125,63 +1095,3 @@ e_gettext (const char *msgid)
 
 	return dgettext (E_I18N_DOMAIN, msgid);
 }
-
-cairo_font_options_t *
-get_font_options ()
-{
-	char *antialiasing, *hinting, *subpixel_order;
-	GConfClient *gconf = gconf_client_get_default ();
-	cairo_font_options_t *font_options = cairo_font_options_create ();
-
-	/* Antialiasing */
-	antialiasing = gconf_client_get_string (gconf,
-			"/desktop/gnome/font_rendering/antialiasing", NULL);
-	if (antialiasing == NULL) 
-		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
-	else {
-		if (strcmp (antialiasing, "grayscale") == 0)
-			cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_GRAY);
-		else if (strcmp (antialiasing, "rgba") == 0)
-			cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_SUBPIXEL);
-		else if (strcmp (antialiasing, "none") == 0)
-			cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_NONE);
-		else
-			cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
-	}
-	hinting = gconf_client_get_string (gconf,
-			"/desktop/gnome/font_rendering/hinting", NULL);
-	if (hinting == NULL)
-		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
-	else {
-		if (strcmp (hinting, "full") == 0)
-			cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_FULL);
-		else if (strcmp (hinting, "medium") == 0)
-			cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_MEDIUM);
-		else if (strcmp (hinting, "slight") == 0)
-			cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_SLIGHT);
-		else if (strcmp (hinting, "none") == 0)
-			cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
-		else
-			cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
-	}
-	subpixel_order = gconf_client_get_string (gconf,
-			"/desktop/gnome/font_rendering/rgba_order", NULL);
-	if (subpixel_order == NULL)
-		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
-	else {
-		if (strcmp (subpixel_order, "rgb") == 0)
-			cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_RGB);
-		else if (strcmp (subpixel_order, "bgr") == 0)
-			cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_BGR);
-		else if (strcmp (subpixel_order, "vrgb") == 0)
-			cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_VRGB);
-		else if (strcmp (subpixel_order, "vbgr") == 0)
-			cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_VBGR);
-		else
-			cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
-	}
-	g_object_unref (gconf);
-	return font_options;
-}
-
-
diff --git a/evolution-zip.in b/evolution-zip.in
index ff90000c69..59d02a2f46 100755
--- a/evolution-zip.in
+++ b/evolution-zip.in
@@ -44,8 +44,8 @@ lib/evolution/@BASE_VERSION@/components/libevolution-calendar.dll
 lib/evolution/@BASE_VERSION@/components/libevolution-mail.dll
 libexec/evolution/@BASE_VERSION@/evolution-addressbook-export.exe
 libexec/evolution/@BASE_VERSION@/evolution-alarm-notify.exe
-share/mime-info/evolution-@BASE_VERSION@.keys
-share/mime-info/evolution-@BASE_VERSION@.mime
+share/mime-info/evolution.keys
+share/mime-info/evolution.mime
 share/evolution/@BASE_VERSION@/errors
 share/evolution/@BASE_VERSION@/glade
 share/evolution/@BASE_VERSION@/ecps
diff --git a/filter/ChangeLog b/filter/ChangeLog
index bcf6854679..3e19c0efcf 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -3,13 +3,6 @@
 	** Fixes bug #341369
 	* rule-editor.c: fixing a memory leak.
 
-2006-02-24  Shi Pu <shi.pu@sun.com>
-
-	** Fixes Bug #323853
-
-	* filter-file.c: (filename_changed), (get_widget):
-	Replace GnomeFileEntry by GtkFileChooserButton.
-
 2006-01-27  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* filter-element.c: (filter_element_get_type): Remove unused code
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 9a24089ff4..49385a49dd 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -742,7 +742,7 @@ rule_editor_treeview_new (char *widget_name, char *string1, char *string2, int i
 	
 	gtk_widget_show (scrolled);
 	gtk_widget_show (table);
-
+	
 	g_object_unref (model);
 	
 	return scrolled;
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index 2c918ef139..6f5befb2b3 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -16,7 +16,7 @@
  <bookinfo id="Front">
   <productname>Evolution&trade;</productname>
   <productnumber>2.6</productnumber>
-  <invpartnumber>March 23, 2006</invpartnumber>
+  <invpartnumber>March 22, 2006</invpartnumber>
   <title>User Guide</title>
  </bookinfo>
 
@@ -5261,7 +5261,7 @@ Accepting and Replying to a Meeting Request</title>
     <member>www.novell.com</member>
    </simplelist>
    <para id="Bktitle">Evolution User Guide</para>
-   <para>March 23, 2006</para>
+   <para>March 22, 2006</para>
    <simplelist>
     <member>To access the online documentation for this and other Novell products, and to get updates, see www.novell.com/documentation.</member>
    </simplelist>
diff --git a/help/C/figures/Screenshot-Evolution -mailer-Preferences.png b/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
index 63d88f626f..63d88f626f 100755
--- a/help/C/figures/Screenshot-Evolution -mailer-Preferences.png
+++ b/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
diff --git a/help/ChangeLog b/help/ChangeLog
index beecf93923..66d8d8655c 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,17 +1,8 @@
-2006-07-13  Andre Klapper  <a9016009@gmx.de>
-
-	* quickref/Makefile.am:
-	* quickref/de/Makefile.am:
-	* quickref/de/quickref.pdf:
-	* quickref/de/quickref.tex:
-	
-	adding localized (german) quick reference card. see bug #307856.
-
 2006-04-25  Andre Klapper  <a9016009@gmx.de>
 
  	* C/evolution.xml: fixing 3 bugs. Fixes bug 339094.
 
-2006-03-23  Andre Klapper  <a9016009@gmx.de>
+2006-03-22  Andre Klapper  <a9016009@gmx.de>
 
  	* C/evolution.xml: Updating the doc for 2.6 and fixing bugs which went
 	in by updating the doc for 2.6.
diff --git a/help/devel/executive-summary/evolution-services.hierarchy b/help/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/help/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/help/devel/importer/evolution-shell-importer.hierarchy b/help/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/help/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6384a5ed72..c05beb8018 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -4,7 +4,7 @@
 	* em-icon-stream.c: (emis_fit):
 	We dont scale on height if the maxheight is zero
 	Fixes 335431
-		
+	
 2006-07-26  Veerapuram Varadhan  <vvaradhan@novell.com>
 
 	** Fixes bgo bug #333821 and bnc bug 181851
@@ -19,120 +19,11 @@
 	* em-folder-selection-button.c: (set_contents): Localizes the folder 
 	names in the filter and while importing mail
 
-2006-07-26  Andre Klapper  <a9016009@gmx.de>
-
-	* em-folder-browser.c: correcting a grammar bug. Fixes bug #348674.
-
-2006-07-24  Ushveen Kaur  <kushveen@novell.com>
-
-	** Fixes Bug #341840
-	
-	* mail-error.xml: button label changed for dialog ask-mark-read.
-
-2006-07-24  Sushma Rai  <rsushma@novell.com>
-
-	* em-account-editor.c: (emae_option_entry) : activate the mnemonic for
-	text box, add an extra paramenter to the function call.
-	Fixes #332282.
-	Patch submitted by "Vandana Shenoy .B <shvandana@novell.com>"
-
-2006-07-24  Sushma Rai  <rsushma@novell.com>
-
-	* em-subscribe-editor.c (_EMSubscribeEditor): Removed the members 
-	subscribe_button and unsubscribe_button.
-	(sub_do_subscribe)(sub_subscribe)(sub_editor_subscribe)
-	(sub_editor_unsubscribe): Removed.
-	(sub_selection_changed)(em_subscribe_editor_new): Removed the handling
-	for the subscribe and unsubscribe buttons.
-
-	* mail-dialogs.glade: Removed "Subscribe" and "Unsubscribe" buttons.
-	Fixes #331509.
-
-2006-07-22  Yuri Pankov <yuri.pankov@gmail.com>
-
-	Reviewed by Harish Krishnaswamy <kharish@novell.com>
-
-	* message-list.c: Add missing headers. Fixes #344744.
-
-2006-07-22 Yuri Pankov <yuri.pankov@gmail.com>
-	
-	Reviewed by Harish Krishnaswamy <kharish@novell.com>
-
-	* em-format-html-display.c: Add missing headers.
-	* mail-vfolder.h: Add function prototypes.Fixes #347689.
-
-2006-07-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #346316
-
-	* em-folder-browser.c: (em_folder_browser_show_wide): Redraw the child
-	widgets and pack it accordingly.
-
-2006-07-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html-display.c: (efhd_attachment_bar_refresh): Modified
-	the mnemonics for avoiding the conflict with search.
-
-2006-07-19  Johnny Jacob  <jjohnny@novell.com>
-
-	** Fix for bug #347993
-	
-	* em-folder-browser.c : Changed default scope of search to
-	'Current Folder'
-
-2006-07-14 Raghavendran R <raghavguru7@gmail.com>
-
-	** Fix for bug #330355
-
-	 * em-mailer-prefs.c:Mailer Preferences. New mail notification,
-	"specify filename" was enabled for radNotifyNot and radNotifyBeep.
-	Disable the button, when it wasnt for button.
-
-2006-06-10 Shree Krishnan <shreekrishnan@gmail.com>
-
-	** Fix for bug #338442
-	* mail-config.glade: Set the mnemonic character for "Send message receipts" 
-
-2006-07-18  Andre Klapper  <a9016009@gmx.de>
-
-	* message-tags.glade: remove "*" from translation. Fixes bug #331147.
-
 2006-07-14  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #336963
-
-	* em-folder-browser.c: (emfb_init): Make the scrollbar automatic.
-
-2006-22-06 Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #335241
-
-	* mail-send-recv.c: a scroll box added for the send recv popup dialog.
-
-2006-07-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #335747
-
-	* em-folder-browser.c: (emfb_mark_all_read): Prompt optionally while
-	marking multiple messages.
-	* evolution-mail.schemas.in.in: Added a schema for prompting while
-	marking multiple messages.
-
-2006-07-13  Andre Klapper  <a9016009@gmx.de>
-
-	* mail-config.glade: remove empty strings from translation
-
-2006-07-11  Karsten Bräckelmann  <guenther@rudersport.de>
-
-	* em-folder-view.c: Change mnemonic for Mark as Unimportant, fixes
-	bug #347246.
-
-2006-07-11  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	Fixes #246235.
-	* em-vfolder-rule.c (get_widget): Deleted the option menu and
-	replaced with radio buttons.
-	* mail-dialogs.glade: Removed option menu and added radio buttons
+	
+	* em-folder-browser.c: (emfb_init): Make scrollbar automatic.
 
 2006-07-11  Johnny Jacob  <johnnyjacob@gmail.com>
 
@@ -142,58 +33,12 @@
 	signal handled for sig_edit and sig_delete from "pressed" to
 	"clicked".
 
-2006-07-11  Johnny Jacob  <jjohnny@novell.com> 
-
-	** Patch by Not Zed  <NotZed@Ximian.com>
-	** See bug #262003
-
-	* em-format-html-display.c (efhd_xpkcs7mime_validity_clicked): put
-	the potentially long descriptions into a textbuffer so it's
-	scrollable.
-
 2006-07-07 Ushveen Kaur <kushveen@novell.com>
 
 	Fixes bug #336963.
 	* em-message-browser.c:
 	set the scroll bar in the message display to automatic
 	
-2006-07-07  Andre Klapper  <a9016009@gmx.de>
-
-	* em-format-html-display.c: Changing one mnemonic to avoid a
-	mnemonic conflict with an upcoming patch by Jony.
-
-2006-07-05  Andre Klapper  <a9016009@gmx.de>
-
-	* em-format-html-display.c: Added mnemonic to string.
-	Fixes bug #346645.
-
-2006-06-30  Johnny Jacob <jjohnny@novell.com>
-	* mail/em-folder-browser.h: Added search_activated signal
-	* mail/em-folder-view.c: (emfv_init):
-	* mail/em-format-html-display.c: (efhd_search_response),
-	(efhd_search_response_back), (efhd_search_destroy),
-	(efhd_search_case_toggled), (efhd_key_pressed),
-	(clear_button_clicked_cb), (icon_entry_changed_cb),
-	(em_format_html_get_search_dialog), (set_focus_cb),
-	(em_format_html_display_search),
-	(em_format_html_display_search_with),
-	(em_format_html_display_search_close):
-	* mail/em-format-html-display.h:
-	* mail/mail-component.c: (disable_folder_tree),
-	(enable_folder_tree), (impl_createView):
-	* mail/mail-vfolder.c: (mail_vfolder_add_uri),
-	(mail_vfolder_get_sources_local),
-	(mail_vfolder_get_sources_remote), (store_folder_renamed):
-	* mail/message-list.c: (ml_tree_value_at),
-	(message_list_setup_etree):
-	* mail/message-list.etspec:
-	Added code for search ui.
-
-2006-06-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* evolution-mail.schemas.in.in:
-	Changed type name "boolean" to "bool". Fixes bug #345677.
-
 2006-06-27  Arvind_evo  <sa.phoenix@gmail.com>
 		
 	Fix for bug#260354 comment 35:
@@ -204,149 +49,35 @@
 
 	** Fix for bug #344338
 	
-	* em-folder-browser.c: (emfb_edit_select_all): grab focus after
-	Ctrl+A.
+	* em-folder-browser.c: (emfb_edit_select_all): grab focus on Ctrl+A.
 
-2006-06-19  Srinivasa Ragavan  <sragavan@novell.com>
+2006-06-17  Srinivasa Ragavan  <sragavan@novell.com>
 
-	** Fix for bug #344580
+	** fixes bug #342092
 
-	* message-list.c: (create_composite_cell),
-	(composite_cell_set_strike_col), (message_list_set_folder): Strike out
-	deleted mails, if set to visible
+	* em-popup.c: (emp_standard_menu_factory): Read the mime
+	from the right file.
 
 2006-06-14  Tor Lillqvist  <tml@novell.com>
 
 	* em-account-editor.c (emae_check_complete): g_get_real_name()
 	returns UTF-8 on Win32.
 
-2006-06-13  Andre Klapper <a9016009@gmx.de>
-
-	* mail.error.xml: changing string "Ximian Evolution" to "Evolution".
-	Fixes bug #344298.
-
-2006-06-13  Tor Lillqvist  <tml@novell.com>
-
-	* em-format-html.c (efh_format_address): Fix build on Win32, where
-	EVOLUTION_ICONSDIR is a function call.
-
-2006-06-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* message-list.etspec: Corrected the sortable parameter of the message
-	list correctly.
-
-2006-06-29  Chris Heath <chris@heathens.co.nz>
+2006-06-09  Chris Heath <chris@heathens.co.nz>
 
 	* message-list.c (message_list_finalise): Fix memory leak.
 	Fixes bug #335423.
 
-2006-06-07  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html.c: (efh_format_address): Fixed a minor bug, where the
-	plus symbol appears if the limit equals the address shown.
-
 2006-06-06  Harish Krishnaswamy  <kharish@novell.com>
 
-	* evolution-mail.schemas.in.in: typo correction.
-	Fixes #331694.
-
-2006-06-02  Jeffrey Stedfast  <fejj@novell.com>
-
-	* em-folder-view.c (emfv_setup_view_instance): Can't make camel
-	calls from the main thread or we run the risk of deadlocking.
-
-2006-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added support for Vertical View in evolution in addition to the
-	existing classical view. It also supports a composite headers to be
-	shown in a multilined column.
-
-	* em-folder-browser.c (emfb_pane_realised),
-	(emfb_pane_button_release_event, emfb_init),
-	(em_folder_browser_show_preview, em_folder_browser_show_wide),
-	(emfb_show_next, emfb_show_below, emfb_activate): Added code to
-	handle the new wide mode in Evolution.
-
-	* em-folder-view.c (emfv_setup_view_instance),
-	(em_folder_view_setup_view_instance): Added code to handle the
-	default view in the wide mode for normal and sent/draft folders.
-
-	* evolution-mail.schemas.in.in: Added schema for hpane size,
-	showing email in the composite headers and toggling wide more.
-	
-	* message-list.c (ml_duplicate_value, ml_free_value),
-	(ml_initialize_value, ml_value_is_empty, ml_value_to_string),
-	(sanitize_recipients, ml_tree_value_at, create_composite_cell),
-	(message_list_create_extras): Added a new composite header
-	render_composite_from/recipient which shows the headers in a
-	multilined column.
-
-	* message-list.etspec: Added three new columns, Recipent, Messages
-	column for normal folders and Messages column for sent/draft
-	folders.
+	* evolution-mail.schemas.in.in: correct a typo.
+	fixes #331694.
 
 2006-05-30  Li Yuan  <li.yuan@sun.com>
 
 	Fix for #341381.
-
-	* message-list.c (message_list_set_folder): We should lock
-	e-tree-memory when we change it.
-
-2006-05-30  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #332936
-
-	* mail.error.xml: Used a new property called scroll that adds the
-	multilines error messages into a viewport.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added remote shares save/load support across evolution.
-
-	* em-utils.c (emu_file_check_local, emu_get_save_filesel),
-	(emu_save_part_response, emu_save_parts_response),
-	(emu_save_messages_response): Added code to save
-	messages/attachments to remote shares.
-
-	* mail-ops.c (save_messages_save, save_part_save): Same.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** fixes bug #342092
-
-	* em-popup.c (emp_standard_menu_factory): Read the mime from the
-	right file.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Added support for collapsible headers for To/Cc/Bcc fields.
-
-	* em-folder-view.c (emfv_format_link_clicked, emfv_on_url_cb):
-
-	* em-format-html-display.c (efhd_html_button_press_event),
-	(efhd_html_link_clicked, efhd_html_on_url, efhd_format_clone):
-
-	* em-format-html.c (efh_url_requested, efh_format_text_header),
-	(efh_format_address, efh_format_header):
-
-	* em-mailer-prefs.c (address_compress_count_changed),
-	(toggle_button_init, em_mailer_prefs_construct):
-
-	* evolution-mail.schemas.in.in:
-
-	* mail-config.c (gconf_address_count_changed),
-	(gconf_address_compress_changed, mail_config_init),
-	(mail_config_get_labels, mail_config_get_address_count):
-
-	* mail-config.glade:
-
-2006-05-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #342676
-	
-	* message-list.c: (ml_duplicate_value), (ml_free_value),
-	(ml_initialize_value), (ml_value_is_empty), (ml_value_to_string):
-	* message-list.etspec: Fixed the column sorter right.
+	* message-list.c: (message_list_set_folder):
+	We should lock e-tree-memory when we change it.
 
 2006-05-04  Jeffrey Stedfast  <fejj@novell.com>
 
@@ -354,80 +85,14 @@
 	before removing the store from our hash and cache. Should fix
 	Novell bug #166987.
 
-2006-04-30  Shi Pu <shi.pu@sun.com>
- 
-	** Fixes bug #323853
-
-	* em-composer-prefs.c (sig_edit_cb, sig_add_script_response):
-
-	* em-mailer-prefs.c (notify_sound_changed)
-	(em_mailer_prefs_construct):
-
-	* em-mailer-prefs.h:
-
-	* mail-config.glade: Replace GnomeFileEntry by
-	GtkFileChooserButton.
- 
 2006-04-27  Rodney Dawes  <dobey@novell.com>
 
-	* em-folder-tree.c (render_pixbuf): Use gnome-fs-trash-empty
-	rather than stock_delete for the Trash folder icon
-
-	* em-folder-view.c (emfv_popup_items[]): Don't set an icon for
-	Undelete
-	(emfv_message_pixmaps[]): Don't set an icon for Undelete and set
-	the icon for deleting a message to gnome-fs-trash-empty, not
-	stock_delete
-
-	Fixes #339626
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from Victor for adding a Sender header to message list.
-
-	* message-list.c (ml_duplicate_value, ml_free_value),
-	(ml_initialize_value, ml_value_is_empty, ml_value_to_string),
-	(ml_tree_value_at): Handled the new column header.
-
-	* message-list.etspec: Added a new column header to spec.
-
-	* message-list.h: Added a new column
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-view.c (emfv_setup_view_instance): Comparing the
-	FolderInfo flags right, to make Mailbox to show From header in
-	message list for groupwise servers.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #323402
-
-	* em-folder-tree.c (folder_tree_new): Code for Ellipsizing folder
-	tree. (Patch from Vincent Noel)
-
-	* em-migrate.c: Adding side_bar_search to 
-
-	* evolution-mail.schemas.in.in: Adding a schema for enabling/disabling
-	side bar search. (Patch from Rakesh)
-
-2006-04-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-session.c (get_password): Ask passphrase if the user is
-	supposed to enter the same.
+	* em-folder-tree.c (render_pixbuf): Use gnome-fs-trash-empty rather
+	than stock_delete for the Trash folder icon
 
-2006-04-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html-display.c (efhd_attachment_button),
-	(efhd_format_attachment): Added code to create image cache of
-	image attachment in the ethread instead of main thread to avoid
-	gui lockup.
-
-2006-04-21  Sankar P  <psankar@novell.com>
-
-	* mail-mt.c (do_op_status): Fix the cryptic
-	hexa-status-bar-message.  The problem still lies somewhere. But
-	dont show something weird to the user.
+	* em-folder-view.c (emfv_popup_items[]): Don't set an icon for Undelete
+	(emfv_message_pixmaps[]): Don't set an icon for Undelete and set the
+	icon for deleting a message to gnome-fs-trash-empty, not stock_delete
 	
 2006-04-20  Jeffrey Stedfast  <fejj@novell.com>
 
@@ -454,7 +119,6 @@
 2006-04-10  Jeff Cai <jeff.cai@sun.com>
 
 	** Fixes 333243
-
 	* em-folder-tree-model.c (em_folder_tree_model_remove_folders):
 	For null uri, don't need remove it.
 
@@ -465,43 +129,22 @@
 	* message-list.c (mail_folder_hide_by_flag):
 	If CamelMessageInfo is null, don't free it.
 
-2006-03-29  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* em-folder-view.c (smfv_setup_view_instance): use the flags
-	CAMEL_STORE_FOLDER_INFO_SUBSCRIBED instead of
-	CAMEL_STORE_FOLDER_INFO_FAST when getting folder info
-
-2006-03-25  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	**Fixes #329585
-
-	* mail-config.glade: Changed Remove button to Delete button
-
-	* mail.error.xml: Changed current Layout DELETE [Do not delete] to
-	[Do not delete] DELETE
-
 2006-03-22  Patrick Ohly  <patrick.ohly@intel.com>
 
-	* em-utils.c (em_utils_selection_set_urilist): Fixed premature
-	memory free. Fixes bug #335203.
+	* em-utils.c (em_utils_selection_set_urilist):
+	Fixed premature memory free. Fixes bug #335203.
 
 2006-03-21  Simon Zheng  <simon.zheng@sun.com>
 
-	Fixed bug #326571
-
-	* em-utils.c (em_filename_make_safe, emu_get_save_filesel):
-	(emu_save_parts_response): Add em_filename_make_safe(), and use it
-	to allow filenames contain more valid characters when saving
-	attachments.
-
-2006-03-20  Srinivasa Ragavan  <sragavan@novell.com>
+	Fixes bug #326571
+	* em-utils.c (em_filename_make_safe), (emu_get_save_filesel),
+	(emu_save_parts_response):
+	Add em_filename_make_safe(), and use it to allow filenames
+	contain more valid characters when saving attachment.
 
-	* em-folder-view.c (emfv_setup_view_instance): Added code to set
-	the mail view column for sent folder.
+2006-03-12  Takeshi AIHANA <takeshi.aihana@gmail.com>
 
-2006-03-12  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* default/de/Inbox: Updated German translation of default inbox.
+	* default/ja/Inbox: Updated Japanese translation.
 
 2006-03-06  Simon Zheng  <simon.zheng@sun.com>
 
@@ -512,7 +155,7 @@
 
 2006-03-03  Andre Klapper  <a9016009@gmx.de>
 
-	* configure.in:
+	* configure.in
 
 	* mail/default/Makefile.am: added support for macedonian (mk)
 	welcome message
@@ -524,12 +167,13 @@
 2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
 
 	* default/Makefile.am: Added Lithuanian to SUBDIRS.
+
 	* default/lt/*: Added Lithuanian translation for default mailbox.
 
 2006-03-02  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Updated Finnish inbox to actually use 2.6 example, not
-	the old one...
+	* fi.po: Updated Finnish inbox to actually use 2.6 example,
+	         not the old one...
 
 2006-03-01  Ilkka Tuohela  <hile@iki.fi>
 
@@ -908,19 +552,19 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 	* mail-tools.c (mail_tool_get_local_movemail_path):
 	Use e_util_mkdir_hier() instead of e_mkdir_hier().
 
-	Use e_util_strstrcase() instead of e_strstrcasea().
+        Use e_util_strstrcase() instead of e_strstrcasea().
     
-	use e_strftime() in evolution-data-server/
-	libedataserver/e-data-server-util.c instead of the copy in 
-	evolution/e-util/e-util.c.
+        use e_strftime() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
  
-	use e_filename_make_safe() in evolution-data-server/
-	libedataserver/e-data-server-util.c instead of the copy in 
-	evolution/e-util/e-util.c.
-	
-	use e_utf8_strftime() in evolution-data-server/
-	libedataserver/e-data-server-util.c instead of the copy in 
-	evolution/e-util/e-util.c.
+ 	use e_filename_make_safe() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
+        
+        use e_utf8_strftime() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
 
 2006-01-06  Andre Klapper <a9016009@gmx.de>
 
@@ -1018,7 +662,7 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 2005-12-22  Andre Klapper <a9016009@gmx.de>
 
 	* mail-config.glade: changed one duplicated mnemonic.
-	  Fixes bug 313801.
+          Fixes bug 313801.
 
 2005-12-20  Andre Klapper <a9016009@gmx.de>
 
@@ -1028,7 +672,7 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 2005-12-19  Andre Klapper <a9016009@gmx.de>
 
 	* mail-config.glade: changed 3 HIG-violating mnemonics.
-	  Fixes bug 256913.
+          Fixes bug 256913.
 
 2005-12-23  Srinivasa Ragavan  <sragavan@novell.com>
 
@@ -3963,8 +3607,8 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 
 2004-07-13  Dan Winship  <danw@novell.com>
 
-	* em-utils.c (em_utils_selection_set_urilist):
-	(em_utils_temp_save_part): free return value from e_mkdtemp
+	* em-utils.c (em_utils_selection_set_urilist,
+	em_utils_temp_save_part): free return value from e_mkdtemp
 
 2004-07-09  Not Zed  <NotZed@Ximian.com>
 
@@ -7382,9 +7026,9 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 
 2004-02-01  Bill Zhu <bill.zhu@sun.com>
 
-	Fixes for bug #53530
+        Fixes for bug #53530
 
-	* em-utils.c (em_utils_redirect_message): Removed the duplicate 
+        * em-utils.c (em_utils_redirect_message): Removed the duplicate 
 	adding of attachments
 
 2004-01-30  Jeffrey Stedfast  <fejj@ximian.com>
@@ -7886,7 +7530,7 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 	(config_write_style): use MAIL_CONFIG_RC_DIR
 	(mail_config_init): ditto
 
-	see http://bugzilla.ximian.com/show_bug.cgi?id=52969
+        * see http://bugzilla.ximian.com/show_bug.cgi?id=52969
 
 2004-01-19  Not Zed  <NotZed@Ximian.com>
 
diff --git a/mail/default/ja/Inbox b/mail/default/ja/Inbox
index 1ef951e003..6f26769ad2 100644
--- a/mail/default/ja/Inbox
+++ b/mail/default/ja/Inbox
@@ -1,29 +1,28 @@
-From evolution@ximian.com Tue Sep 25 07:45:12 2001
-Return-Path: <evolution@ximian.com>
-Received: from pop.ximian.com (IDENT:mail@localhost [127.0.0.1]) by
-	pop.ximian.com (8.9.3/8.9.3) with ESMTP id HAA20680; Tue, 25 Sep 2001
+From evolution@novell.com Wed Mar 15 12:00:00 2006
+Return-Path: <evolution@novell.com>
+Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 15 Mar 2006
 	07:45:12 -0400
-Received: from smtp.ximian.com (smtp.ximian.com [141.154.95.10]) by
-	pop.ximian.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
-	<evolution@ximian.com>; Tue, 25 Sep 2001 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 25 Sep 2001 11:45:02 -0000
-Received: from smtp.ximian.com (HELO localhost) (141.154.95.10) by
-	pop.ximian.com with SMTP; 25 Sep 2001 11:45:02 -0000
-From: "The Evolution Team" <evolution@ximian.com>
-To: Evolution Users <evolution@ximian.com>
+Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
+	<evolution@novell.com>; Wed, 15 Mar 2006 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 15 Mar 2006 12:00:00 -0000
+Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
+	pop.novell.com with SMTP; 15 Mar 2006 12:00:00 -0000
+From: "Evolution =?ISO-2022-JP?B?GyRCMytILyVBITwlYBsoQg==?=" <evolution@novell.com>
+To: Evolution =?ISO-2022-JP?B?GyRCJWYhPCU2TU0bKEI=?= <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution/1.1.99 (Preview Release)
-Date: 25 June 2002 14:45:00 +0300
+X-Mailer: Evolution 2.6.0
+Date: 15 March 2006 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
 Content-Type: Text/Plain; charset=iso-2022-jp
-Content-Transfer-Encoding: 7bit
 Subject: Evolution =?ISO-2022-JP?B?GyRCJFgkaCQmJDMkPRsoQiE=?=
-Sender: evolution@ximian.com
-Errors-To: evolution@ximian.com
+Sender: evolution@novell.com
+Errors-To: evolution@novell.com
 X-Mailman-Version: 1.1
 Status:   
-X-Evolution-Source: pop://rupert@pop.ximian.com/inbox
+X-Evolution-Source: pop://rupert@pop.novell.com/inbox
 X-Evolution: 00000ddd-0030
 
 
@@ -36,47 +35,49 @@ Content-Type: text/plain; charset=iso-2022-jp
 Content-Transfer-Encoding: 7bit
 
 
-
-Evolution $B3+H/%A!<%`$O!"$"$J$?$,%a!<%k$d8D?M>pJs$r4IM}$9$k(B
-Evolution $B%7%9%F%`$rF3F~$7$F$/$l$?$3$H$r$H$F$b8w1I$K;W$$$^$9!#(B
+Evolution $B3+H/%A!<%`$O!"$"$J$?$K%a!<%k$d8D?M>pJs$r$^$H$a$F4IM}$G$-$k(B Evolution $B%7%9%F%`$r>R2p$9$k$3$H$,$G$-$F!"$H$F$b8w1I$K;W$$$^$9!#(B
 
 
-$B$O$8$a$K(B
+$B$O$8$a$F$_$h$&(B
 
-        Evolution $B$N%&%#%s%I%&:8B&$K$O!"$"$J$?$N$9$Y$F$N%a!<%k(B
-	$B%U%)%k%@$X$N%7%g!<%H%+%C%H$r4^$`%5%$%I%P!<$,$"$j$^$9!#(B
-	$B$=$N2<$NJ}$K$O%+%l%s%@!<$d%3%s%?%/%H!"%?%9%/!"%a!<%k(B
-	$B%\%?%s$,$"$j$^$9!#(B
+	Evolution $B%&%#%s%I%&$N:8B&$K$O!"A4$F$N%a!<%k!&%U%)%k%@$KAGAa$/%"%/%;%9$G$-$k%5%$%I%P!<$,$"$j$^$9!#$=$N2<$K$O!"%+%l%s%@$dO"Mm@h!"%?%9%/!"%a!<%k!"$=$7$F%a%bD"$rI=<($9$k%\%?%s$,$"$j$^$9!#(B
 
-        $B40A4$J(B Evolution $B%,%$%I$r8f4uK>$J$i!"(B"$B%X%k%W(B"$B%a%K%e!<$+$i(B
-        "$BL\<!(B"$B$rA*Br$9$k$+!"(BF1 $B%-!<$r2!$7$F2<$5$$!#(B
+	"$B%X%k%W(B" $B%a%K%e!<$N(B "$BL\<!(B" $B$r%/%j%C%/$9$k$+!"$^$?$O(B [F1] $B%-!<$r2!$9$H!"(BEvolution $B$N%f!<%6!&%,%$%I$,I=<($5$l$^$9!#(B
 
-$B?75,5!G=(B
+$B?7$7$$5!G=(B
 
-        Evolution 2.0 $B$G$O?7$?$K(B Novell GroupWise $B%5!<%P!<(B (6.5.3
-        $B0J>e(B)$B$H(B Exchange 2000/2003 $B$X$N@\B3%5%]!<%H$,DI2C$5$l$^$7$?!#(B
-        $BB>$K?75,5!G=$H$7$F!"LBOG%a!<%k%U%#%k%?!"(BS/MIME $B%;%-%e%j%F%#!"(B
-	IMAP $B$N%*%U%i%$%s%5%]!<%H$N8~>e!"(BNNTP (news) $B$N%5%]!<%H!"(B
-	$B%&%'%V%+%l%s%@!<I=<(!"J#?t$N%+%l%s%@!<$N=E$M9g$o$;!"$=$7$F(B
-	$B%3%s%?%/%H!"%+%l%s%@!<!"%?%9%/%G!<%?$K%"%/%;%9$9$k$?$a$N(B
-	$B?7$7$$3+H/<T8~$1(B API $B$r4^$s$G$$$^$9!#(B
+	Evolution $B%P!<%8%g%s(B 2.6 $B$K$O<!$N$h$&$J5!G=$,$"$j$^$9(B:
+	
+	# $B%a%b$r5-O?$9$k%3%s%]!<%M%s%H$rDI2C$7$^$7$?(B
+	# $B%$%Y%s%H(B/$B%?%9%/(B/$B2q5D$NJT=8%@%$%"%m%0$NI=<($r:~?7$7$^$7$?(B
+	# $B%+%l%s%@>pJs$r30It$K8x3+$G$-$^$9(B
+	# CalDAV $B$r%5%]!<%H$7$^$7$?(B
+	# Network Manager $B$r%5%]!<%H$7$^$7$?(B
+	# HULA $B$r%5%]!<%H$7$^$7$?(B ($B@\B3$N$_(B)
+	# GroupWise $B$N5!G=$r2~A1$7$^$7$?(B
+	# $B7+$jJV$7H/@8$9$k%$%Y%s%H$N5!G=$r2~A1$7$^$7$?(B
+	# $B%+%l%s%@>e$N%$%Y%s%H$K%D!<%k%A%C%W$rI=<($G$-$k$h$&$K$J$j$^$7$?(B
+    # Mozilla$B!"(BOutlook$B!"$=$7$F(B Evolution $B%U%)!<%^%C%H$KBP1~$7$?(B CSV/tab $B$r<h$j9~$a$^$9(B
+    # $BO"Mm@h0lMw$G$O(B LDAP $B7A<0$N%"%I%l%9D"$r%5%]!<%H$7$^$7$?(B
+   	# $B%"%I%l%9D"$G$O3HD%8!:w$N7k2L$rJ]B8$G$-$k$h$&$K$J$j$^$7$?(B
+	# $B%a!<%k:n@.$G$O!"%a%C%;!<%8$KM%@h=g0L$rIU$1$k$3$H$,$G$-$k$h$&$K$J$j$^$7$?(B
+	# $B%P%0$r$?$/$5$s=$@5$7!"%f!<%6!&%$%s%?%U%'!<%9$r$5$i$K2~A1$7$^$7$?(B
 
-$BIT6q9g$NJs9p(B
+$B%P%0$NJs9p(B
 
-        $BIT6q9g$O(B http://bugzilla.ximian.com $B$^$G8fJs9p2<$5$$!#(B
+	Evolution $B$NIT6q9g$O(B http://bugzilla.gnome.org $B$^$GJs9p2<$5$$!#(B
 
-$B$b$C$H>\$7$/(B
+$B$5$i$K>\:Y$J>pJs(B
 
-	Evolution $B%f!<%6!<8~$1%a!<%j%s%0%j%9%H$K;22C$9$k$3$H$,(B
-	$B$G$-$^$9(B:
-	http://lists.ximian.com/mailman/listinfo/evolution
+    http://mail.gnome.org/mailman/listinfo/evolution-list
+    $B$G(B Evolution $B$N%f!<%68~$1%a!<%j%s%0%j%9%H$r9VFI$G$-$^$9!#(B
 
-	Evolution $B%W%m%8%'%/%H$N>pJs$K$D$$$F$O(B
-        http://www.gnome.org/projects/evolution $B$X!#(B
+    Evolution $B%W%m%8%'%/%H$K$D$$$F$O(B http://www.gnome.org/projects/evolution $B$r$4Mw2<$5$$!#(B
 
 
-$B7I6q!"(B
+$B7I6q(B
 Evolution $B3+H/%A!<%`(B
+evolution@novell.com
 
 
 
@@ -90,7 +91,8 @@ Content-Type: text/html; charset=utf-8
   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
   <META NAME="GENERATOR" CONTENT="GtkHTML/0.13.99">
 </HEAD>
-<BODY BGCOLOR="#f8fcf8"><TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
 <TR>
 <TD ALIGN="left" VALIGN="top">
 <IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
@@ -115,11 +117,7 @@ Content-Type: text/html; charset=utf-8
 <TD>
 </TD>
 <TD>
-<FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution 開発チーム</FONT></B></FONT SIZE="4">
-<FONT COLOR="#f8fcf8"><FONT SIZE="4">は、あなたがメールや個人情報を管理する</FONT></FONT SIZE="4">
-<FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution</FONT></B></FONT SIZE="4">
-<FONT COLOR="#f8fcf8"><FONT SIZE="4">システムを導入してくれたことをとても光栄に思います。</FONT></FONT SIZE="4">
-</TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution 開発チーム</FONT></B></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4">は、あなたにメールや個人情報をまとめて管理できる </FONT></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution システム</FONT></B></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4">を紹介することができて、とても光栄に思います。</FONT></FONT SIZE="4"></TD>
 <TD>
 </TD>
 <TD>
@@ -146,56 +144,66 @@ Content-Type: text/html; charset=utf-8
 </TD>
 </TR>
 </TABLE>
-<h2>はじめに</h2>
+<h2>はじめてみよう</h2>
 
 <blockquote>
-	Evolution のウィンドウ左側には、あなたのすべてのメール
-	フォルダへのショートカットを含むサイドバーがあります。
-	その下の方にはカレンダーやコンタクト、タスク、メール
-	ボタンがあります。
+	Evolution ウィンドウの左側には、全てのメール・フォルダに素早くアクセスできるサイドバーがあります。その下には、カレンダや連絡先、タスク、メール、そしてメモ帳を表示するボタンがあります。
+<br><br>
+    <b>ヘルプ</b>メニューの<b>目次</b>をクリックするか、または <b>[F1]</b> キーを押すと、Evolution のユーザ・ガイドが表示されます。
 <br><br>
-        完全な Evolution ガイドを御希望なら、<b>ヘルプ</b>メニューから
-        <b>目次</b>を選択するか、<b>F1</b> キーを押して下さい。
 </blockquote>
 
-<h2>新規機能</h2>
+<h2>新しい機能</h2>
 <blockquote>
-        Evolution 2.0 では新たに Novell GroupWise サーバー (6.5.3
-        以上)と Exchange 2000/2003 への接続サポートが追加されました。
-        他に新規機能として、迷惑メールフィルタ、S/MIME セキュリティ、
-	IMAP のオフラインサポートの向上、NNTP (news) のサポート、
-	ウェブカレンダー表示、複数のカレンダーの重ね合わせ、そして
-	コンタクト、カレンダー、タスクデータにアクセスするための
-	新しい開発者向け API を含んでいます。
+	Evolution バージョン 2.6 には次のような機能があります: 
+	<ul>
+	<li>メモを記録するコンポーネントを追加しました</li>
+	<li>イベント/タスク/会議の編集ダイアログの表示を刷新しました</li>
+	<li>カレンダ情報を外部に公開できます</li>
+	<li>CalDAV をサポートしました</li>
+	<li>Network Manager をサポートしました</li>
+	<li>HULA をサポートしました (接続のみ)</li>
+	<li>GroupWise の機能を改善しました</li>
+	<li>繰り返し発生するイベントの機能を改善しました</li>
+	<li>カレンダ上のイベントにツールチップを表示できるようになりました</li>
+	<li>Mozilla、Outlook、そして Evolution フォーマットに対応した CSV/tab を取り込めます</li>
+	<li>連絡先一覧では LDAP 形式のアドレス帳をサポートしました</li>
+	<li>アドレス帳では拡張検索の結果を保存できるようになりました</li>
+	<li>メール作成では、メッセージに優先順位を付けることができるようになりました</li>
+	<li>バグをたくさん修正し、ユーザ・インタフェースをさらに改善しました</li>
+	</ul>
+<br>
 </blockquote>
 
-<h2>不具合の報告</h2>
+<h2>バグの報告</h2>
 <blockquote>
-        不具合は <a href="http://bugzilla.ximian.com">http://bugzilla.ximian.com</a> まで御報告下さい。
+	Evolution の不具合は <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a> まで報告して下さい。
+<br><br>
 </blockquote> 
 
-<h2>もっと詳しく</h2>
+<h2>さらに詳細な情報</h2>
 
 <blockquote>
-	Evolution ユーザー向けメーリングリストに参加することが
-	できます:
-	<a href="http://lists.ximian.com/mailman/listinfo/evolution">http://lists.ximian.com/mailman/listinfo/evolution</a>.
-
-	Evolution プロジェクトの情報については
-	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a> へ。
- </blockquote>
-
+	<a
+	href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a> で Evolution のユーザ向けメーリングリストを講読できます。
+
+	Evolution プロジェクトについては <a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a> をご覧下さい。
+	<!--
+	You can find a list of answers to Frequently Asked Questions (FAQ) at
+	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a>.
+	-->
+<br><br>	
+</blockquote>
 
-敬具、<br>
+敬具<br>
 Evolution 開発チーム<br>
-<a href="mailto:evolution@ximian.com">evolution@ximian.com</a>
+<a href="mailto:evolution@novell.com">evolution@novell.com</a>
 
 </BODY>
 </HTML>
 
 --=-2gZ1roA/HoYrlRDVGyiM--
 
-
 --=-t4dRE6cqcdSBHOrMdTQ1
 Content-Type: image/png
 Content-ID: <1001417929.27019.9.camel@spectrolite>
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 0a5b93a995..1d2c07bd91 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1883,7 +1883,7 @@ emae_option_entry_changed(GtkEntry *entry, EMAccountEditorService *service)
 }
 
 static GtkWidget *
-emae_option_entry(EMAccountEditorService *service, CamelURL *url, const char *name, const char *def, GtkWidget *l)
+emae_option_entry(EMAccountEditorService *service, CamelURL *url, const char *name, const char *def)
 {
 	GtkWidget *w;
 	const char *val = camel_url_get_param(url, name);
@@ -1900,7 +1900,6 @@ emae_option_entry(EMAccountEditorService *service, CamelURL *url, const char *na
 	w = g_object_new(gtk_entry_get_type(),
 			 "text", val,
 			 NULL);
-	gtk_label_set_mnemonic_widget ((GtkLabel*)l, w);
 	g_object_set_data((GObject *)w, "option-name", (void *)name);
 	g_signal_connect(w, "changed", G_CALLBACK(emae_option_entry_changed), service);
 	gtk_widget_show(w);
@@ -2105,7 +2104,7 @@ section:
 		case CAMEL_PROVIDER_CONF_ENTRY:
 			l = g_object_new(gtk_label_get_type(), "label", entries[i].text, "xalign", 0.0, "use_underline", TRUE, NULL);
 			gtk_widget_show(l);
-			w = emae_option_entry(service, url, entries[i].name, entries[i].value, l);
+			w = emae_option_entry(service, url, entries[i].name, entries[i].value);
 			gtk_table_attach((GtkTable *)parent, l, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
 			gtk_table_attach((GtkTable *)parent, w, 1, 2, row, row+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
 			if (depw) {
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 616f3a43ae..db0187eb8c 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -57,7 +57,7 @@
 #include <gtk/gtkimage.h>
 #include <gtk/gtkstock.h>
 
-#include <gtk/gtkfilechooserbutton.h>
+#include <libgnomeui/gnome-file-entry.h>
 #include <libgnomeui/gnome-color-picker.h>
 
 #include <gtkhtml/gtkhtml.h>
@@ -319,8 +319,8 @@ sig_edit_cb (GtkWidget *widget, EMComposerPrefs *prefs)
 		/* signature script */
 		GtkWidget *entry;
 		
-		entry = glade_xml_get_widget (prefs->sig_script_gui, "filechooserbutton_add_script");
-		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (entry), sig->filename);
+		entry = glade_xml_get_widget (prefs->sig_script_gui, "fileentry_add_script_script");
+		gnome_file_entry_set_filename ((GnomeFileEntry *) entry, sig->filename);
 		
 		entry = glade_xml_get_widget (prefs->sig_script_gui, "entry_add_script_name");
 		gtk_entry_set_text (GTK_ENTRY (entry), sig->name);
@@ -383,8 +383,8 @@ sig_add_script_response (GtkWidget *widget, int button, EMComposerPrefs *prefs)
 	int argc;
 	
 	if (button == GTK_RESPONSE_ACCEPT) {
-		entry = glade_xml_get_widget (prefs->sig_script_gui, "filechooserbutton_add_script");
-		script = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (entry));
+		entry = glade_xml_get_widget (prefs->sig_script_gui, "fileentry_add_script_script");
+		script = gnome_file_entry_get_full_path((GnomeFileEntry *)entry, FALSE);
 		
 		entry = glade_xml_get_widget (prefs->sig_script_gui, "entry_add_script_name");
 		name = gtk_entry_get_text (GTK_ENTRY (entry));
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index a94aa39d04..9ffc797f0b 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -35,7 +35,6 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkvpaned.h>
-#include <gtk/gtkhpaned.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gdk/gdkkeysyms.h>
 #include <gconf/gconf-client.h>
@@ -60,8 +59,6 @@
 
 #include <camel/camel-stream.h>
 #include <camel/camel-url.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
 
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object.h>
@@ -76,7 +73,6 @@
 #include "em-vfolder-rule.h"
 #include <misc/e-filter-bar.h>
 #include <camel/camel-search-private.h>
-#include <camel/camel-store.h>
 
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-error.h"
@@ -97,9 +93,6 @@
 
 #include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
 
-extern CamelSession *session;
-CamelStore *vfolder_store; /* the 1 static vfolder store */
-
 #define d(x)
 
 struct _EMFolderBrowserPrivate {
@@ -121,14 +114,11 @@ struct _EMFolderBrowserPrivate {
 	char *select_uid;
 	guint folder_changed_id;
 
-	int show_wide:1;
-
 	EMMenu *menu;		/* toplevel menu manager */
 };
 
 static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state);
 static void emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri);
-static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri);
 
 /* FilterBar stuff ... */
 static void emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char *query, void *data);
@@ -142,70 +132,17 @@ static void emfb_list_message_selected (MessageList *ml, const char *uid, EMFold
 static const EMFolderViewEnable emfb_enable_map[];
 
 enum {
-	ACCOUNT_SEARCH_ACTIVATED,
-	ACCOUNT_SEARCH_CLEARED,
-	LAST_SIGNAL
-};
-
-static guint folder_browser_signals [LAST_SIGNAL] = {0, };
-
-enum {
 	ESB_SAVE,
 };
 
 static ESearchBarItem emfb_search_items[] = {
 	E_FILTERBAR_ADVANCED,
-	{ NULL, 0, 0 },
+	{ NULL, 0, NULL },
 	E_FILTERBAR_SAVE,
 	E_FILTERBAR_EDIT,
-	{ NULL, 0, 0 },
-	{ N_("C_reate Search Folder From Search..."), ESB_SAVE, 0},
-	{ NULL, -1, 0 }
-};
-
-/* IDs and option items for the ESearchBar */
-enum {
-	VIEW_ALL_MESSAGES,
-	VIEW_UNREAD_MESSAGES,
-	VIEW_READ_MESSAGES,
-	VIEW_RECENT_MESSAGES,
-	VIEW_LAST_FIVE_DAYS,
-	VIEW_WITH_ATTACHMENTS,
-	VIEW_NOT_JUNK,
-	VIEW_NO_LABEL,
-	VIEW_LABEL,
-	VIEW_ANY_FIELD_CONTAINS,
-	VIEW_CUSTOMIZE
-};
-
-/* Options for View */
-static ESearchBarItem emfb_view_items[] = {
-	{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 },
-	{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 },
-	{ NULL, 0, 0 },
-	{ N_("No Label"),VIEW_NO_LABEL, 0 },
-	{ NULL, -1, 0 }
-};
-
-/* TODO: Following options should be  customizable */
-static ESearchBarItem temp_view_items[] = {
-	{ NULL, 0, 0 },
-	{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 },
-	{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 },
-	{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 },
-	{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 },
-	{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 },
-/* 	{ NULL, 0, NULL }, */
-/* 	{ N_("Customize"), NOT_IMPLEMENTED, NULL }, */
-	{ NULL, -1, 0 }
-};
-
-static ESearchBarItem emfb_search_scope_items[] = {
-	E_FILTERBAR_CURRENT_FOLDER,
-	E_FILTERBAR_CURRENT_ACCOUNT,
-	E_FILTERBAR_ALL_ACCOUNTS,
-	E_FILTERBAR_CURRENT_MESSAGE,
-	{ NULL, -1, 0 }
+	{ NULL, 0, NULL },
+	{ N_("C_reate Search Folder From Search..."), ESB_SAVE, NULL  },
+	{ NULL, -1, NULL }
 };
 
 static EMFolderViewClass *emfb_parent;
@@ -217,11 +154,7 @@ emfb_pane_realised(GtkWidget *w, EMFolderBrowser *emfb)
 	GConfClient *gconf;
 
 	gconf = mail_config_get_gconf_client ();
-	
-	if (emfb->priv->show_wide)
-		gtk_paned_set_position((GtkPaned *)emfb->vpane, gconf_client_get_int(gconf, "/apps/evolution/mail/display/hpaned_size", NULL));
-	else
-		gtk_paned_set_position((GtkPaned *)emfb->vpane, gconf_client_get_int(gconf, "/apps/evolution/mail/display/paned_size", NULL));
+	gtk_paned_set_position((GtkPaned *)emfb->vpane, gconf_client_get_int(gconf, "/apps/evolution/mail/display/paned_size", NULL));
 }
 
 static gboolean
@@ -229,15 +162,9 @@ emfb_pane_button_release_event(GtkWidget *w, GdkEventButton *e, EMFolderBrowser
 {
 	GConfClient *gconf = mail_config_get_gconf_client ();
 
-	if (GTK_WIDGET_REALIZED (w)) {
-		if (emfb->priv->show_wide)
-			gconf_client_set_int(gconf, "/apps/evolution/mail/display/hpaned_size",
-					     gtk_paned_get_position(GTK_PANED(w)), NULL);
-		else
-			gconf_client_set_int(gconf, "/apps/evolution/mail/display/paned_size",
-					     gtk_paned_get_position(GTK_PANED(w)), NULL);
-			
-	}
+	if (GTK_WIDGET_REALIZED (w))
+		gconf_client_set_int(gconf, "/apps/evolution/mail/display/paned_size",
+				     gtk_paned_get_position(GTK_PANED(w)), NULL);
 	
 	return FALSE;
 }
@@ -249,136 +176,12 @@ free_one_ui_file (gpointer data,
 	g_free (data);
 }
 
-static char *
-string_without_underscores (const char *s)
-{
-	char *new_string;
-	const char *sp;
-	char *dp;
-
-	new_string = g_malloc (strlen (s) + 1);
-
-	dp = new_string;
-	for (sp = s; *sp != '\0'; sp ++) {
-		if (*sp != '_') {
-			*dp = *sp;
-			dp ++;
-		} else if (sp[1] == '_') {
-			/* Translate "__" in "_".  */
-			*dp = '_';
-			dp ++;
-			sp ++;
-		}
-	}
-	*dp = 0;
-
-	return new_string;
-}
-
-static GtkWidget *
-generate_viewoption_menu ()
-{
-	GtkWidget *menu, *menu_item;
-	gint i = 0;
-	GSList *l;
-
-	menu = gtk_menu_new ();
-
-	for (i = 0; emfb_view_items[i].id != -1; ++i) {
-		if (emfb_view_items[i].text) {
-			char *str;
-			str = string_without_underscores (emfb_view_items[i].text);
-			menu_item = gtk_menu_item_new_with_label (str);
-			g_free (str);
-		} else {
-			menu_item = gtk_menu_item_new ();
-			gtk_widget_set_sensitive (menu_item, FALSE);
-		}
-
-		g_object_set_data (G_OBJECT (menu_item), "EsbItemId",
-				   GINT_TO_POINTER (emfb_view_items[i].id));
-
-		gtk_widget_show (menu_item);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
-	}
-
-	/* Add the labels */
-	for (l = mail_config_get_labels(); l; l = l->next) {
-		MailConfigLabel *label = l->data;
-		if (label->name && *(label->name)) {
-			char *str;
-			str = string_without_underscores (label->name);
-			menu_item = gtk_menu_item_new_with_label (str);
-			g_free (str);
-
-			g_object_set_data (G_OBJECT (menu_item), "EsbItemId",
-					   GINT_TO_POINTER (VIEW_LABEL));
-		
-			g_object_set_data (G_OBJECT (menu_item), "LabelTag",
-					   g_strdup(label->tag));
-		}
-
-		gtk_widget_show (menu_item);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
-	}
-
-	for (i = 0; temp_view_items[i].id != -1; ++i) {
-		if (temp_view_items[i].text) {
-			char *str;
-			str = string_without_underscores (temp_view_items[i].text);
-			menu_item = gtk_menu_item_new_with_label (str);
-			g_free (str);
-		} else {
-			menu_item = gtk_menu_item_new ();
-			gtk_widget_set_sensitive (menu_item, FALSE);
-		}
-
-		g_object_set_data (G_OBJECT (menu_item), "EsbItemId",
-				   GINT_TO_POINTER (temp_view_items[i].id));
-
-		gtk_widget_show (menu_item);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
-	}
-
-	return menu;
-}
-
-
-static GArray *
-viewoption_menu_generator ()
-{
-	GArray *menu = g_array_new (FALSE, FALSE, sizeof (ESearchBarItem));
-	gint i = 0;
-	ESearchBarItem dup_item;
-	GSList *l;
-
-	for (i = 0; emfb_view_items[i].id != -1; i++) 
-		g_array_append_vals (menu, &emfb_view_items[i], 1);
-
-	for (l = mail_config_get_labels(); l; l = l->next) {
-		ESearchBarItem item;
-		MailConfigLabel *label = l->data;
-	
-		item.text = label->name;
-		item.id = VIEW_LABEL;
-
-		g_array_append_vals (menu, &item, 1);
-	}
-
-	dup_item.id = -1;
-	dup_item.text = NULL;
-	g_array_append_vals (menu, &dup_item, 1);
-
-	return menu;
-}
-
 static void
 emfb_init(GObject *o)
 {
 	EMFolderBrowser *emfb = (EMFolderBrowser *)o;
 	RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ());
 	struct _EMFolderBrowserPrivate *p;
-	GtkWidget *menu;
 
 	p = emfb->priv = g_malloc0(sizeof(struct _EMFolderBrowserPrivate));
 
@@ -406,13 +209,9 @@ emfb_init(GObject *o)
 	if (search_context) {
 		const char *systemrules = g_object_get_data (G_OBJECT (search_context), "system");
 		const char *userrules = g_object_get_data (G_OBJECT (search_context), "user");
-
+		
 		emfb->search = e_filter_bar_new(search_context, systemrules, userrules, emfb_search_config_search, emfb);
 		e_search_bar_set_menu ((ESearchBar *)emfb->search, emfb_search_items);
-		e_search_bar_set_scopeoption ((ESearchBar *)emfb->search, emfb_search_scope_items);
-
-		menu = generate_viewoption_menu();
-		e_search_bar_set_viewoption_menu ((ESearchBar *)emfb->search, menu);
 		gtk_widget_show((GtkWidget *)emfb->search);
 
 		p->search_menu_activated_id = g_signal_connect(emfb->search, "menu_activated", G_CALLBACK(emfb_search_menu_activated), emfb);
@@ -422,9 +221,7 @@ emfb_init(GObject *o)
 		gtk_box_pack_start((GtkBox *)emfb, (GtkWidget *)emfb->search, FALSE, TRUE, 0);
 	}
 
-	emfb->priv->show_wide = gconf_client_get_bool(mail_config_get_gconf_client(), "/apps/evolution/mail/display/show_wide", NULL);
-	emfb->vpane = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new();
-
+	emfb->vpane = gtk_vpaned_new();
 	g_signal_connect(emfb->vpane, "realize", G_CALLBACK(emfb_pane_realised), emfb);
 	emfb->priv->vpane_resize_id = g_signal_connect(emfb->vpane, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb);
 
@@ -449,7 +246,6 @@ emfb_init(GObject *o)
 
 	g_signal_connect (((EMFolderView *) emfb)->list->tree, "key_press", G_CALLBACK(emfb_list_key_press), emfb);
 	g_signal_connect (((EMFolderView *) emfb)->list, "message_selected", G_CALLBACK (emfb_list_message_selected), emfb);
-
 }
 
 static void
@@ -494,27 +290,6 @@ emfb_class_init(GObjectClass *klass)
 {
 	klass->finalize = emfb_finalise;
 
-	folder_browser_signals[ACCOUNT_SEARCH_ACTIVATED] =
-		g_signal_new ("account_search_activated",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMFolderBrowserClass, account_search_activated),
-			      NULL,
-			      NULL,
-			      g_cclosure_marshal_VOID__STRING,
-			      G_TYPE_NONE, 1, G_TYPE_STRING);
-
-	folder_browser_signals[ACCOUNT_SEARCH_CLEARED] =
-		g_signal_new ("account_search_cleared",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMFolderBrowserClass, account_search_cleared),
-			      NULL,
-			      NULL,
-			      g_cclosure_marshal_VOID__STRING,
-			      G_TYPE_NONE, 1, G_TYPE_STRING);
-
-
 	((GtkObjectClass *)klass)->destroy = emfb_destroy;
 	((EMFolderViewClass *)klass)->set_folder = emfb_set_folder;
 	((EMFolderViewClass *)klass)->activate = emfb_activate;
@@ -570,7 +345,7 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state)
 		GConfClient *gconf = mail_config_get_gconf_client ();
 		int paned_size /*, y*/;
 
-		paned_size = gconf_client_get_int(gconf, emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size":"/apps/evolution/mail/display/paned_size", NULL);
+		paned_size = gconf_client_get_int(gconf, "/apps/evolution/mail/display/paned_size", NULL);
 
 		/*y = save_cursor_pos (emfb);*/
 		gtk_paned_set_position (GTK_PANED (emfb->vpane), paned_size);
@@ -601,40 +376,6 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state)
 	/* FIXME: need to update menu's to reflect ui changes */
 }
 
-void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state)
-{
-	GtkWidget *w;
-	int paned_size;
-
-	if ((emfb->priv->show_wide &&  state)
-	    || emfb->view.list == NULL) {
-		emfb->priv->show_wide = state;
-		return;
-	}
-
-	emfb->priv->show_wide = state;
-
-	w = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new();
-
-	g_signal_handler_disconnect(emfb->vpane, emfb->priv->vpane_resize_id);
-	g_signal_connect(w, "realize", G_CALLBACK(emfb_pane_realised), emfb);
-	emfb->priv->vpane_resize_id = g_signal_connect(w, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb);
-
-	gtk_box_pack_start_defaults((GtkBox *)emfb, w);
-	gtk_widget_reparent((GtkWidget *)emfb->view.list, w);
-	gtk_widget_reparent((GtkWidget *)emfb->priv->preview, w);
-	gtk_widget_destroy(emfb->vpane);
-	gtk_container_resize_children (w);
-	emfb->vpane = w;
-	gtk_widget_show(w);
-
-	paned_size = gconf_client_get_int(mail_config_get_gconf_client(), emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size":"/apps/evolution/mail/display/paned_size", NULL);
-	gtk_paned_set_position (GTK_PANED (emfb->vpane), paned_size);
-
-	if (((EMFolderView *)emfb)->folder)
-		em_folder_view_setup_view_instance ((EMFolderView *) emfb);
-}
-
 /* ********************************************************************** */
 
 /* FIXME: Need to separate system rules from user ones */
@@ -676,7 +417,7 @@ emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char
 	struct _camel_search_words *words;
 	int i;
 	GSList *strings = NULL;
-
+	
 	/* we scan the parts of a rule, and set all the types we know about to the query string */
 	partl = rule->parts;
 	while (partl) {
@@ -713,360 +454,40 @@ emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char
 					  strings);
 	while (strings) {
 		GSList *n = strings->next;
+
 		g_free(strings->data);
 		g_slist_free_1(strings);
 		strings = n;
 	}
 }
 
-static char *
-get_view_query (ESearchBar *esb)
-{
-	char *view_sexp = NULL;
-	gint id;
-	GtkWidget *menu_item;
-	char *tag;
-
-	/* Get the current selected view */
-	id = e_search_bar_get_viewitem_id (esb);
-	menu_item = e_search_bar_get_selected_viewitem (esb);
-
-	switch (id) {
-	case VIEW_ALL_MESSAGES:
-		view_sexp = " ";
-		break;
-
-	case VIEW_UNREAD_MESSAGES:
-		view_sexp = "(match-all (not (system-flag  \"Seen\")))";
-		break;
-	case VIEW_READ_MESSAGES:
-		view_sexp = "(match-all (system-flag  \"Seen\"))";
-		break;
-        case VIEW_RECENT_MESSAGES:
-		view_sexp = "(match-all (> (get-received-date) (- (get-current-date) 86400)))";
-		break;
-	case VIEW_LAST_FIVE_DAYS:
-		view_sexp = " (match-all (> (get-received-date) (- (get-current-date) 432000)))";
-		break;
-        case VIEW_WITH_ATTACHMENTS:
-		view_sexp = "(match-all (system-flag \"Attachments\"))";
-		break;
-	case VIEW_NOT_JUNK:
-		view_sexp = "(match-all (not (system-flag \"junk\")))";
-		break;
-        case VIEW_NO_LABEL:
-		/* FIXME : cannot hard code this query */
-	        view_sexp = "(and (match-all (not (= (user-tag \"label\")  \"important\")))"
-                            "(match-all (not (= (user-tag \"label\")  \"work\"))) (match-all (not (= (user-tag \"label\")  \"personal\")))" 
-			    "(match-all (not (= (user-tag \"label\")  \"todo\"))) (match-all (not (= (user-tag \"label\")  \"later\"))) ))";
-		break;
-        case VIEW_LABEL:
-		tag = (char *)g_object_get_data (G_OBJECT (menu_item), "LabelTag");
-		view_sexp = g_strdup_printf ("(match-all (= (user-tag \"label\")  \"%s\"))",tag);
-		break;
-	case VIEW_ANY_FIELD_CONTAINS:
-		break;
-
-	case VIEW_CUSTOMIZE:
-		view_sexp = " ";
-		break;
-	}
-	return view_sexp;
-}
-
-
-struct _setup_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	char *query;
-	GList *sources_uri;
-	GList *sources_folder;
-};
-
-static char *
-vfolder_setup_desc(struct _mail_msg *mm, int done)
-{
-	struct _setup_msg *m = (struct _setup_msg *)mm;
-
-	return g_strdup(_("Searching"));
-}
-
-static void
-vfolder_setup_do(struct _mail_msg *mm)
-{
-	struct _setup_msg *m = (struct _setup_msg *)mm;
-	GList *l, *list = NULL;
-	CamelFolder *folder;
-
-	d(printf("Setting up Search Folder: %s\n", m->folder->full_name));
-
-	camel_vee_folder_set_expression((CamelVeeFolder *)m->folder, m->query);
-
-	l = m->sources_uri;
-	while (l) {
-		d(printf(" Adding uri: %s\n", (char *)l->data));
-		folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex);
-		if (folder) {
-			list = g_list_append(list, folder);
-		} else {
-			g_warning("Could not open vfolder source: %s", (char *)l->data);
-			camel_exception_clear(&mm->ex);
-		}
-		l = l->next;
-	}
-
-	l = m->sources_folder;
-	while (l) {
-		d(printf(" Adding folder: %s\n", ((CamelFolder *)l->data)->full_name));
-		camel_object_ref(l->data);
-		list = g_list_append(list, l->data);
-		l = l->next;
-	}
-
-	camel_vee_folder_set_folders((CamelVeeFolder *)m->folder, list);
-
-	l = list;
-	while (l) {
-		camel_object_unref(l->data);
-		l = l->next;
-	}
-	g_list_free(list);
-}
-
-static void
-vfolder_setup_done(struct _mail_msg *mm)
-{
-	struct _setup_msg *m = (struct _setup_msg *)mm;
-
-	m = m;
-}
-
-static void
-vfolder_setup_free (struct _mail_msg *mm)
-{
-	struct _setup_msg *m = (struct _setup_msg *)mm;
-	GList *l;
-
-	camel_object_unref(m->folder);
-	g_free(m->query);
-
-	l = m->sources_uri;
-	while (l) {
-		g_free(l->data);
-		l = l->next;
-	}
-	g_list_free(m->sources_uri);
-
-	l = m->sources_folder;
-	while (l) {
-		camel_object_unref(l->data);
-		l = l->next;
-	}
-	g_list_free(m->sources_folder);
-}
-
-static struct _mail_msg_op vfolder_setup_op = {
-	vfolder_setup_desc,
-	vfolder_setup_do,
-	vfolder_setup_done,
-	vfolder_setup_free,
-};
-
-/* sources_uri should be camel uri's */
-static int
-vfolder_setup(CamelFolder *folder, const char *query, GList *sources_uri, GList *sources_folder)
-{
-	struct _setup_msg *m;
-	int id;
-	
-	m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->query = g_strdup(query);
-	m->sources_uri = sources_uri;
-	m->sources_folder = sources_folder;
-	
-	id = m->msg.seq;
-	e_thread_put(mail_thread_queued_slow, (EMsg *)m);
-
-	return id;
-}
-
 static void
 emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
 {
 	EMFolderView *emfv = (EMFolderView *) emfb;
-	EFilterBar *efb = (EFilterBar *)esb;
-	char *search_state, *view_sexp, *folder_uri;
-	char *word = NULL, *storeuri = NULL, *search_word = NULL;;
-	gint id, i;
-	CamelFolder *folder;
-	CamelStore *store;
-	GPtrArray *folders;
-	GList *folder_list_account = NULL ;
-	GList *l, *folder_list = NULL ;
-	CamelException *ex;
-
-	ex = camel_exception_new ();
-
+	char *search_word, *search_state;
+	
 	if (emfv->list == NULL || emfv->folder == NULL)
 		return;
 	
-	id = e_search_bar_get_search_scope (esb);
-
-	switch (id) {
-	    case E_FILTERBAR_CURRENT_MESSAGE_ID:
-		    word = e_search_bar_get_text (esb);
-		    if ( word && *word ) {
-			    gtk_widget_set_sensitive (esb->option_button, FALSE);
-			    em_format_html_display_search_with (emfb->view.preview, word);
-		    } else {
-			    em_format_html_display_search_close (emfb->view.preview);
-		    }
-		    return;
-		    break;
-
-	    case E_FILTERBAR_CURRENT_FOLDER_ID:
-		    g_object_get (esb, "query", &search_word, NULL);
-		    break;
-
-	    case E_FILTERBAR_CURRENT_ACCOUNT_ID:
-		    word = e_search_bar_get_text (esb);
-		    if (!(word && *word)) {
-			    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_CLEARED], 0);
-			    gtk_widget_set_sensitive (esb->scopeoption, TRUE);
-			    break;
-		    }
-
-		    gtk_widget_set_sensitive (esb->scopeoption, FALSE);		    
-
-		    /* Disable the folder tree */
-		    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_ACTIVATED], 0);
-
-		    store = emfv->folder->parent_store;
-		    if (store->folders) {
-			    folders = camel_object_bag_list(store->folders);
-			    for (i=0;i<folders->len;i++) {
-				    folder = folders->pdata[i];
-				    folder_list_account = g_list_append(folder_list_account, folder);
-			    }
-		    }
-
-		    /* Create a camel vee folder */
-		    storeuri = g_strdup_printf("vfolder:%s/mail/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
-		    vfolder_store = camel_session_get_store (session, storeuri, NULL);
-		    efb->account_search_vf = camel_vee_folder_new (vfolder_store,"Account Search",CAMEL_STORE_VEE_FOLDER_AUTO);
-
-		    /* Set the search expression  */
-		    g_object_get (esb, "query", &search_word, NULL);
-
-		    vfolder_setup (efb->account_search_vf, search_word, NULL, folder_list_account);
-
-		    folder_uri = mail_tools_folder_to_url ((CamelFolder *)efb->account_search_vf);
-		    emfb_set_search_folder (emfv, (CamelFolder *)efb->account_search_vf, folder_uri);
-
-/* 		    g_list_free (folder_list_account); */
-/* 		    g_free (folder_uri); */
-/* 		    g_free (storeuri); */
-		    break;
-
-	    case E_FILTERBAR_ALL_ACCOUNTS_ID:
-		    word = e_search_bar_get_text (esb);
-		    if (!(word && *word)) {
-			    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_CLEARED], 0);
-			    gtk_widget_set_sensitive (esb->scopeoption, TRUE);		    
-			    break;
-		    }
-		    
-		    gtk_widget_set_sensitive (esb->scopeoption, FALSE);		    
-		    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_ACTIVATED], 0);
-
-		    /* Create a camel vee folder */
-		    storeuri = g_strdup_printf("vfolder:%s/mail/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
-		    vfolder_store = camel_session_get_store (session, storeuri, NULL);
-		    efb->all_account_search_vf = camel_vee_folder_new (vfolder_store,"All Account Search",CAMEL_STORE_VEE_FOLDER_AUTO);
-
-		    /* Set sexp  */
-		    g_object_get (esb, "query", &search_word, NULL);
-
-		    /* FIXME: there got to be a better way :) */
-
-		    /* Add the local folders */
-		    l = mail_vfolder_get_sources_local ();
-		    while (l) {
-			    folder = mail_tool_uri_to_folder ((const char *)l->data, 0,ex);
-			    if (folder)
-				    folder_list = g_list_append(folder_list, folder);
-			    else {
-				    g_warning("Could not open vfolder source: %s", (char *)l->data);
-				    camel_exception_clear(ex);
-			    }
-			    l = l->next;
-		    }
-
-		    /* Add the remote source folder */
-		    l = mail_vfolder_get_sources_remote ();
-		    while (l) {
-			    folder = mail_tool_uri_to_folder ((const char *)l->data, 0,ex);
-			    if (folder)
-				    folder_list = g_list_append(folder_list, folder);
-			    else {
-				    g_warning("Could not open vfolder source: %s", (char *)l->data);
-				    camel_exception_clear(ex);
-			    }
-			    l = l->next;
-		    }
-
-		    vfolder_setup (efb->all_account_search_vf, search_word, NULL, folder_list);
-
-		    folder_uri = mail_tools_folder_to_url ((CamelFolder *)efb->all_account_search_vf);
-		    emfb_set_search_folder (emfv, (CamelFolder *)efb->all_account_search_vf, folder_uri);
-
-		    g_list_free (l);
-		    break;
-	}
-
-	/* Merge the view and search expresion*/
-	view_sexp = get_view_query (esb);
 	g_object_get (esb, "query", &search_word, NULL);
-
-	if (search_word && *search_word)
-		search_word = g_strconcat ("(and ", view_sexp, search_word, " )", NULL);
-	else
-		search_word = g_strdup (view_sexp);
-
 	message_list_set_search(emfb->view.list, search_word);
-
-	/* Fixme */
+	g_free (search_word);
+	
 	g_object_get (esb, "state", &search_state, NULL);
 	camel_object_meta_set (emfv->folder, "evolution:search_state", search_state);
 	camel_object_state_write (emfv->folder);
-
-	camel_exception_free (ex);
+	g_free (search_state);
 }
 
 static void
 emfb_search_query_changed(ESearchBar *esb, EMFolderBrowser *emfb)
 {
-	int search_scope;
-	int item_id;
-
-	search_scope = e_search_bar_get_search_scope (esb);
-	item_id = e_search_bar_get_item_id (esb);
-
-	/* Close the current message search bar */
-	if ( search_scope != E_FILTERBAR_CURRENT_MESSAGE_ID ) {
-		em_format_html_display_search_close (emfb->view.preview);
-		gtk_widget_set_sensitive (esb->option_button, TRUE);
-	} else
-		gtk_widget_set_sensitive (esb->option_button, FALSE);
+	int id;
 	
-	switch (item_id) {
-	    case E_FILTERBAR_ADVANCED_ID:
-		    emfb_search_search_activated(esb, emfb);
-		    break;
-	}
+	id = e_search_bar_get_item_id(esb);
+	if (id == E_FILTERBAR_ADVANCED_ID)
+		emfb_search_search_activated(esb, emfb);
 }
 
 /* ********************************************************************** */
@@ -1112,12 +533,12 @@ emfb_edit_cut(BonoboUIComponent *uid, void *data, const char *path)
 
 	/* TODO: pity we can't sucblass this method, ugh, virtualise it? */
 
-/* 	if (GTK_HAS_FOCUS(((ESearchBar *)emfb->search)->entry)) */
-/* 		gtk_editable_cut_clipboard((GtkEditable *)((ESearchBar *)emfb->search)->entry); */
-/* 	else if (GTK_WIDGET_HAS_FOCUS(emfb->view.preview->formathtml.html)) */
-/* 		em_format_html_display_cut(emfb->view.preview); */
-/* 	else */
-/* 		message_list_copy(emfb->view.list, TRUE); */
+	if (GTK_WIDGET_HAS_FOCUS(((ESearchBar *)emfb->search)->entry))
+		gtk_editable_cut_clipboard((GtkEditable *)((ESearchBar *)emfb->search)->entry);
+	else if (GTK_WIDGET_HAS_FOCUS(emfb->view.preview->formathtml.html))
+		em_format_html_display_cut(emfb->view.preview);
+	else
+		message_list_copy(emfb->view.list, TRUE);
 }
 
 static void
@@ -1308,7 +729,8 @@ emfb_mark_all_read(BonoboUIComponent *uid, void *data, const char *path)
 
 	if (emfv->folder == NULL)
 		return;
-	if( em_utils_prompt_user((GtkWindow *)emfv, "/apps/evolution/mail/prompts/mark_all_read","mail:ask-mark-all-read", NULL)){
+	
+	if( e_error_run ((GtkWidget *)emfv,"mail:ask-mark-all-read",NULL) == GTK_RESPONSE_YES){
 		uids = message_list_get_uids(emfv->list);
 		camel_folder_freeze(emfv->folder);
 		for (i=0;i<uids->len;i++)
@@ -1524,36 +946,6 @@ emfb_view_preview(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_E
 }
 
 static void
-emfb_show_next(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
-{
-	GConfClient *gconf;
-	EMFolderBrowser *emfb = data;
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	gconf = mail_config_get_gconf_client ();
-	gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_wide", state[0] != '0', NULL);
-
-	em_folder_browser_show_wide(emfb, state[0] != '0');
-}
-
-static void
-emfb_show_below(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
-{
-	GConfClient *gconf;
-	EMFolderBrowser *emfb = data;
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	gconf = mail_config_get_gconf_client ();
-	gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_wide", state[0] == '0', NULL);
-
-	em_folder_browser_show_wide(emfb, state[0] == '0');
-}
-
-static void
 emfb_list_scrolled (MessageList *ml, EMFolderBrowser *emfb)
 {
 	EMFolderView *emfv = (EMFolderView *) emfb;
@@ -1673,42 +1065,6 @@ emfb_list_built (MessageList *ml, EMFolderBrowser *emfb)
 }
 
 static void
-emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri)
-{
-	EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
-	
-	message_list_freeze(emfv->list);
-	
-	if (emfb->priv->list_scrolled_id) {
-		g_signal_handler_disconnect (emfv->list, emfb->priv->list_scrolled_id);
-		emfb->priv->list_scrolled_id = 0;
-	}
-	
-	if (emfb->priv->idle_scroll_id) {
-		g_source_remove (emfb->priv->idle_scroll_id);
-		emfb->priv->idle_scroll_id = 0;
-	}
-
-	if (emfb->view.folder) {
-		camel_object_remove_event(emfb->view.folder, emfb->priv->folder_changed_id);
-		emfb->priv->folder_changed_id = 0;
-	}
-
-	emfb_parent->set_folder(emfv, folder, uri);
-
-	/* etspec for search results */
-	char *state = "<ETableState>"
-			"<column source=\"0\"/> <column source=\"3\"/> <column source=\"1\"/>"
-			"<column source=\"14\"/> <column source=\"5\"/>"
-			"<column source=\"7\"/> <column source=\"13\"/> "
-                        "<grouping> </grouping> </ETableState>";
-	e_tree_set_state (((MessageList *)emfv->list)->tree, state);
-	
-	message_list_thaw(emfv->list);
-}
-
-
-static void
 emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri)
 {
 	EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
@@ -1773,10 +1129,9 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri)
 			bonobo_ui_component_set_prop(emfv->uic, "/commands/HideDeleted", "sensitive", state?"1":"0", NULL);
 		}
 
-		/* Fixme */
-/* 		sstate = camel_object_meta_get(folder, "evolution:search_state"); */
-/* 		g_object_set(emfb->search, "state", sstate, NULL); */
-/* 		g_free(sstate); */
+		sstate = camel_object_meta_get(folder, "evolution:search_state");
+		g_object_set(emfb->search, "state", sstate, NULL);
+		g_free(sstate);
 		
 		/* set the query manually, so we dont pop up advanced or saved search stuff */
 		g_object_get(emfb->search, "query", &sstate, NULL);
@@ -1819,7 +1174,7 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
 	           preview settings - see folder_browser_set_message_preview()
 	           internals for details) */
 		g_signal_handler_block(emfb->vpane, emfb->priv->vpane_resize_id);
-		gtk_paned_set_position((GtkPaned *)emfb->vpane, gconf_client_get_int (gconf, emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size": "/apps/evolution/mail/display/paned_size", NULL));
+		gtk_paned_set_position((GtkPaned *)emfb->vpane, gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL));
 		g_signal_handler_unblock(emfb->vpane, emfb->priv->vpane_resize_id);
 		
 		/* (Pre)view toggle */
@@ -1868,20 +1223,6 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
 		bonobo_ui_component_add_listener(uic, "ViewThreaded", emfb_view_threaded, emfv);
 		message_list_set_threaded(emfv->list, state);
 
-		/* Show wide display */
-		state = gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_wide", NULL);
-		if (state) {
-			bonobo_ui_component_set_prop(uic, "/commands/ViewAfter", "state", "1", NULL);
-			bonobo_ui_component_set_prop(uic, "/commands/ViewBelow", "state", "0", NULL);
-		} else {
-			bonobo_ui_component_set_prop(uic, "/commands/ViewAfter", "state", "0", NULL);
-			bonobo_ui_component_set_prop(uic, "/commands/ViewBelow", "state", "1", NULL);			
-		}
-		
-		bonobo_ui_component_add_listener(uic, "ViewAfter", emfb_show_next, emfv);
-		bonobo_ui_component_add_listener(uic, "ViewBelow", emfb_show_below, emfv);
-		/* em_folder_browser_show_wide((EMFolderBrowser *)emfv, state); */
-
 		/* FIXME: Selection state */
 
 		/* FIXME: property menu customisation */
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 58712a9f76..a52c081f1b 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -234,7 +234,6 @@ em_folder_selection_button_clicked (GtkButton *button)
 
 	model = mail_component_peek_tree_model (mail_component_peek ());
 	emft = (EMFolderTree *) em_folder_tree_new_with_model (model);
-	g_object_unref (model);
 	em_folder_tree_set_multiselect (emft, priv->multiple_select);
 	em_folder_tree_set_excluded(emft, EMFT_EXCLUDE_NOSELECT|EMFT_EXCLUDE_VIRTUAL|EMFT_EXCLUDE_VTRASH);
 	dialog = em_folder_selector_new (emft, EM_FOLDER_SELECTOR_CAN_CREATE, priv->title, priv->caption, NULL);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 687e4206fc..6114917750 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -475,11 +475,6 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 	GtkWidget *tree;
-	gboolean side_bar_search;
-	GConfClient *gconf;
-
-	gconf = mail_config_get_gconf_client ();	
-	side_bar_search = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/side_bar_search", NULL);
 	
 	tree = gtk_tree_view_new_with_model ((GtkTreeModel *) model);
 	GTK_WIDGET_SET_FLAGS(tree, GTK_CAN_FOCUS);
@@ -492,7 +487,6 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
 	gtk_tree_view_column_set_cell_data_func (column, renderer, render_pixbuf, NULL, NULL);
 	
 	renderer = gtk_cell_renderer_text_new ();
-	g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 	gtk_tree_view_column_pack_start (column, renderer, TRUE);
 	gtk_tree_view_column_set_cell_data_func (column, renderer, render_display_name, NULL, NULL);
 	
@@ -502,8 +496,7 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
 	gtk_tree_view_set_headers_visible ((GtkTreeView *) tree, FALSE);
 
 	gtk_tree_view_set_search_column((GtkTreeView *)tree, COL_STRING_DISPLAY_NAME);
-	gtk_tree_view_set_enable_search((GtkTreeView *)tree, side_bar_search);
-
+	
 	return (GtkTreeView *) tree;
 }
 
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 67bdc34b46..863b870e4d 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -29,7 +29,6 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <libgnome/gnome-util.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
@@ -91,7 +90,6 @@
 #include "em-folder-view.h"
 #include "em-folder-browser.h"
 #include "em-mailer-prefs.h"
-#include "em-folder-browser.h"
 #include "em-message-browser.h"
 #include "message-list.h"
 #include "em-utils.h"
@@ -186,7 +184,6 @@ emfv_init(GObject *o)
 	EMFolderView *emfv = (EMFolderView *)o;
 	struct _EMFolderViewPrivate *p;
 	extern CamelSession *session;
-	GtkWidget *search_bar;
 	
 	gtk_box_set_homogeneous (GTK_BOX (emfv), FALSE);
 
@@ -229,9 +226,6 @@ emfv_init(GObject *o)
 	gtk_selection_add_target(p->invisible, GDK_SELECTION_PRIMARY, GDK_SELECTION_TYPE_STRING, 0);
 	gtk_selection_add_target(p->invisible, GDK_SELECTION_CLIPBOARD, GDK_SELECTION_TYPE_STRING, 1);
 
-	search_bar = em_format_html_get_search_dialog (emfv->preview);
-	gtk_box_pack_end(GTK_WIDGET (emfv), search_bar, FALSE, FALSE, 5);
-
 	emfv->async = mail_async_event_new();
 
 	emfv_setting_setup(emfv);
@@ -502,14 +496,14 @@ emfv_list_display_view(GalViewInstance *instance, GalView *view, EMFolderView *e
 static void
 emfv_setup_view_instance(EMFolderView *emfv)
 {
-	static GalViewCollection *collection = NULL;
 	struct _EMFolderViewPrivate *p = emfv->priv;
-	gboolean outgoing, show_wide;
+	gboolean outgoing;
 	char *id;
-	
+	static GalViewCollection *collection = NULL;
+
 	g_assert(emfv->folder);
 	g_assert(emfv->folder_uri);
-	
+
 	if (collection == NULL) {
 		ETableSpecification *spec;
 		GalViewFactory *factory;
@@ -555,49 +549,25 @@ emfv_setup_view_instance(EMFolderView *emfv)
 		g_object_unref(p->view_menus);
 		p->view_menus = NULL;
 	}
+
+	outgoing = em_utils_folder_is_drafts (emfv->folder, emfv->folder_uri)
+		|| em_utils_folder_is_sent (emfv->folder, emfv->folder_uri)
+		|| em_utils_folder_is_outbox (emfv->folder, emfv->folder_uri);
 	
 	/* TODO: should this go through mail-config api? */
 	id = mail_config_folder_to_safe_url (emfv->folder);
 	p->view_instance = gal_view_instance_new (collection, id);
-	
-	show_wide = gconf_client_get_bool (mail_config_get_gconf_client (), "/apps/evolution/mail/display/show_wide", NULL);
-	
-	if (show_wide) {
-		char *safe_id, *filename;
-		
-		/* Force to use the wide view */
-		g_free (p->view_instance->custom_filename);
-		g_free (p->view_instance->current_view_filename);		
-		safe_id = g_strdup (id);
-		e_filename_make_safe (safe_id);
-		filename = g_strdup_printf ("custom_wide_view-%s.xml", safe_id);
-		p->view_instance->custom_filename = g_concat_dir_and_file (collection->local_dir, filename);
-		g_free (filename);
-		filename = g_strdup_printf ("current_wide_view-%s.xml", safe_id);
-		p->view_instance->current_view_filename = g_concat_dir_and_file (collection->local_dir, filename);
-		g_free (safe_id);
-	}
 	g_free (id);
 	
-	outgoing = em_utils_folder_is_drafts (emfv->folder, emfv->folder_uri)
-		|| em_utils_folder_is_sent (emfv->folder, emfv->folder_uri)
-		|| em_utils_folder_is_outbox (emfv->folder, emfv->folder_uri);
-	
-	if (outgoing) {
-		if (show_wide)
-			gal_view_instance_set_default_view(p->view_instance, "Wide_View_Sent");
-		else
-			gal_view_instance_set_default_view(p->view_instance, "As_Sent_Folder");
-	} else if (show_wide) {
-		gal_view_instance_set_default_view(p->view_instance, "Wide_View_Normal");
-	}
+	if (outgoing)
+		gal_view_instance_set_default_view(p->view_instance, "As_Sent_Folder");
 	
 	gal_view_instance_load(p->view_instance);
 	
 	if (!gal_view_instance_exists(p->view_instance)) {
 		struct stat st;
 		char *path;
-
+		
 		path = mail_config_folder_to_cachename (emfv->folder, "et-header-");
 		if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
 			ETableSpecification *spec;
@@ -635,11 +605,6 @@ emfv_setup_view_instance(EMFolderView *emfv)
 	}
 }
 
-void em_folder_view_setup_view_instance (EMFolderView *emfv)
-{
-	emfv_setup_view_instance (emfv);
-}
-
 /* ********************************************************************** */
 
 static void
@@ -1132,7 +1097,7 @@ static EPopupItem emfv_popup_items[] = {
 	{ E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "stock_mail-open", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "stock_mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "stock_mail-priority-high", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "50.emfv.03", N_("_Mark as Unimportant"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "stock_spam", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK },
 	{ E_POPUP_ITEM, "50.emfv.05", N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, "stock_not-spam", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK },
 	{ E_POPUP_ITEM, "50.emfv.06", N_("Mark for Follo_w Up..."), emfv_popup_flag_followup, NULL, "stock_mail-flag-for-followup",  EM_POPUP_SELECT_FLAG_FOLLOWUP|EM_FOLDER_VIEW_SELECT_LISTONLY },
@@ -2457,9 +2422,6 @@ emfv_list_selection_change(ETree *tree, EMFolderView *emfv)
 static void
 emfv_format_link_clicked(EMFormatHTMLDisplay *efhd, const char *uri, EMFolderView *emfv)
 {
-	if (!strncmp (uri, "##", 2))
-		return;
-		
 	if (!g_ascii_strncasecmp (uri, "mailto:", 7)) {
 		em_utils_compose_new_message_with_mailto (uri, emfv->folder_uri);
 	} else if (*uri == '#') {
@@ -2856,8 +2818,6 @@ emfv_on_url_cb (GObject *emitter, const char *url, EMFolderView *emfv)
 			g_free(addr);
 			camel_url_free(curl);
 			camel_object_unref(cia);
-		} else if (!strncmp (url, "##", 2)) {
-			nice_url = g_strdup_printf (_("Click to hide/unhide addresses"), url);
 		} else
 			nice_url = g_strdup_printf (_("Click to open %s"), url);
 	}
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 5d9a898237..62c8ec38ee 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -736,7 +736,7 @@ emp_standard_menu_factory(EPopup *emp, void *data)
 		items = NULL;
 		len = 0;
 	}
-	
+
 	if (mime_type) {
 		apps = gnome_vfs_mime_get_all_applications(mime_type);
 		
diff --git a/mail/em-utils.c b/mail/em-utils.c
index d59d99fc00..76c817aa17 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -90,23 +90,6 @@ extern struct _CamelSession *session;
 
 #define d(x)
 
-static gboolean
-emu_file_check_local (const char *name)
-{
-	CamelURL *url;
-	gboolean local = FALSE;
-
-	url = camel_url_new (name, NULL);
-	if (url == NULL)
-		return TRUE;
-
-	if (!g_ascii_strcasecmp (url->protocol, "file")) 
-		local = TRUE;
-		
-	camel_url_free (url);
-
-	return local;
-}
 /**
  * em_utils_prompt_user:
  * @parent: parent window
@@ -391,7 +374,6 @@ emu_get_save_filesel (GtkWidget *parent, const char *title, const char *name, Gt
 					       GTK_STOCK_SAVE, GTK_RESPONSE_OK,
 					       NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
-	gtk_file_chooser_set_local_only (filesel, FALSE);
 #else
 	char *filename;
 
@@ -472,22 +454,20 @@ static void
 emu_save_part_response(GtkWidget *filesel, int response, CamelMimePart *part)
 {
 	const char *path;
-	const char *uri;
 	
 	if (response == GTK_RESPONSE_OK) {
 #ifdef USE_GTKFILECHOOSER
-		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel));
 		path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
 #else
 		path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
 #endif
-
-		if (emu_file_check_local(uri) && !emu_can_save((GtkWindow *)filesel, path))
+		
+		if (!emu_can_save((GtkWindow *)filesel, path))
 			return;
 
 		emu_update_save_path(path, FALSE);
 		/* FIXME: popup error if it fails? */
-		mail_save_part(part, uri, NULL, NULL, FALSE);
+		mail_save_part(part, path, NULL, NULL, FALSE);
 	}
 
 	gtk_widget_destroy((GtkWidget *)filesel);
@@ -532,7 +512,7 @@ emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts)
         GSList *selected;
         if (response == GTK_RESPONSE_OK) {
 #ifdef USE_GTKFILECHOOSER
-                path = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (filesel));
+                path = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (filesel));
 #else
                 path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
 #endif
@@ -647,7 +627,7 @@ emu_save_messages_response(GtkWidget *filesel, int response, struct _save_messag
 	
 	if (response == GTK_RESPONSE_OK) {
 #ifdef USE_GTKFILECHOOSER
-		path = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel));
+		path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
 #else
 		path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
 #endif
diff --git a/mail/evolution-mail.schemas.in.in b/mail/evolution-mail.schemas.in.in
index d869554de9..6179a46be7 100644
--- a/mail/evolution-mail.schemas.in.in
+++ b/mail/evolution-mail.schemas.in.in
@@ -170,20 +170,6 @@
     <!-- Display Settings -->
 
     <schema>
-      <key>/schemas/apps/evolution/mail/display/side_bar_search</key>
-      <applyto>/apps/evolution/mail/display/side_bar_search</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Enable or disable type ahead search feature</short>
-         <long>
-           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.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/evolution/mail/display/mark_citations</key>
       <applyto>/apps/evolution/mail/display/mark_citations</applyto>
       <owner>evolution-mail</owner>
@@ -318,20 +304,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/display/show_email</key>
-      <applyto>/apps/evolution/mail/display/show_email</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Show the sender email in the messages column in the message list</short>
-         <long>
-          Show the email of the sender in the messages composite column in the message list
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/evolution/mail/display/mark_seen_timeout</key>
       <applyto>/apps/evolution/mail/display/mark_seen_timeout</applyto>
       <owner>evolution-mail</owner>
@@ -388,34 +360,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/display/hpaned_size</key>
-      <applyto>/apps/evolution/mail/display/hpaned_size</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>450</default>
-      <locale name="C">
-         <short>Width of the message-list pane</short>
-         <long>
-          Width of the message-list pane.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/show_wide</key>
-      <applyto>/apps/evolution/mail/display/show_wide</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Use side-by-side or wide layout</short>
-         <long>
-	  If the &quot;Preview&quot; pane is on, then show it side-by-side rather than vertically.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/evolution/mail/display/fonts/variable</key>
       <applyto>/apps/evolution/mail/display/fonts/variable</applyto>
       <owner>evolution-mail</owner>
@@ -472,36 +416,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/display/address_compress</key>
-      <applyto>/apps/evolution/mail/display/address_compress</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Compress display of addresses in TO/CC/BCC</short>
-         <long>
-	 Compress display of addresses in TO/CC/BCC to the number 
-	 specified in address_count.
-         </long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/evolution/mail/display/address_count</key>
-      <applyto>/apps/evolution/mail/display/address_count</applyto>
-      <owner>evolution-mail</owner>
-      <type>int</type>
-      <default>5</default>
-      <locale name="C">
-         <short>Number of addresses to display in TO/CC/BCC</short>
-         <long>
-         This sets the number of addresses to show in default message list
-	 view, beyond which a '...' is shown.
-         </long>
-      </locale>
-    </schema>
-    
-    <schema>
       <key>/schemas/apps/evolution/mail/display/thread_subject</key>
       <applyto>/apps/evolution/mail/display/thread_subject</applyto>
       <owner>evolution-mail</owner>
@@ -747,20 +661,6 @@
       </locale>
     </schema>
 
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/mark_all_read</key>
-      <applyto>/apps/evolution/mail/prompts/mark_all_read</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Prompt while marking multiple messages</short>
-         <long>
-	 It disables/enables the prompt while marking multiple messages.
-         </long>
-      </locale>
-    </schema>
-    
     <!-- Trash settings -->
 
     <schema>
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 1318db581f..43e469b78b 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -618,43 +618,6 @@ view_changed_cb(EMFolderView *emfv, EComponentView *component_view)
 	g_object_set_data((GObject *)emfv, "view-changed-timeout", GINT_TO_POINTER(g_timeout_add(250, view_changed_timeout, component_view)));
 }
 
-static void 
-disable_folder_tree (gpointer *emfb, gpointer dummy,  GtkWidget *widget)
-{
-	gtk_widget_set_sensitive (widget, FALSE);
-}
-
-static void 
-enable_folder_tree (GtkWidget *emfb, gpointer dum, GtkWidget *emft)
-{
-	char *uri;
-	CamelURL *selected_curl, *current_curl;
-	CamelFolder *folder;
-	CamelException ex;
-	EMFolderView *emfv = (EMFolderView *)emfb;
-
-	/* Currently displayed folder */
-	MessageList *ml = emfv->list;
-	folder = ml->folder;
-	uri = mail_tools_folder_to_url (folder);
-	current_curl = camel_url_new (uri, NULL);
-
-	/* Selected folder in emft*/
-	uri = em_folder_tree_get_selected_uri ((EMFolderTree *) emft);
-	folder = mail_tool_uri_to_folder (uri, 0, &ex);
-	selected_curl = camel_url_new (uri, NULL);
-
-	if (!camel_url_equal (selected_curl, current_curl)) 
- 		g_signal_emit_by_name (emft, "folder-selected", emft, uri, folder->full_name, uri, folder->folder_flags); 
-
-	gtk_widget_set_sensitive (emft, TRUE);
-
-	camel_url_free (current_curl);
-	camel_url_free (selected_curl);
-	g_free (uri);
-
-}
-
 /* Evolution::Component CORBA methods.  */
 
 static GNOME_Evolution_ComponentView
@@ -713,12 +676,9 @@ impl_createView (PortableServer_Servant servant,
 			       e_user_creatable_items_handler_new("mail", create_local_item_cb, tree_widget),
 			       (GDestroyNotify)g_object_unref);
 
-
 	g_signal_connect (component_view->view_control, "activate", G_CALLBACK (view_control_activate_cb), view_widget);
 	g_signal_connect (tree_widget, "folder-selected", G_CALLBACK (folder_selected_cb), view_widget);
 
-	g_signal_connect((EMFolderBrowser *)view_widget, "account_search_cleared", G_CALLBACK (enable_folder_tree), tree_widget);
-	g_signal_connect(((EMFolderBrowser *)view_widget), "account_search_activated", G_CALLBACK (disable_folder_tree), tree_widget);
 	g_signal_connect(view_widget, "changed", G_CALLBACK(view_changed_cb), component_view);
 	g_signal_connect(view_widget, "loaded", G_CALLBACK(view_changed_cb), component_view);
 	
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index d881a47ad0..0bc636486f 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -88,7 +88,7 @@ Many email systems add an Apparently-To header to messages that only have BCC re
     <secondary>{1}</secondary>
   </error>
 
-  <error id="async-error-nodescribe" type="error" scroll="yes">
+  <error id="async-error-nodescribe" type="error">
     <_primary>Error while performing operation.</_primary>
     <secondary>{0}</secondary>
   </error>
@@ -167,12 +167,12 @@ Many email systems add an Apparently-To header to messages that only have BCC re
 
   <error id="no-delete-special-folder" type="error">
     <_primary>Cannot delete system folder &quot;{0}&quot;.</_primary>
-    <_secondary xml:space="preserve">System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
+    <_secondary xml:space="preserve">System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
   </error>
 
   <error id="no-rename-special-folder" type="error">
     <_primary>Cannot rename or move system folder &quot;{0}&quot;.</_primary>
-    <_secondary xml:space="preserve">System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
+    <_secondary xml:space="preserve">System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
   </error>
 
   <error id="ask-delete-folder" type="question" default="GTK_RESPONSE_CANCEL">
@@ -362,10 +362,11 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
 
   <error id="ask-mark-read" type="question" default="GTK_RESPONSE_NO">
     <_title>Mark all messages as read</_title>
-    <_primary>Mark all messages in subfolders as read?</_primary>
+    <_primary>Mark all messages as read in the selected folder</_primary>
     <_secondary xml:space="preserve">Do you want the operation to be performed in the subfolders?</_secondary>
-    <button stock="gtk-no" _label="_Do not Mark as Read" response="GTK_RESPONSE_NO"/>
-    <button stock="gtk-yes" _label="Mark as _Read" response="GTK_RESPONSE_YES"/>
+    <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>   
+    <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-mark-all-read" type="question" default="GTK_RESPONSE_NO">
diff --git a/mail/message-list.c b/mail/message-list.c
index 55c74eeafa..d295fc06af 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -56,13 +56,11 @@
 #include "misc/e-gui-utils.h"
 
 #include "table/e-cell-checkbox.h"
-#include "table/e-cell-hbox.h"
 #include "table/e-cell-date.h"
 #include "table/e-cell-size.h"
 #include "table/e-cell-text.h"
 #include "table/e-cell-toggle.h"
 #include "table/e-cell-tree.h"
-#include "table/e-cell-vbox.h"
 #include "table/e-tree-memory-callbacks.h"
 #include "table/e-tree-memory.h"
 
@@ -95,7 +93,7 @@
 #define localtime_r(tp,tmp) (localtime(tp)?(*(tmp)=*localtime(tp),(tmp)):0)
 #endif
 
-#define d(x) 
+#define d(x)
 #define t(x)
 
 struct _MLSelection {
@@ -160,8 +158,6 @@ static GtkTargetEntry ml_drop_types[] = {
 #define COL_TO_WIDTH_MIN       (32)
 #define COL_SIZE_EXPANSION     (6.0)
 #define COL_SIZE_WIDTH_MIN     (32)
-#define COL_SENDER_EXPANSION     (24.0)
-#define COL_SENDER_WIDTH_MIN     (32)
 
 enum {
 	NORMALISED_SUBJECT,
@@ -902,13 +898,10 @@ ml_duplicate_value (ETreeModel *etm, int col, const void *value, void *data)
 	case COL_FROM:
 	case COL_SUBJECT:
 	case COL_TO:
-	case COL_SENDER:
-	case COL_RECIPIENTS:
-	case COL_MIXED_SENDER:
-	case COL_MIXED_RECIPIENTS:		
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
 		return g_strdup (value);
+		
 	default:
 		g_assert_not_reached ();
 	}
@@ -937,10 +930,6 @@ ml_free_value (ETreeModel *etm, int col, void *value, void *data)
 	case COL_TO:
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
-	case COL_SENDER:
-	case COL_RECIPIENTS:
-	case COL_MIXED_SENDER:
-	case COL_MIXED_RECIPIENTS:				
 		g_free (value);
 		break;
 	default:
@@ -970,10 +959,6 @@ ml_initialize_value (ETreeModel *etm, int col, void *data)
 	case COL_TO:
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
-	case COL_SENDER:
-	case COL_RECIPIENTS:
-	case COL_MIXED_SENDER:
-	case COL_MIXED_RECIPIENTS:				
 		return g_strdup ("");
 	default:
 		g_assert_not_reached ();
@@ -1004,10 +989,6 @@ ml_value_is_empty (ETreeModel *etm, int col, const void *value, void *data)
 	case COL_TO:
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
-	case COL_SENDER:
-	case COL_RECIPIENTS:
-	case COL_MIXED_SENDER:
-	case COL_MIXED_RECIPIENTS:				
 		return !(value && *(char *)value);
 	default:
 		g_assert_not_reached ();
@@ -1072,10 +1053,6 @@ ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data)
 	case COL_TO:
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
-	case COL_SENDER:
-	case COL_RECIPIENTS:
-	case COL_MIXED_SENDER:
-	case COL_MIXED_RECIPIENTS:				
 		return g_strdup (value);
 	default:
 		g_assert_not_reached ();
@@ -1163,61 +1140,14 @@ subtree_earliest(MessageList *ml, ETreePath node, int sent)
 	return earliest;
 }
 
-static gchar *
-sanitize_recipients (const gchar *string)
-{
-	GString     *gstring;
-	gboolean     quoted = FALSE;
-	const gchar *p;
-	GString *recipients = g_string_new ("");
-	char *single_add;
-	char **name;
-
-	if (!string || !*string)
-		return "";
-	
-	gstring = g_string_new ("");
-
-	for (p = string; *p; p = g_utf8_next_char (p)) {
-		gunichar c = g_utf8_get_char (p);
-
-		if (c == '"')
-			quoted = ~quoted;
-		else if (c == ',' && !quoted) {
-			single_add = g_string_free (gstring, FALSE);
-			name = g_strsplit(single_add,"<",2);
-			g_string_append (recipients, *name);
-			g_string_append (recipients, ",");
-			g_free (single_add);
-			g_strfreev (name);
-			gstring = g_string_new ("");
-			continue;
-		}
-
-		g_string_append_unichar (gstring, c);
-	}
-
-	single_add = g_string_free (gstring, FALSE);
-	name = g_strsplit(single_add,"<",2);
-	g_string_append (recipients, *name);
-	g_free (single_add);
-	g_strfreev (name);
-
-	return g_string_free (recipients, FALSE);
-}
-
 static void *
 ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
 {
 	MessageList *message_list = model_data;
 	CamelMessageInfo *msg_info;
-	CamelException ex;
-
 	const char *str;
 	guint32 flags;
 
-	camel_exception_init (&ex);
-
 	if (e_tree_model_node_is_root (etm, path))
 		return NULL;
 	
@@ -1348,11 +1278,8 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
 		return (void *) colour;
 	}
 	case COL_LOCATION: {
-		/* Fixme : freeing memory stuff (mem leaks) */
 		CamelFolder *folder;
-		CamelURL *curl;
-		EAccount *account;
-		char *location, *euri, *url;
+		char *name;
 		
 		if (CAMEL_IS_VEE_FOLDER(message_list->folder)) {
 			folder = camel_vee_folder_get_location((CamelVeeFolder *)message_list->folder, (CamelVeeMessageInfo *)msg_info, NULL);
@@ -1360,47 +1287,10 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
 			folder = message_list->folder;
 		}
 		
- 		url = mail_tools_folder_to_url (folder);
- 		euri = em_uri_from_camel(url);
- 
- 		account = mail_config_get_account_by_source_url (url);
- 
- 		if (account) {
- 			curl = camel_url_new (url, &ex); 
- 			location = g_strconcat (account->name, ":", curl->path, NULL);
- 		} else {
- 			/* Local account */
- 			euri = em_uri_from_camel(url);
- 			curl = camel_url_new (euri, &ex); 
- 			if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local")) 
- 				location = g_strconcat ("On This Computer", ":",curl->path, NULL);
- 		}
- 
- 		camel_exception_clear (&ex);
- 		g_free (url);
- 		g_free (euri);
- 
- 		return location;
-	}
-	case COL_MIXED_RECIPIENTS:				
-	case COL_RECIPIENTS:{
-		char **sender_name;
-        	str = camel_message_info_to (msg_info);
-		
-		return sanitize_recipients(str);
-	}
-	case COL_MIXED_SENDER:		
-	case COL_SENDER:{
-		char **sender_name = NULL;
-        	str = camel_message_info_from (msg_info);
-	        if(str!=""){
-			sender_name=g_strsplit(str,"<",2);
-			return (void *)(*sender_name);
-		}
-		else
-			return (void *)("");		
+		camel_object_get(folder, NULL, CAMEL_OBJECT_DESCRIPTION, &name, 0);
+		return name;
 	}
- 	default:
+	default:
 		g_assert_not_reached ();
 		return NULL;
 	}
@@ -1500,66 +1390,6 @@ filter_date (time_t date)
 	return g_strdup (buf);
 }
 
-static ECell * create_composite_cell (int col)
-{
-	ECell *cell_vbox, *cell_hbox, *cell_sub, *cell_date, *cell_from, *cell_tree, *cell_attach;
-	GdkPixbuf *images [7];
-	GConfClient *gconf;
-	char *fixed_name = NULL;
-	gboolean show_email;
-	int i;
-	int alt_col = (col == COL_FROM) ? COL_SENDER : COL_RECIPIENTS;
-	
-	gconf = mail_config_get_gconf_client ();
-	fixed_name = gconf_client_get_string (gconf, "/desktop/gnome/interface/monospace_font_name", NULL);
-	show_email = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_email", NULL);
-	
-	cell_vbox = e_cell_vbox_new ();
-
-	cell_hbox = e_cell_hbox_new ();
-	
-	for (i = 0; i < 2; i++)
-		images [i] = states_pixmaps [i + 5].pixbuf;	
-	cell_attach = e_cell_toggle_new (0, 2, images);
-	
-	cell_date = e_cell_date_new(NULL, GTK_JUSTIFY_RIGHT);
-	g_object_set (G_OBJECT (cell_date),
-		      "bold_column", COL_UNREAD,
-		      "color_column", COL_COLOUR,
-		      NULL);
-
-	cell_from = e_cell_text_new(NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell_from),
-		      "bold_column", COL_UNREAD,
-		      "color_column", COL_COLOUR,
-		      NULL);
-	
-	e_cell_hbox_append (cell_hbox, cell_from, show_email ? col : alt_col, 68);
-	e_cell_hbox_append (cell_hbox, cell_attach, COL_ATTACHMENT, 5);
-	e_cell_hbox_append (cell_hbox, cell_date, COL_SENT, 27);
-	
-	cell_sub = e_cell_text_new(fixed_name? fixed_name:NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell_sub),
-/* 		      "bold_column", COL_UNREAD, */
-		      "color_column", COL_COLOUR,
-		      NULL);	
-	cell_tree = e_cell_tree_new (NULL, NULL, TRUE, cell_sub);
-	e_cell_vbox_append (cell_vbox, cell_hbox, COL_FROM);
-	e_cell_vbox_append (cell_vbox, cell_tree, COL_SUBJECT);
-
-	g_object_set_data (cell_vbox, "cell_date", cell_date);
-	g_object_set_data (cell_vbox, "cell_sub", cell_sub);
-	g_object_set_data (cell_vbox, "cell_from", cell_from);
-	return cell_vbox;
-}
-
-static void
-composite_cell_set_strike_col (ECell *cell, int col)
-{
-	g_object_set (g_object_get_data(cell, "cell_date"),  "strikeout_column", col, NULL);
-	g_object_set (g_object_get_data(cell, "cell_from"),  "strikeout_column", col, NULL);	
-}
-	
 static ETableExtras *
 message_list_create_extras (void)
 {
@@ -1567,7 +1397,7 @@ message_list_create_extras (void)
 	GdkPixbuf *images [7];
 	ETableExtras *extras;
 	ECell *cell;
-
+	
 	extras = e_table_extras_new ();
 	e_table_extras_add_pixbuf (extras, "status", states_pixmaps [0].pixbuf);
 	e_table_extras_add_pixbuf (extras, "score", states_pixmaps [13].pixbuf);
@@ -1627,13 +1457,6 @@ message_list_create_extras (void)
 		      NULL);
 	e_table_extras_add_cell (extras, "render_size", cell);
 
-	/* Composite cell for wide view */
-	cell = create_composite_cell (COL_FROM);
-	e_table_extras_add_cell (extras, "render_composite_from", cell);
-	
-	cell = create_composite_cell (COL_TO);
-	e_table_extras_add_cell (extras, "render_composite_to", cell);	
-	
 	return extras;
 }
 
@@ -1701,7 +1524,7 @@ message_list_setup_etree (MessageList *message_list, gboolean outgoing)
 		
 		path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
 		g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", 1);
-
+		
 		if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
 			/* build based on saved file */
 			e_tree_load_expanded_state (message_list->tree, path);
@@ -3062,12 +2885,6 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const c
 		
 		cell = e_table_extras_get_cell (message_list->extras, "render_size");
 		g_object_set (cell, "strikeout_column", strikeout_col, NULL);
-
-		cell = e_table_extras_get_cell (message_list->extras, "render_composite_from");		
-		composite_cell_set_strike_col (cell, strikeout_col);
-
-		cell = e_table_extras_get_cell (message_list->extras, "render_composite_to");		
-		composite_cell_set_strike_col (cell, strikeout_col);
 		
 		/* Build the etree suitable for this folder */
 		message_list_setup_etree (message_list, outgoing);
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 92a5b377e7..c4df7281a4 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,9 +1,3 @@
-2006-07-18  Ross Burton  <ross@openedhand.com>
-
-	* gaimbuddies.c:
-	Fix for EContactPhoto change.  Partially fixed by Hiroyuki Ikezoe
-	<poincare@ikezoe.net>, rest by me.  (#347870)
-
 2006-07-12  Andre Klapper  <a9016009@gmx.de>
 
 	* bbdb.c: Marking two strings for translation that were accidentally
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index e20b955c63..002c691472 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,102 +1,50 @@
-2006-07-24  Sushma Rai  <rsushma@novell.com>
-
-	* exchange-folder-subscription.c (subscribe_to_folder): Handling the 
-	errors EXCHANGE_ACCOUNT_FOLDER_GC_NOTREACHABLE and 
-	EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER.
-
-	* org-gnome-exchange-operations.error.xml: Added an error code 
-	folder-no-gc-error and corresponding error string. Fixes #234359. 
-
-2006-07-22  Sushma Rai  <rsushma@novell.com>
-
-	* exchange-folder-subscription.c (subscribe_to_folder): Checking if a 
-	user is subscribing to his own folder. Fixes #311322.
-	Patch submitted by "Vandana Shenoy .B  <shvandana@novell.com>"
-
-2006-07-18  Andre Klapper  <a9016009@gmx.de>
-
-	* exchange-change-password.glade:
-	remove "*" from translation. Fixes bug #331147.
-
-2006-07-13  Andre Klapper  <a9016009@gmx.de>
-
-	* exchange-permissions-dialog.glade: remove empty strings from 
-	translation
-
 2006-07-07  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes bug #341369
 	* exchange-calendar.c:
 	* exchange-contacts.c: fixing a memory leak.
 
-2006-06-15  Sushma Rai  <rsushma@novell.com>
-
-	* Makefile.am: Added exchange-oof.glade to the list of glade files.
-
-	* exchange-config-listener.c (exchange_config_listener_authenticate):
-	On successful connection, checking if the OOF state is set in the 
-	server, and if it is set, asking the user if he wants to change it
-	to in-office during login. Fixes #344650.
-
 2006-06-13  Sushma Rai  <rsushma@novell.com>
 
-	* org-gnome-exchange-operations.error.xml: defined a new error code and
-	error string, for displaying in offline state.
-	
-	* exchange-folder.c (org_gnome_exchange_folder_ab_unsubscribe): Display
-	proper error in offline mode.
-	(org_gnome_exchange_folder_unsubscribe): Similar.
-	(org_gnome_exchange_folder_subscription): Similar. 
-	Fixes #344270.
-
-2006-06-07  Sushma Rai  <rsushma@novell.com>
-
-	* exchange-folder-subscription.c (create_folder_subscription_dialog): 
+	* exchange-folder-subscription.c (create_folder_subscription_dialog):
 	Disabling the OK button and added a callback to change the sensitivity.
 	(user_name_entry_changed_callback): Call-back to enable OK button, on
 	entering username. Fixes #317025.
 
 2006-05-11  Sankar P  <psankar@novell.com>
 
-	* exchange-account-setup.c: (btn_chpass_clicked):
-	Do not print the password in the terminal.
-	
+	* exchange-account-setup.c: 
+	Do not display password in the terminal
+
 2006-05-10  Sushma Rai  <rsushma@novell.com>
-	
-	* exchange-config-listener.c (account_changed): Using the HIGified
-	notification message. 
 
-	* org-gnome-exchange-operations.error.xml: Similar,
-	Fixes #302825.
+	* exchange-account-setup.c 
+	(org_gnome_exchange_show_folder_size_factory): Not showing the worng 
+	folder size 0 KB in offline mode. See #339266.
 
 2006-05-10  Sushma Rai  <rsushma@novell.com>
 
-	* exchange-account-setup.c (owa_authenticate_user): Display error
+	* exchange-account-setup.c (owa_authenticate_user): Display error 
 	message only in case of authentication failure and not on cancelling
 	authentication operation. Fixes #332131
 
 2006-04-19  Sushma Rai  <rsushma@novell.com>
 
-	* exchange-contacts.c (e_exchange_contacts_commit): Setting the
+	* exchange-contacts.c (e_exchange_contacts_commit): Setting the 
 	e-source properties on both successful creation and rename of a folder.
 	
 	* exchange-calendar.c (e_exchange_calendar_commit): Similar.
 	Fixes #338876 and #328578.
 
-2006-04-19  Sushma Rai  <rsushma@novell.com>
-
-	* exchange-account-setup.c (owa_authenticate_user): Changed the 
-	function signature. Fixes #329371.
-
 2006-04-17  Sushma Rai  <rsushma@novell.com>
 
-	* exchange-contacts.c (e_exchange_contacts_check): Return TRUE in case
+	* exchange-contacts.c (e_exchange_contacts_check): Return TRUE incase
 	of non-exchange accounts.
 
-	* exchange-calendar.c (e_exchange_calendar_check): Similar. 
+	* exchange-calendar.c (e_exchange_calendar_check): Similar.
 	Fixes #338198.
 
-2006-04-10  Sushma Rai  <rsushma@novell.com>
+2006-03-10  Sushma Rai  <rsushma@novell.com>
 
 	* exchange-operations.[ch] (is_exchange_personal_folder): Added new to
 	check if a folder is a personal folder or not.
@@ -111,7 +59,7 @@
 	(e_exchange_calendar_check)(e_exchange_calendar_commit): Similar.
 	Fixes #328813 and #315522.
 
-2006-04-06  Sushma Rai  <rsushma@novell.com>
+2006-03-10  Sushma Rai  <rsushma@novell.com>
 
 	* exchange-operations.c (exchange_operations_update_child_esources):
 	Checking for ruri NULL.
@@ -119,11 +67,11 @@
 	* exchange-folder.c (org_gnome_exchange_check_address_book_subscribed):
 	Freeing uri.
 
-	* exchange-contacts.c (e_exchange_contacts_get_contacts): Defined as 
-	static. 
-	(e_exchange_contacts_pcontacts): Setting contacts_src_exists for GAL 
-	folder. 
-	(e_exchange_contacts_check): Checking for new folder creation and also 
+	* exchange-contacts.c (e_exchange_contacts_get_contacts): Defined as
+	static.
+	(e_exchange_contacts_pcontacts): Setting contacts_src_exists for GAL
+	folder.
+	(e_exchange_contacts_check): Checking for new folder creation and also
 	not allowing rename of GAL and Contacts folders.
 	(e_exchange_contacts_commit): Corrected the way relative URI was being
 	constructed during rename operation. Handling the return value of the
@@ -131,7 +79,7 @@
 
 	* exchange-calendar.c (e_exchange_calendar_get_calendars): Defined as a
 	static function.
-	(e_exchange_calendar_check): Not allowing the rename of standard 
+	(e_exchange_calendar_check): Not allowing the rename of standard
 	calendar and tasks folders.
 	(e_exchange_calendar_commit): Corrected the way relative URI was being
 	formed during rename operation. Also, handling the return value of the
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 80f9ef2dd6..4490dafe77 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -461,7 +461,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 		exchange_params->is_ntlm = TRUE;
 	else
 		exchange_params->is_ntlm = FALSE;
-	valid =  e2k_validate_user (owa_url, &url->user, exchange_params, 
+	valid =  e2k_validate_user (owa_url, url->user, exchange_params, 
 						&remember_password, &result);
 
 	if (!valid && result != E2K_AUTOCONFIG_CANCELLED)
@@ -928,6 +928,7 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 	GtkVBox *vbx;
 	GtkHBox *hbx_size;
 	char *folder_name, *folder_size;
+	int mode;
 
 	service = CAMEL_SERVICE (camel_folder_get_parent_store (cml_folder));
 	if (!service)
@@ -939,11 +940,16 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 
 	if (g_ascii_strcasecmp (provider->protocol, "exchange"))
 		return NULL;
+
+	account = exchange_operations_get_exchange_account ();
+	exchange_account_is_offline (account, &mode);
+	if (mode == OFFLINE_MODE)
+		return NULL;
 	
 	folder_name = (char*) camel_folder_get_name (cml_folder);
 	if (!folder_name)
 		folder_name = g_strdup ("name");
-	account = exchange_operations_get_exchange_account ();
+
 	model = exchange_account_folder_size_get_model (account);
 	if (model)
 		folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, folder_name));
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 19f84d1cdc..122366d9fb 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -189,7 +189,6 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 {
 	SubscriptionInfo *subscription_info = data;
 	gchar *user_email_address = NULL, *folder_name = NULL, *path = NULL;
-	char *subscriber_email;
 	EFolder *folder = NULL;
 	EDestinationStore *destination_store;
 	GList *destinations;
@@ -214,18 +213,6 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 			if (user_email_address != NULL && *user_email_address != '\0')
 				break;
 
-			/* check if user is trying to subscribe to his own folder */
-			subscriber_email = exchange_account_get_email_id (subscription_info->account);
-			if (subscriber_email != NULL && *subscriber_email != '\0') {
-				if (g_str_equal (subscriber_email, user_email_address)) {
-					e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL);
-					g_free (user_email_address);
-					gtk_widget_destroy (dialog);
-					destroy_subscription_info (subscription_info);
-					return;
-				}
-			}
-
 			/* It would be nice to insensitivize the OK button appropriately 
 		   	instead of doing this, but unfortunately we can't do this for the
 		   	Bonobo control.  */
@@ -259,12 +246,6 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 				case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION:
 					e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL);
 					break;
-				case EXCHANGE_ACCOUNT_FOLDER_GC_NOTREACHABLE:
-					e_error_run (NULL, ERROR_DOMAIN ":folder-no-gc-error", NULL);
-					break;
-				case EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER:
-					e_error_run (NULL, ERROR_DOMAIN ":no-user-error", user_email_address, NULL);
-					break;
 				case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 					e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
 					break;
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index ccdbec2841..5ff5a2ba42 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -446,7 +446,12 @@ org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 		g_warning ("Config listener not found");
 		return;
 	} else if (mode == OFFLINE_MODE) {
-		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
+		g_warning ("Unsubscribe to Other User's Folder is not allowed in Offline mode\n");
+		/* FIXME:
+		   I think throwing an error dialog is not allowed
+		   because of UI freeze.
+		   e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL);
+		*/
 		return;
 	}	
 
@@ -501,7 +506,12 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 		g_warning ("Config listener not found");
 		return;
 	} else if (mode == OFFLINE_MODE) {
-		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
+		g_warning ("Unsubscribe to Other User's Folder is not allowed in Offline mode\n");
+		/* FIXME:
+		   I think throwing an error dialog is not allowed 
+		   because of UI freeze.
+		   e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL);
+		*/
 		return;
 	}	
 
@@ -552,11 +562,12 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
 		return;
 	}	
 	else if (mode == OFFLINE_MODE) {
-		/* Translators: this error code can be used for any operation 
-		 * (like subscribing to other user's folders, unsubscribing 
-		 * etc,) which can not be performed in offline mode 
-		 */
-		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
+		g_warning ("Subscribe to Other User's Folder is not allowed in Offline mode\n");
+		/* FIXME:
+		   I think throwing an error dialog is not allowed 
+		   because of UI freeze.
+		   e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL);
+		*/
 		return;
 	}	
 
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 0bcac58c2d..695167f58e 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,21 +1,8 @@
-2006-07-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* camel-gw-listener.c: (add_calendar_tasks_sources),
-	(remove_calendar_tasks_sources), (add_proxy_sources),
-	(account_changed): Added support Gw notes.
-
 2006-04-19  Harish Krishnaswamy  <kharish@novell.com>
 
 	* camel-gw-listener.c: (add_esource):
 	Add default color to the GW source created.
 	Fixes #167102 (bugzilla.novell.com).
- 
-2006-03-11  Sushma Rai  <rsushma@novell.com>
-
-	* camel-gw-listener.c (get_addressbook_names_from_server): If use_ssl
-	parameter is found use https, otherwise use http.
-	Asking for password thrice on failure. Also freeing password key.
-	(account_changed): Checking for NULL old ssl paramter. Fixes a crash.
 
 2006-01-06  Simon Zheng <simon.zheng@sun.com>
 
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index f9622d15ac..27f83a8993 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -159,10 +159,8 @@ lookup_account_info (const char *key)
 
 #define CALENDAR_SOURCES "/apps/evolution/calendar/sources"
 #define TASKS_SOURCES "/apps/evolution/tasks/sources"
-#define NOTES_SOURCES "/apps/evolution/memos/sources"
 #define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars"
 #define SELECTED_TASKS   "/apps/evolution/calendar/tasks/selected_tasks"
-#define SELECTED_NOTES   "/apps/evolution/calendar/memos/selected_memos"
 
 static void
 add_esource (const char *conf_key, const char *group_name,  const char *source_name, CamelURL *url)
@@ -387,7 +385,6 @@ add_calendar_tasks_sources (GwAccountInfo *info)
 	url = camel_url_new (info->source_url, NULL);
 	add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url);
 	add_esource ("/apps/evolution/tasks/sources", info->name, _("Tasks"), url);
-	add_esource ("/apps/evolution/memos/sources", info->name, _("Notes"), url);
 	
 	camel_url_free (url);
 
@@ -418,8 +415,6 @@ remove_calendar_tasks_sources (GwAccountInfo *info)
 	relative_uri =  g_strdup_printf ("%s@%s/", url->user, poa_address);
 	remove_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), relative_uri);
 	remove_esource ("/apps/evolution/tasks/sources", info->name,  _("Checklist"), relative_uri);
-	remove_esource ("/apps/evolution/memos/sources", info->name,  _("Notes"), relative_uri);
-	
 	camel_url_free (url);
 	g_free (relative_uri);
 
@@ -431,8 +426,8 @@ get_addressbook_names_from_server (char *source_url)
   	char *key;
         EGwConnection *cnc;	
 	char *password;
-	GList *book_list = NULL;
-	int status, count = 0;
+	GList *book_list;
+	int status;
 	const char *soap_port;
 	CamelURL *url;
 	gboolean remember;
@@ -456,18 +451,18 @@ get_addressbook_names_from_server (char *source_url)
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
+	if (!use_ssl)
+		use_ssl = "";
 
 	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
 	
-	if (use_ssl && g_str_equal (use_ssl, "always"))
+	if (!g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
 	else 
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
 	
 	cnc = NULL;
-
 	do {
-		count ++;
 		/*we have to uncache the password before prompting again*/
 		if (failed_auth) {
 			e_passwords_forget_password ("Groupwise", key);
@@ -488,27 +483,27 @@ get_addressbook_names_from_server (char *source_url)
 			if (!password) 
 				break;
 		}
-
 		cnc = e_gw_connection_new (uri, url->user, password);
-		g_free (password);
-		if (!E_IS_GW_CONNECTION(cnc)) {
-			if (count == 3)
-				break;
+		if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) {
+			char *http_uri = g_strconcat ("http://", uri + 8, NULL);
+			cnc = e_gw_connection_new (http_uri, url->user, password);
+			g_free (http_uri);
 		}
 
+		g_free (password);
+
 		failed_auth = _("Failed to authenticate.\n");
 		flags |= E_PASSWORDS_REPROMPT;
 	} while (cnc == NULL);
-
-	g_free (key);
 	
 	if (E_IS_GW_CONNECTION(cnc))  {
 		book_list = NULL;	
 		status = e_gw_connection_get_address_book_list (cnc, &book_list);
 		if (status == E_GW_CONNECTION_STATUS_OK)
 			return book_list;
+	    
+		       
 	}
-
 	/*FIXME: This error message should be relocated to addressbook and should reflect 
 	 * that it actually failed to get the addressbooks*/
 	e_error_run (NULL, "mail:gw-accountsetup-error", poa_address, NULL);
@@ -597,7 +592,6 @@ add_proxy_sources (GwAccountInfo *info, const char *parent_name)
 	url = camel_url_new (info->source_url, NULL);
 	add_proxy_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url, parent_name);
 	add_proxy_esource ("/apps/evolution/tasks/sources", info->name, _("Tasks"), url, parent_name);
-	add_proxy_esource ("/apps/evolution/memos/sources", info->name, _("Notes"), url, parent_name);
 	
 	camel_url_free (url);
 }
@@ -680,7 +674,7 @@ add_addressbook_sources (EAccount *account)
 		g_object_unref (source);
 	}
 	e_source_list_add_group (list, group, -1);
-	e_source_list_sync (list, NULL);
+      	e_source_list_sync (list, NULL);	
 	g_object_unref (group);
 	g_object_unref (list);
 	g_object_unref (client);
@@ -945,8 +939,7 @@ account_changed (EAccountList *account_listener, EAccount *account)
 
 		if ((old_poa_address && strcmp (old_poa_address, new_poa_address))
 		   ||  (old_soap_port && strcmp (old_soap_port, new_soap_port)) 
-		   ||  strcmp (old_url->user, new_url->user)
-	           || (!old_use_ssl) 
+		   ||  strcmp (old_url->user, new_url->user) 
 		   || strcmp (old_use_ssl, new_use_ssl)) {
 			
 			account_removed (account_listener, account);
@@ -955,7 +948,6 @@ account_changed (EAccountList *account_listener, EAccount *account)
 			
 			modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, new_url);
 			modify_esource ("/apps/evolution/tasks/sources", existing_account_info, account->name,  new_url);
-			modify_esource ("/apps/evolution/memos/sources", existing_account_info, account->name,  new_url);
 			modify_addressbook_sources (account, existing_account_info);
 			
 		}
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index af8f6ab5bc..8ffa6188db 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,45 +1,20 @@
-2006-07-18  Andre Klapper  <a9016009@gmx.de>
-
-	* properties.glade: remove "*" from translation. Fixes bug #331147.
-
-2006-07-17  Sankar P  <psankar@novell.com>
-
-	* mail-retract.c: (retract_mail_settings)
-	Made the success message translatable and fixed a typo.
-	
-2006-07-17  Sankar P  <psankar@novell.com>
-
-	* mail-send-options.c: (feed_input_data)
-	* mail-send-options.h:
-	Added support for X_SEND_OPT_SECURITY
-	
-2006-07-17  Sankar P  <psankar@novell.com>
-
-	* Added support for GroupWise Message Retract
-	* Files added: mail-retract.c, org-gnome-mail-retract-errors.xml
-	* Files modified: org-gnome-groupwise-features.eplug.xml, Makefile.am
-	
 2006-06-29  Andre Klapper  <a9016009@gmx.de>
 
 	* proxy-login.c: add translator comments to the string "Proxy 
 	login". Fixes bug #345055.
 
-2006-06-12  Sankar P  <psankar@novell.com>
-
-	* proxy-login.c: org-gnome-proxy-login-errors.xml:
-	Handled error case to not allow proxy login to the same account 
-	more than once. Fixes #340535
+2006-05-26  Sankar P  <psankar@novell.com>
 
+	* org-gnome-proxy-login-errors.xml:
+	proxy-login.c: 
+	Dont allow the same user to be proxied twice.
+	Fixes #340535
+	
 2006-05-31  David Richards  <drichard@largo.com>
 
 	* proxy-login-dialog.glade:
 	Increases the height of the dialog to make it easily usable
 	
-2006-04-24  Sankar P  <psankar@novell.com>
-
-	* org-gnome-proxy-login-errors.xml:
-	Changed the ; in the end to a . in an error message
-
 2006-03-01  Sankar P  <psankar@novell.com>
 
 	* proxy-login.c: (proxy_get_password) 
diff --git a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
index 69b3cd562d..8299b4f68b 100644
--- a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
+++ b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
@@ -3,7 +3,7 @@
 <error id="invalid-user" type="error">
 <primary>Invalid user</primary>
 <secondary>
-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 Email Id and try again; 
 </secondary>
 </error>
 
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 02e5e196fa..b7825ba7b7 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,42 +1,25 @@
-2006-07-22  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* itip-formatter.c: (cal_opened_cb), (source_selected_cb),
-	(find_cal_opened_cb), (extract_itip_data), (view_response_cb),
-	(format_itip_object):
-	* itip-view.c: (set_journal_sender_text), (set_sender_text),
-	(set_buttons), (itip_view_set_source_list),
-	(itip_view_get_rsvp_comment), (itip_view_set_needs_decline):
-	* itip-view.h: Added support shared Memos.
-
-2006-07-06  Harish Krishnaswamy  <kharish@novell.com>
+2006-07-31  Harish Krishnaswamy  <kharish@novell.com>
 
 	* itip-formatter.c: (format_itip_object):
 	Handle ICAL_X methods from Microsoft Live as 
 	request methods.
 
-2006-06-19  Harish Krishnaswamy  <kharish@novell.com>
-
-	* itip-formatter.c (update_item):
-	Free GSList and its data after calling 
-	e_cal_component_get_attachment_list.
-
-2006-06-16  Sankar P  <psankar@novell.com>
-
-	* itip-formatter.c: (view_response_cb):
-	Deletes a GroupWise appointment if accepted or deleted.
-		
-2006-06-16  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #179774 (b.n.c)
-	* itip-formatter.c: (cal_opened_cb), (find_cal_opened_cb):
-	Reset the current_ecal and disable the buttons if the calendar
-	is not opened properly.
-
+2006-06-19  Sankar P  <psankar@novell.com>
+	
+	* itip-formatter.c:
+	Deletes meeting invitations for GW when they are accepted/declined.
+	
 2006-06-09  Chris Heath <chris@heathens.co.nz>
 
 	* itip-view.c (itip_view_destroy): Fix memory leak.
 	Fixes bug #335423.
 
+2006-06-07  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	Fixes #344022
+	* itip-formatter.c: (find_cal_opened_cb): Check for the
+	static capability and add the recurrence widgets.						  
+
 2006-05-31  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #340296
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index c563eb00c0..b90fc5186e 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -273,12 +273,6 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 						      ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
 						      _("Failed to load the calendar '%s'"),
 						      e_source_peek_name (source));
-		 
-		if (pitip->current_ecal == ecal) {
-			pitip->current_ecal = NULL;
-			itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
-		}
-
 		g_hash_table_remove (pitip->ecals[source_type], e_source_peek_uid (source));
 		return;
 	}
@@ -292,14 +286,7 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 			itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), FALSE);
 	}
 
-	if (pitip->type == E_CAL_SOURCE_TYPE_JOURNAL) {
-		if (e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)) 
-			itip_view_set_needs_decline (ITIP_VIEW (pitip->view), TRUE);
-		else
-			itip_view_set_needs_decline (ITIP_VIEW (pitip->view), FALSE);
-		itip_view_set_mode (ITIP_VIEW (pitip->view), ITIP_VIEW_MODE_PUBLISH);
-	}
-		
+
 	pitip->current_ecal = ecal;
 
 	set_buttons_sensitive (pitip);
@@ -362,6 +349,20 @@ source_selected_cb (ItipView *view, ESource *source, gpointer data)
 	itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
 
 	start_calendar_server (pitip, source, pitip->type, cal_opened_cb, pitip);
+
+	/* If it is a GW recurrence instance, enable the 'Apply to all
+	 * instances' option */
+	if (pitip->current_ecal && e_cal_get_static_capability (pitip->current_ecal, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) {
+		icalcomponent *icalcomp = e_cal_component_get_icalcomponent (pitip->comp);
+	
+		if (check_is_instance (icalcomp))
+			itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), TRUE);
+		else
+			itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), FALSE);
+	} else
+		itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), FALSE);
+		
+ 		
 }
 
 static void
@@ -390,11 +391,6 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 						      ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
 						      _("Failed to load the calendar '%s'"),
 						      e_source_peek_name (source));
-		if (pitip->current_ecal == ecal) {
-			pitip->current_ecal = NULL;
-			itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
-		}
-			
 		g_hash_table_remove (pitip->ecals[source_type], e_source_peek_uid (source));
 		goto cleanup;
 	}
@@ -439,25 +435,13 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		set_buttons_sensitive (pitip);
 	}
 
-	if (pitip->current_ecal) {
-		if (e_cal_get_static_capability (pitip->current_ecal, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) {
-			icalcomponent *icalcomp = e_cal_component_get_icalcomponent (pitip->comp);
-
-			if (check_is_instance (icalcomp))
-				itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), TRUE);
-			else
-				itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), FALSE);
-		}
-
-		if (pitip->type == E_CAL_SOURCE_TYPE_JOURNAL) {
-			/* TODO The static capability should be made generic to convey that the calendar contains unaccepted items */
-			if (e_cal_get_static_capability (pitip->current_ecal, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)) 
-				itip_view_set_needs_decline (ITIP_VIEW (pitip->view), TRUE);
-			else
-				itip_view_set_needs_decline (ITIP_VIEW (pitip->view), FALSE);
+	if (pitip->current_ecal && e_cal_get_static_capability (pitip->current_ecal, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) {
+		icalcomponent *icalcomp = e_cal_component_get_icalcomponent (pitip->comp);
 
-			itip_view_set_mode (ITIP_VIEW (pitip->view), ITIP_VIEW_MODE_PUBLISH);
-		}
+		if (check_is_instance (icalcomp))
+			itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), TRUE);
+		else
+			itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), FALSE);
 	}
 
  cleanup:
@@ -480,9 +464,6 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 			case E_CAL_SOURCE_TYPE_TODO:
 				uid = calendar_config_get_primary_tasks ();
 				break;
-			case E_CAL_SOURCE_TYPE_JOURNAL:
-				uid = calendar_config_get_primary_memos ();
-				break;
 			default:
 				uid = NULL;
 				g_assert_not_reached ();
@@ -804,6 +785,7 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
 		CamelMimeMessage *msg = ((EMFormat *) pitip->pobject.format)->message;
 		
 		e_cal_component_get_attachment_list (clone_comp, &attachments);
+		g_message ("Number of attachments is %d", g_slist_length (attachments));
 		
 		for (l = attachments; l; l = l->next) {
 			GSList *parts = NULL, *m;
@@ -824,6 +806,7 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
 						continue;
 
 					new_uri = em_utils_temp_save_part (NULL, part);
+					g_message ("DEBUG: the uri obtained was %s\n", new_uri);
 					new_attachments = g_slist_append (new_attachments, new_uri);
 				}
 
@@ -841,9 +824,6 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
 				new_attachments = g_slist_append (new_attachments, g_strdup (uri));
 			}
 		}
-
-		g_slist_foreach (attachments, g_free, NULL);
-		g_slist_free (attachments);
 				
 		e_cal_component_set_attachment_list (clone_comp, new_attachments);
 	}
@@ -1249,8 +1229,7 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 		kind = icalcomponent_isa (pitip->ical_comp);
 		if (kind != ICAL_VEVENT_COMPONENT
 		    && kind != ICAL_VTODO_COMPONENT
-		    && kind != ICAL_VFREEBUSY_COMPONENT
-		    && kind != ICAL_VJOURNAL_COMPONENT)
+		    && kind != ICAL_VFREEBUSY_COMPONENT)
 			pitip->ical_comp = get_next (&pitip->iter);
 	}
 
@@ -1269,9 +1248,6 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 	case ICAL_VTODO_COMPONENT:
 		pitip->type = E_CAL_SOURCE_TYPE_TODO;
 		break;
-	case ICAL_VJOURNAL_COMPONENT:
-		pitip->type = E_CAL_SOURCE_TYPE_JOURNAL;
-		break;
 	default:
 		set_itip_error (pitip, container, 
 				_("The item in the calendar is not valid"), 
@@ -1282,7 +1258,6 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 	pitip->total = icalcomponent_count_components (pitip->main_comp, ICAL_VEVENT_COMPONENT);
 	pitip->total += icalcomponent_count_components (pitip->main_comp, ICAL_VTODO_COMPONENT);
 	pitip->total += icalcomponent_count_components (pitip->main_comp, ICAL_VFREEBUSY_COMPONENT);
-	pitip->total += icalcomponent_count_components (pitip->main_comp, ICAL_VJOURNAL_COMPONENT);
 
 	if (pitip->total > 1) {
 		set_itip_error (pitip, container, 
@@ -1296,54 +1271,53 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 		pitip->current = 0;
 	}
 
-	if (icalcomponent_isa (pitip->ical_comp) != ICAL_VJOURNAL_COMPONENT) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (pitip->ical_comp));
-		my_address = itip_get_comp_attendee (comp, NULL);
-		g_object_unref (comp);
-		comp = NULL;
-
-		prop = find_attendee (pitip->ical_comp, my_address);	
-
-		if (prop) {
-			icalparameter *param;
-			const char * delfrom; 
+	
+	comp = e_cal_component_new ();
+	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (pitip->ical_comp));
+	my_address = itip_get_comp_attendee (comp, NULL);
+	g_object_unref (comp);
+	comp = NULL;
+	
+	prop = find_attendee (pitip->ical_comp, my_address);	
 
-			if ((param =icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER))) {
-				delfrom = icalparameter_get_delegatedfrom (param);
+	if (prop) {
+		icalparameter *param;
+		const char * delfrom; 
 
-				pitip->delegator_address = g_strdup (itip_strip_mailto (delfrom));
-			}
+		if ((param =icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER))) {
+			delfrom = icalparameter_get_delegatedfrom (param);
 
+			pitip->delegator_address = g_strdup (itip_strip_mailto (delfrom));
 		}
+			
+	}
 
-		/* Determine any delegate sections */
-		prop = icalcomponent_get_first_property (pitip->ical_comp, ICAL_X_PROPERTY);
-		while (prop) {
-			const char *x_name, *x_val;
-
-			x_name = icalproperty_get_x_name (prop);
-			x_val = icalproperty_get_x (prop);
+	/* Determine any delegate sections */
+	prop = icalcomponent_get_first_property (pitip->ical_comp, ICAL_X_PROPERTY);
+	while (prop) {
+		const char *x_name, *x_val;
 
-			if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-CALENDAR-UID"))
-				pitip->calendar_uid = g_strdup (x_val);
-			else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-CALENDAR-URI"))
-				g_warning (G_STRLOC ": X-EVOLUTION-DELEGATOR-CALENDAR-URI used");
-			else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-ADDRESS"))
-				pitip->delegator_address = g_strdup (x_val);
-			else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-NAME"))
-				pitip->delegator_name = g_strdup (x_val);
+		x_name = icalproperty_get_x_name (prop);
+		x_val = icalproperty_get_x (prop);
 
-			prop = icalcomponent_get_next_property (pitip->ical_comp, ICAL_X_PROPERTY);
-		}
+		if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-CALENDAR-UID"))
+			pitip->calendar_uid = g_strdup (x_val);
+		else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-CALENDAR-URI"))
+			g_warning (G_STRLOC ": X-EVOLUTION-DELEGATOR-CALENDAR-URI used");
+		else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-ADDRESS"))
+			pitip->delegator_address = g_strdup (x_val);
+		else if (!strcmp (x_name, "X-EVOLUTION-DELEGATOR-NAME"))
+			pitip->delegator_name = g_strdup (x_val);
 
-		/* Strip out alarms for security purposes */
-		alarm_iter = icalcomponent_begin_component (pitip->ical_comp, ICAL_VALARM_COMPONENT);
-		while ((alarm_comp = icalcompiter_deref (&alarm_iter)) != NULL) {
-			icalcomponent_remove_component (pitip->ical_comp, alarm_comp);
+		prop = icalcomponent_get_next_property (pitip->ical_comp, ICAL_X_PROPERTY);
+	}
 
-			icalcompiter_next (&alarm_iter);
-		}
+	/* Strip out alarms for security purposes */
+	alarm_iter = icalcomponent_begin_component (pitip->ical_comp, ICAL_VALARM_COMPONENT);
+	while ((alarm_comp = icalcompiter_deref (&alarm_iter)) != NULL) {
+		icalcomponent_remove_component (pitip->ical_comp, alarm_comp);
+		
+		icalcompiter_next (&alarm_iter);
 	}
 
 	pitip->comp = e_cal_component_new ();
@@ -1378,17 +1352,17 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 		trigger.u.rel_duration.is_neg = TRUE;
 
 		switch (units) {
-			case CAL_MINUTES:
-				trigger.u.rel_duration.minutes = interval;
-				break;
-			case CAL_HOURS:	
-				trigger.u.rel_duration.hours = interval;
-				break;
-			case CAL_DAYS:	
-				trigger.u.rel_duration.days = interval;
-				break;
-			default:
-				g_assert_not_reached ();
+		case CAL_MINUTES:
+			trigger.u.rel_duration.minutes = interval;
+			break;
+		case CAL_HOURS:	
+			trigger.u.rel_duration.hours = interval;
+			break;
+		case CAL_DAYS:	
+			trigger.u.rel_duration.days = interval;
+			break;
+		default:
+			g_assert_not_reached ();
 		}
 
 		e_cal_component_alarm_set_trigger (acomp, trigger);
@@ -1445,11 +1419,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 
 	switch (response) {
 		case ITIP_VIEW_RESPONSE_ACCEPT:
-			if (pitip->type != E_CAL_SOURCE_TYPE_JOURNAL)
-				status = change_status (pitip->ical_comp, pitip->my_address, 
+			status = change_status (pitip->ical_comp, pitip->my_address, 
 					ICAL_PARTSTAT_ACCEPTED);
-			else
-				status = TRUE;
 			if (status) {
 				e_cal_component_rescan (pitip->comp);
 				update_item (pitip, response);
@@ -1469,16 +1440,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 			}
 			break;
 		case ITIP_VIEW_RESPONSE_DECLINE:
-			if (pitip->type != E_CAL_SOURCE_TYPE_JOURNAL)
-				status = change_status (pitip->ical_comp, pitip->my_address,
+			status = change_status (pitip->ical_comp, pitip->my_address,
 					ICAL_PARTSTAT_DECLINED);
-			else {
-				prop = icalproperty_new_x ("1");	
-				icalproperty_set_x_name (prop, "X-GW-DECLINED");
-				icalcomponent_add_property (pitip->ical_comp, prop);
-				status = TRUE;
-			}
-
 			if (status) {
 				e_cal_component_rescan (pitip->comp);
 				update_item (pitip, response);
@@ -1624,7 +1587,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	GString *gstring = NULL;
 	GSList *list, *l;
 	icalcomponent *icalcomp;
-	const char *string, *org;
+	const char *string;
 	int i;
 
 	/* Accounts */
@@ -1674,9 +1637,10 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 		itip_view_set_mode (ITIP_VIEW (pitip->view), ITIP_VIEW_MODE_DECLINECOUNTER);
 		break;
 	case ICAL_METHOD_X :
-		/* Handle appointment requests from Microsoft Live. This is
-		 * a best-at-hand-now handling. Must be revisited when we have
-		 * better access to the source of such meetings */
+		/* Handle appointment requests from Microsoft
+		 * Live. This is  a best-at-hand-now handling.
+		 * Must be revisited when we have  better access 
+		 * to the source of such meetings */
 		pitip->method = ICAL_METHOD_REQUEST;
 		itip_view_set_mode (ITIP_VIEW (pitip->view), ITIP_VIEW_MODE_REQUEST);
 		break;
@@ -1698,8 +1662,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 
 		/* An organizer sent this */
 		e_cal_component_get_organizer (pitip->comp, &organizer);
-		org = organizer.cn ? organizer.cn : itip_strip_mailto (organizer.value);
-		itip_view_set_organizer (ITIP_VIEW (pitip->view), org);
+		itip_view_set_organizer (ITIP_VIEW (pitip->view), organizer.cn ? organizer.cn : itip_strip_mailto (organizer.value));
 		/* FIXME, do i need to strip the sentby somehow? Maybe with camel? */
 		itip_view_set_sentby (ITIP_VIEW (pitip->view), organizer.sentby);
 	
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 64cb01f1ef..8e272ad52b 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -123,8 +123,6 @@ struct _ItipViewPrivate {
 	
 	GtkWidget *button_box;
 	gboolean buttons_sensitive;
-
-	gboolean needs_decline;
 };
 
 /* Signal IDs */
@@ -465,49 +463,6 @@ set_tasklist_sender_text (ItipView *view)
 }
 
 static void
-set_journal_sender_text (ItipView *view)
-{
-	ItipViewPrivate *priv;
-	const char *organizer, *attendee;
-	char *sender = NULL;
-
-	priv = view->priv;
-
-	organizer = priv->organizer ? priv->organizer : _("An unknown person");
-	attendee = priv->attendee ? priv->attendee : _("An unknown person");
-	
-	switch (priv->mode) {
-	case ITIP_VIEW_MODE_PUBLISH:
-		if (priv->sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has published the following memo:"), organizer, priv->sentby);
-		else
-			sender = g_strdup_printf (_("<b>%s</b> has published the following memo:"), organizer);
-		break;
-	case ITIP_VIEW_MODE_ADD:
-		/* FIXME What text for this? */
-		if (priv->sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s wishes to add to an existing memo:"), organizer, priv->sentby);
-		else
-			sender = g_strdup_printf (_("<b>%s</b> wishes to add to an existing memo:"), organizer);
-		break;
-	case ITIP_VIEW_MODE_CANCEL:
-		if (priv->sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has canceled the following shared memo:"), organizer, priv->sentby);
-		else
-			sender = g_strdup_printf (_("<b>%s</b> has canceled the following shared memo:"), organizer);
-		break;
-	default:
-		break;
-	}
-
-	gtk_label_set_text (GTK_LABEL (priv->sender_label), sender);
-	gtk_label_set_use_markup (GTK_LABEL (priv->sender_label), TRUE);
-
-	g_free (sender);
-}
-
-
-static void
 set_sender_text (ItipView *view)
 {
 	ItipViewPrivate *priv;
@@ -521,9 +476,6 @@ set_sender_text (ItipView *view)
 	case E_CAL_SOURCE_TYPE_TODO:
 		set_tasklist_sender_text (view);
 		break;
-	case E_CAL_SOURCE_TYPE_JOURNAL:
-		set_journal_sender_text (view);
-		break;
 	default:
 		break;
 	}
@@ -755,8 +707,6 @@ set_buttons (ItipView *view)
 	switch (priv->mode) {
 	case ITIP_VIEW_MODE_PUBLISH:
 		/* FIXME Is this really the right button? */
-		if (priv->needs_decline)
-			set_one_button (view, _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
 		set_one_button (view, _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 		break;
 	case ITIP_VIEW_MODE_REQUEST:
@@ -765,10 +715,8 @@ set_buttons (ItipView *view)
 		set_one_button (view, is_recur_set ? _("_Accept all") : _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 		break;
 	case ITIP_VIEW_MODE_ADD:
-		if (priv->type != E_CAL_SOURCE_TYPE_JOURNAL) {
-			set_one_button (view, _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
-			set_one_button (view, _("_Tentative"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
-		}
+		set_one_button (view, _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
+		set_one_button (view, _("_Tentative"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
 		set_one_button (view, _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 		break;
 	case ITIP_VIEW_MODE_REFRESH:
@@ -1703,13 +1651,7 @@ itip_view_set_source_list (ItipView *view, ESourceList *source_list)
 	g_signal_connect (priv->esom, "source_selected", G_CALLBACK (source_selected_cb), view);
 
 	if (!priv->esom_header) {
-		if (priv->type == E_CAL_SOURCE_TYPE_EVENT)
-			priv->esom_header = gtk_label_new_with_mnemonic (_("_Calendar:"));
-		else if (priv->type == E_CAL_SOURCE_TYPE_TODO)
-			priv->esom_header = gtk_label_new_with_mnemonic (_("_Tasks :"));
-		else if (priv->type == E_CAL_SOURCE_TYPE_JOURNAL)
-			priv->esom_header = gtk_label_new_with_mnemonic (_("Memos :"));
-
+		priv->esom_header = gtk_label_new_with_mnemonic (_("_Calendar:"));
 		gtk_label_set_mnemonic_widget (GTK_LABEL (priv->esom_header), priv->esom);
 		gtk_widget_show (priv->esom_header);
 	}
@@ -1901,19 +1843,6 @@ itip_view_get_rsvp_comment (ItipView *view)
 }
 
 void
-itip_view_set_needs_decline (ItipView *view, gboolean needs_decline)
-{
-	ItipViewPrivate *priv;
-	
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
-	priv = view->priv;
-	
-	priv->needs_decline = needs_decline;
-}
-
-void
 itip_view_set_buttons_sensitive (ItipView *view, gboolean sensitive)
 {
 	ItipViewPrivate *priv;
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index 9932a96c1f..0f2260d4a7 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -20,7 +20,7 @@
 
 2006-03-04  Chenthill Palanisamy  <pchenthill@novell.com>
 
-	Fixes #330974, 333688.
+	Fixes #330974
 	* mail-to-task.c: 
 	(set_description): Check if the params are present,
 	before accessing the value. Fixes a crash.
diff --git a/plugins/new-mail-notify/ChangeLog b/plugins/new-mail-notify/ChangeLog
index 385c54446b..738de4a321 100644
--- a/plugins/new-mail-notify/ChangeLog
+++ b/plugins/new-mail-notify/ChangeLog
@@ -15,11 +15,12 @@
 	(send_dbus_message): remove spurious check for bus==NULL.
 
 2005-07-11  Vivek Jain  <jvivek@novell.com>
-
-	* new-mail-notify.c (send_dbus_message): check whether memory
-	could be allocated. Return if the message is NULL so that we don't
-	unref it again, will save crash.  **Fixes #274329 sort of bugs, in
-	case reported even after david's fix.
+	
+	* new-mail-notify.c :(send_dbus_message)
+	check whether memory could be allocated. Return if the 
+	message is NULL so that we don't unref it again, will save crash.
+	**Fixes #274329 sort of bugs, in case reported even after 
+	david's fix.
 
 2005-05-11  Not Zed  <NotZed@Ximian.com>
 
diff --git a/plugins/new-mail-notify/new-mail-notify.c b/plugins/new-mail-notify/new-mail-notify.c
index d2af002338..2d0f6e1699 100644
--- a/plugins/new-mail-notify/new-mail-notify.c
+++ b/plugins/new-mail-notify/new-mail-notify.c
@@ -121,7 +121,7 @@ init_dbus (void)
 	
 	dbus_error_init (&error);
 	if (!(bus = dbus_bus_get (DBUS_BUS_SESSION, &error))) {
-		g_warning ("could not get system bus: %s\n", error.message);
+		g_warning ("could not get session bus: %s\n", error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
diff --git a/plugins/save-attachments/ChangeLog b/plugins/save-attachments/ChangeLog
index a2150378c5..17aab7d2a2 100644
--- a/plugins/save-attachments/ChangeLog
+++ b/plugins/save-attachments/ChangeLog
@@ -1,16 +1,8 @@
-2006-07-07  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+2006-07-07  Hiroyuki Ikezoe  <poincare@ikezoe.net>C
 
 	** Fixes bug #341369
 	* save-attachments.c: fixing a memory leak.
 
-2006-02-28  Shi Pu <shi.pu@sun.com>
-
-	** Fixes #323853
-
-	* save-attachments.c: (save_response), (entry_changed),
-	(save_got_message):
-	replace GnomeFileEntry by GtkFileChooserButton.
-
 2005-12-17  Tor Lillqvist  <tml@novell.com>
 
 	* save-attachments.c (entry_changed): Use GLib API to manipulate
diff --git a/plugins/save-attachments/save-attachments.c b/plugins/save-attachments/save-attachments.c
index 9f28d71c30..0133a397b4 100644
--- a/plugins/save-attachments/save-attachments.c
+++ b/plugins/save-attachments/save-attachments.c
@@ -50,7 +50,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkalignment.h>
 #include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkfilechooserbutton.h>
+#include <libgnomeui/gnome-file-entry.h>
 
 #include <camel/camel-folder.h>
 #include <camel/camel-exception.h>
@@ -245,7 +245,7 @@ save_response(GtkWidget *d, int id, struct _save_data *data)
 	if (id == GTK_RESPONSE_OK) {
 		char *tmp;
 
-		data->base = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data->entry));
+		data->base = gnome_file_entry_get_full_path((GnomeFileEntry *)data->entry, FALSE);
 		data->path = g_strdup(data->base);
 		tmp = strrchr(data->path, '/');
 		if (tmp)
@@ -281,7 +281,7 @@ entry_changed(GtkWidget *entry, struct _save_data *data)
 	char *basename = NULL;
 	const char *file;
 
-	path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data->entry));
+	path = gnome_file_entry_get_full_path((GnomeFileEntry *)data->entry, FALSE);
 	if (path == NULL
 	    || G_IS_DIR_SEPARATOR (path[strlen(path)-1])
 	    || (basename = g_path_get_basename(path)) == NULL
@@ -337,13 +337,14 @@ save_got_message(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, vo
 							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 							  GTK_STOCK_SAVE, GTK_RESPONSE_OK,
 							  NULL);
-	w = gtk_file_chooser_button_new (_("Select save base name"), GTK_FILE_CHOOSER_ACTION_OPEN);
+	w = gnome_file_entry_new("save-attachments", _("Select save base name"));
 	data->entry = w;
 	g_object_set(w, "filechooser_action", GTK_FILE_CHOOSER_ACTION_SAVE, NULL);
 	gtk_widget_show(w);
 	gtk_box_pack_start((GtkBox *)dialog->vbox, w, FALSE, TRUE, 6);
 
-	g_signal_connect(GTK_FILE_CHOOSER_BUTTON (w), "selection-changed", G_CALLBACK(entry_changed), data);
+	w = gnome_file_entry_gtk_entry((GnomeFileEntry *)data->entry);
+	g_signal_connect(w, "changed", G_CALLBACK(entry_changed), data);
 
 	model = gtk_tree_store_new(5, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
 	data->model = model;
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index 3e551f391c..8f47a22bbc 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,9 +1,3 @@
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	
-	* save-calendar.c: (ask_destination_and_save): Added code to save
-	calendar to remote shares.
-
 2006-04-22 Srinivasa Ragavan <sragavan@novell.com>
 
 	* ical-format.c (do_save_calendar_ical): Ask for overwrite, if the
diff --git a/po/ChangeLog b/po/ChangeLog
index af35aaeca7..587e81e244 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,21 +1,12 @@
-2006-07-30  Christophe Merlet  <redfox@redfoxcenter.org>
+2006-07-31  Christophe Merlet  <redfox@redfoxcenter.org>
 
 	* fr.po: Updated French translation.
 
-2006-07-30  Rhys Jones  <rhys@sucs.org>
-
-	* cy.po: Updated Welsh translation.
-
-2006-07-29  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-07-28  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+2006-07-30  Christophe Merlet  <redfox@redfoxcenter.org>
 
-	* zh_TW.po: Added Traditional Chinese translation(Taiwan).
-	* zh_HK.po: Added Traditional Chinese translation(Hong Kong).
+	* fr.po: Updated French translation.
 
-2006-07-27  Francisco Javier F. Serrador  <serrador@openshine.com>
+2006-07-29  Francisco Javier F. Serrador  <serrador@openshine.com>
 
 	* es.po: Updated Spanish translation.
 
@@ -23,127 +14,26 @@
 
 	* fi.po: Updated Finnish translation.
 
-2006-07-27  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-27  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-26  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated by Tino Meinen.
-
-2006-07-25  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-07-25  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
 2006-07-25  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
 
-2006-07-24  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-24  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
 2006-07-24  Christophe Merlet  <redfox@redfoxcenter.org>
 
 	* fr.po: Updated French translation.
 
-2006-07-24  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-07-23  Žygimantas Beručka  <zygis@gnome.org>
-
-	* lt.po: Updated Lithuanian translation.
-
-2006-07-23  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-23  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-07-22  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation from
-	Jonathan Ernst <jonathan@ernstfamily.ch>.
-
-2006-07-22  Nikos Charonitakis  <nikosx@gmail.com>
-
-	* el.po: Updated Greek translation.
-
-2006-07-22  Funda Wang  <fundawang@linux.net.cn>
-
-	* zh_CN.po: Updated Simplified Chinese translation.
-
-2006-07-21  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-07-21  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-20  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-20  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-20  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-07-19  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-19  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-07-19  Raivis Dejus  <orvils@gmail.com>
+2006-07-22  Raivis Dejus  <orvils@gmail.com>
 
         * lv.po: Updated Latvian translation.
 
-2006-07-19  Kostas Papadimas <pkst@gnome.org>
-
-         * el.po: Updated Greek translation.
-
-2006-07-19  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-18  Guntupalli Karunakar  <karunakar@freedomink.org>
-
-        * dz.po: Updated Dzongkha translation by
-        Dzongkhalinux team, DIT
-
-2006-07-18  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-17  Francisco Javier F. Serrador  <serrador@openshine.com>
+2006-07-22  Christophe Merlet  <redfox@redfoxcenter.org>
 
-	* es.po: Updated Spanish translation.
+	* fr.po: Updated French translation.
+	* POTFILES.in: Updated.
 
-2006-07-17  Hendrik Richter  <hendrikr@gnome.org>
+2006-07-21  Žygimantas Beručka  <zygis@gnome.org>
 
-	* de.po: Updated German translation.
+	* lt.po: Updated Lithuanian translation.
 
 2006-07-17  Hendrik Richter  <hendrikr@gnome.org>
 
@@ -153,191 +43,14 @@
 
 	* de.po: Updated German translation.
 
-2006-07-17  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-07-17  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-16  Nikos Charonitakis  <nikosx@gmail.com>
-
-        * el.po: Updated Greek translation.
-
-2006-07-16  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-16  Daniel Nylander  <po@danielnylander.se>
-
-        * sv.po: Updated Swedish translation.
-	
-2006-07-14  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-07-14  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-07-14  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-07-12  Simos Xenitellis  <simos@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2006-07-11  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Revert some localized time fields to %H:%M 
-	  (it's not possible to enter %H.%M, see bug #347241)
-
-2006-07-11  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).
-
-2006-07-10  Priit Laes  <amd@store20.com>
+2006-07-11  Priit Laes  <amd@store20.com>
 
 	* et.po: Translation updated by Ivar Smolin.
 
-2006-07-10  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-09  Jovan Naumovski <jovan@lugola.net>
-
-	* mk.po: Updated Macedonian translation.
-
-2006-07-09  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-07-08  Nikos Charonitakis  <nikosx@gmail.com>
-
-	* el.po: Updated Greek translation.
-
-2006-07-08  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Rostislav Raykov <zbrox@i-space.org>
-
-2006-07-08  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-07  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-07-07  Priit Laes  <amd@store20.com>
-
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-07-07  Ahmad Riza H Nst  <rizahnst@eriagempita.co.id>
-
-	* id.po: Updated.
-	
-2006-07-06  Inaki Larranaga  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2006-07-06  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-06  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-05  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2006-07-05  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-04  Vincent van Adrighem  <adrighem@gnome.org>
-
-	* nl.po: Translation updated.
-
-2006-07-03  Runa Bhattacharjee <runabh@gmail.com>
-
-        * bn_IN.po: Added Bengali India Translation
-        * LINGUAS: Added Bengali India (bn_IN) to the list of languages.
-
 2006-07-03  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
 
-2006-07-03  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-07-02  Benoît Dejean  <benoit@placenet.org>
-
-	* fr.po: Updated French translation.
-
-2006-07-02  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-07-02  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
-2006-07-01  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-07-01  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2006-07-01  Pawan Chitrakar  <pchitrakar@gmail.com>
-
-	* ne.po: Updated Nepali Translation
-
-2006-07-01  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2006-06-30  I.Felix  <ifelix25@gmail.com>
-
-	* ta.po: Updated Tamil Translation.
-
-2006-06-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
-
-	* es.po: Updated Spanish translation.
-
-2006-06-29  Rajesh Ranjan <rajeshkajha@yahoo.com>
-
-        * hi.po: Updated Hindi Translation.
-
-2006-06-29  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2006-06-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-06-25  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).
-
-2006-06-24  Theppitak Karoonboonyanan  <thep@linux.thai.net>
-
-	* th.po: Updated Thai translation.
-
 2006-06-24  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
@@ -397,6 +110,10 @@
 2006-06-07  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nb.po: Updated Norwegian bokmål translation.
+	
+2006-06-06  Pawan Chitrakar  <pchitrakar@gmail.com>
+
+	* ne.po: Updated Nepali Translation	
 
 2006-06-05  Ankit Patel  <ankit644@yahoo.com>
 
@@ -409,6 +126,10 @@
 2006-06-04  Funda Wang  <fundawang@linux.net.cn>
 
 	* POTFILES.in: Removed obsolete files.
+	
+2006-06-03  Ahmad Riza H Nst  <rizahnst@eriagempita.co.id>
+
+	* id.po: Updated.	
 
 2006-05-31  Francisco Javier F. Serrador  <serrador@openshine.com>
 
@@ -425,6 +146,10 @@
 2006-05-29  Francisco Javier F. Serrador  <serrador@openshine.com>
 
 	* es.po: Updated Spanish translation.
+	
+2006-05-28  Pema Geyleg  <pema.geyleg@gmail.com>
+
+	* dz.po: Updated Dzongkha translation.	
 
 2006-05-28  Vincent van Adrighem  <adrighem@gnome.org>
 
@@ -437,7 +162,15 @@
 2006-05-27  Pema Geyleg  <pema.geyleg@gmail.com>
 
 	* dz.po: Updated Dzongkha translation.
+	
+2006-05-27  Vincent van Adrighem  <adrighem@gnome.org>
 
+	* nl.po: Translation updated.
+
+2006-05-26  Francisco Javier F. Serrador  <serrador@openshine.com>
+
+	* es.po: Updated Spanish translation.
+	
 2006-05-26  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
@@ -449,6 +182,18 @@
 2006-05-25  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
+	
+2006-05-25  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+	
+2006-05-23  Stanislav Brabec  <sbrabec@suse.cz>
+
+	* cs.po: Typo fixes.
+
+2006-05-23  Ankit Patel  <ankit644@yahoo.com>
+
+        * gu.po: Updated Gujarati Translation.	
 
 2006-05-23  Stanislav Brabec  <sbrabec@suse.cz>
 
@@ -457,6 +202,10 @@
 2006-05-23  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+2006-05-22  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.        
 
 2006-05-21  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -465,6 +214,18 @@
 2006-05-20  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated.
+	
+2006-05-19  Rhys Jones  <rhys@sucs.org>
+
+	* cy.po: Updated Welsh translation.
+
+2006-05-19  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.	
+	
+2006-05-19  Daniel Nylander  <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.		
 
 2006-05-19  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -487,6 +248,10 @@
 2006-05-18  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+2006-05-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.           
 
 2006-05-15  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -495,10 +260,27 @@
 2006-05-15  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+2006-05-14  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po Updated Greek Translation
+
+2006-05-14  Jérémy Ar Floc'h  <jeremy.lefloch@gmail.com>
+
+	* br.po: Updated Breton translation.         
 
 2006-05-11  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+2006-05-11  Christophe Fergeau  <teuf@gnome.org>
+
+	* fr.po: Translation updated by R.A Mauchin, Jonathan Ernst and
+	Stéphane Raimbault
+
+2006-05-10  Inaki Larranaga  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.          
 
 2006-05-08  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -516,6 +298,14 @@
 2006-05-05  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+ 2006-05-03  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2006-05-03  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.            
 
 2006-05-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -524,10 +314,30 @@
 2006-05-02  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+2006-05-02  Rhys Jones  <rhys@sucs.org>
+
+	* cy.po: Updated Welsh translation.
+
+2006-05-01  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2006-05-01  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.             
 
 2006-05-01  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
+	
+2006-05-01  Daniel Nylander  <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2006-04-30  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.		
 
 2006-04-30  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
@@ -536,6 +346,22 @@
 2006-04-30  Kjartan Maraas <kmaraas@gnome.org>
 
 	* nb.po: Updated Norwegian bokmål translation
+	
+2006-04-29  Priit Laes  <amd@store20.com>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2006-04-29  Josep Puigdemont Casamajó  <josep.puigdemont@gmail.com>
+
+	* ca.po: Updated Catalan translation.
+
+2006-04-28  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2006-04-27  Jérémy Ar Floc'h  <jeremy.lefloch@gmail.com>
+
+	* br.po: Updated Breton translation.		
 
 2006-04-26  Funda Wang  <fundawang@linux.net.cn>
 
@@ -560,6 +386,14 @@
 2006-04-23  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician Translation.
+	
+2006-04-23  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po Updated Swedish translation.
+
+2006-04-22  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po Updated Greek Translation		
 
 2006-04-21  David Lodge  <dave@cirt.net>
 
@@ -574,6 +408,34 @@
 
 	* bg.po: Updated Bulgarian translation by
 	Alexander Shopov <ash@contact.bg>
+	
+2006-04-21  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.	
+	
+2006-04-21  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2006-04-21  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.	
+
+2006-04-20  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+	
+2006-04-20  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2006-04-20  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2006-04-20  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.		
 
 2006-04-20  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -582,6 +444,22 @@
 2006-04-20  Josep Puigdemont Casamajó  <josep.puigdemont@gmail.com>
 
 	* ca.po: Updated Catalan translation with gnome-2-14 branch updates.
+	
+2006-04-19  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2006-04-19  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated.
+
+2006-04-19  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2006-04-19  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.	
 
 2006-04-18  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
@@ -607,6 +485,10 @@
 2006-04-14  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian Nynorsk translation.
+	
+2006-04-12  Pema Geyleg  <pema.geyleg@gmail.com>
+
+	* dz.po: Updated Dzongkha translation		
 
 2006-04-10  Ilkka Tuohela  <hile@iki.fi>
 
@@ -620,10 +502,18 @@
 2006-04-09  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
  	* cs.po: Updated Czech translation.
+ 	
+ 2006-04-08  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation by Lukas Novotny.		
 
 2006-04-08  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
 	* th.po: Updated Thai translation (merged from gnome-2-14 branch).
+	
+2006-04-05  Lukas Novotny  <lukasnov@cvs.gnome.org>
+
+	* cs.po: Updated Czech translation.		
 
 2006-04-05  Priit Laes  <amd@store20.com>
 
@@ -669,6 +559,10 @@
 2006-03-21  Gabor Kelemen  <kelemeng@gnome.hu>
 
 	* hu.po: Hungarian translation updated.
+	
+2006-03-19  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation		
 
 2006-03-18  Priit Laes  <amd@store20.com>
 
@@ -689,6 +583,23 @@
 2006-03-13  Jordi Mallach  <jordi@sindominio.net>
 
 	* ca.po: Updated Catalan translation.
+	
+2006-03-13  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2006-03-12  Benoît Dejean  <benoit@placenet.org>
+
+	* fr.po: Updated French translation.
+
+2006-03-12  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation by Petr Tomeš.
+
+2006-03-12  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po:Updated Catalan translation by
+	Gil Forcada <gilforcada@guifi.net>.		
 
 2006-03-11  Priit Laes  <amd@store20.com>
 
@@ -702,6 +613,11 @@
 
 	* ca.po: Updated Catalan translation by
 	Gil Forcada <gilforcada@guifi.net>.
+	
+2006-03-10  Guilherme de S. Pastore  <gpastore@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation from Leandro
+	  A. F. Pereira <leandro@linuxmag.com.br>.	
 
 2006-03-10  Duarte Loreto <happyguy_pt@hotmail.com>
 
@@ -711,6 +627,14 @@
 
 	* bg.po: Updated Bulgarian translation by
 	Rostislav Raykov <zbrox@i-space.org>
+	
+2006-03-10  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2006-03-10  Mugurel Tudor  <mugurelu@gnome.ro>
+
+	* ro.po: Updated Romanian translation		
 
 2006-03-10  Frank Arnold  <farnold@cvs.gnome.org>
 
@@ -739,7 +663,7 @@
 
 2006-03-06  Rajesh Ranjan <rranjan@redhat.com>
 
-        * hi.po: Updated Hindi Translation.
+	* hi.po: Updated Hindi Translation.
 
 2006-03-07  Priit Laes  <amd@store20.com>
 
@@ -747,7 +671,7 @@
 
 2006-03-06  Maxim Dziumanenko <mvd@mylinux.ua>
 
-        * uk.po: Updated Ukrainian translation.
+	* uk.po: Updated Ukrainian translation.
 
 2006-03-06  Leonid Kanter <leon@asplinux.ru>
 
@@ -776,7 +700,7 @@
 
 2006-03-03  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
 
@@ -906,7 +830,6 @@
 	* nb.po: Updated Norwegian bokmål translation.
 	* no.po: Same.
 
->>>>>>> 1.2514
 2006-02-17  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Tino Meinen.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4a40023724..90f5b9d272 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,7 +20,6 @@ a11y/e-table/gal-a11y-e-table-click-to-add.c
 a11y/e-table/gal-a11y-e-table-column-header.c
 a11y/widgets/ea-calendar-item.c
 a11y/widgets/ea-combo-button.c
-a11y/widgets/ea-expander.c
 addressbook/addressbook.error.xml
 addressbook/conduit/address-conduit.c
 addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -306,7 +305,6 @@ plugins/exchange-operations/exchange-folder.c
 plugins/exchange-operations/exchange-passwd-expiry.glade
 plugins/exchange-operations/exchange-permissions-dialog.c
 plugins/exchange-operations/exchange-permissions-dialog.glade
-plugins/exchange-operations/exchange-oof.glade
 plugins/exchange-operations/exchange-user-dialog.c
 plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml
 plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml
@@ -322,7 +320,6 @@ plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
 plugins/groupwise-features/install-shared.c
 plugins/groupwise-features/junk-mail-settings.c
 plugins/groupwise-features/junk-settings.glade
-plugins/groupwise-features/mail-retract.c
 plugins/groupwise-features/org-gnome-compose-send-options.xml
 plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
 plugins/groupwise-features/org-gnome-proxy-errors.xml
diff --git a/po/bg.po b/po/bg.po
index 34a049d7ef..4de78946c0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,14 +7,12 @@
 # Iassen Pramatarov <turin@fsa-bg.org>, 2005.
 # Alexander Shopov <ash@contact.bg>, 2006.
 #
-#: ../mail/em-format-html-display.c:679
-#: ../shell/e-user-creatable-items-handler.c:701
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution HEAD\n"
+"Project-Id-Version: evolution gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-08 13:47+0300\n"
-"PO-Revision-Date: 2006-07-08 13:31+0300\n"
+"POT-Creation-Date: 2006-05-18 09:45+0300\n"
+"PO-Revision-Date: 2006-05-18 09:50+0300\n"
 "Last-Translator: Alexander Shopov <ash@contact.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +22,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "Адресник на Evolution"
 
@@ -38,12 +36,12 @@ msgstr "Нов контакт"
 msgid "New Contact List"
 msgstr "Нов списък с контакти"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "текущата папка %s на адресника е с %d визитка"
-msgstr[1] "текущата папка %s на адресника е с %d визитки"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "текущата папка на адресника е с %d визитка"
+msgstr[1] "текущата папка на адресника е с %d визитки"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -62,32 +60,32 @@ msgstr "Контакт: "
 msgid "evolution minicard"
 msgstr "мини-карта на Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Има аларми."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Има повторения."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Това е събрание."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Събитие в календар: Обобщението е %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Събитие в календар: Няма обобщение."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "събитие за преглед на календар"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Вземане на фокус"
 
@@ -158,10 +156,8 @@ msgstr "%a %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -192,10 +188,8 @@ msgstr "%d %B %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -325,14 +319,6 @@ msgstr "Активиране на стандартните"
 msgid "Popup Menu"
 msgstr "Изскачащо меню"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Превключване на лентата за прикрепени файлове"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "активиране"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -519,7 +505,7 @@ msgid "_Discard"
 msgstr "_Отхвърляне"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -559,9 +545,9 @@ msgstr "Конфигуриране на авт. довършване"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -622,7 +608,7 @@ msgstr "На този компютър"
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Лично"
 
@@ -649,7 +635,7 @@ msgid "Create a new contact list"
 msgstr "Създаване на нов списък с контакти"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Нов адресник"
 
@@ -665,74 +651,73 @@ msgstr "Създаване на нов адресник"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Неуспех при осъвременяването на настройките или папките на адресника."
 
-#: ../addressbook/gui/component/addressbook-config.c:331
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "База"
 
-#: ../addressbook/gui/component/addressbook-config.c:532
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr ""
 "Копиране на съдържанието на адресника за локална употреба в режим „Изключен“"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../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:2021
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Основни"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Адресник"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Информация за сървъра"
 
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Удостоверяване"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Подробности"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Търсене"
 
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Изтегляне"
 
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Настройки на адресника"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Мигриране..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Мигриране на „%s“:"
@@ -808,35 +793,34 @@ msgstr "Името на папката не може да съдържа „/“
 msgid "A Folder with this name already exists"
 msgstr "Вече съществува папка с такова име."
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Нов адресник"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1279
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Изтриване"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Запазване като VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Настройки..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Избиране на контакти"
 
@@ -845,7 +829,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимен достъп до LDAP сървъра"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Неуспешно удостоверяване.\n"
 
@@ -896,7 +880,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI на папката, последно използвана в диалога за избор на име."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Разположение на вертикалния панел"
 
@@ -1220,10 +1204,12 @@ msgstr "минути"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
@@ -1273,13 +1259,13 @@ msgstr "<b>Служебен</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1288,7 +1274,7 @@ msgstr "Контакт"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Редактор на контакти"
 
@@ -1330,7 +1316,7 @@ msgstr "Телефон"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Служебен"
@@ -1353,13 +1339,15 @@ msgid "_Birthday:"
 msgstr "_Рожден ден:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Календар:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "Ка_тегории..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Категории"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1446,8 +1434,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_ZIP/пощенски код:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Адрес"
 
@@ -1455,15 +1443,15 @@ msgstr "Адрес"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2441,7 +2429,7 @@ msgstr "Зимбабве"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Име"
@@ -2452,7 +2440,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2462,7 +2450,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2471,7 +2459,7 @@ msgid "Service"
 msgstr "Услуга"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2492,17 +2480,17 @@ msgid "Other"
 msgstr "Друга"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2531,20 +2519,20 @@ msgid "Changed"
 msgstr "Променени"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2405
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Редактор на контакти - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2783
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Изберете изображение за този контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2784
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Няма изображение"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2552,31 +2540,31 @@ msgstr ""
 "Информацията на контакта е невалидна:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ е с невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ е с невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ е празен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Невалиден контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Бързо добавяне на контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "Пълно р_едактиране"
 
@@ -2584,11 +2572,11 @@ msgstr "Пълно р_едактиране"
 msgid "_Full name"
 msgstr "_Пълно име"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "_Е-поща"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "Избор на адрес_ник"
 
@@ -2596,7 +2584,7 @@ msgstr "Избор на адрес_ник"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Сигурни ли сте, че искате да\n"
 "изтриете списъка с контакти (%s)?"
@@ -2613,7 +2601,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Сигурни ли сте, че искате да\n"
 "изтриете контакта (%s)?"
@@ -2724,7 +2712,6 @@ msgid "_IM Service:"
 msgstr "Услуга за бързи съобщения:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2740,7 +2727,7 @@ msgid "Add an email to the List"
 msgstr "Добавяне на е-поща към списъка"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Редактор за контакти"
 
@@ -2772,24 +2759,24 @@ 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:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Книга"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Е нов списък"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Членове"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Членове на списъка с контакти"
 
@@ -2830,18 +2817,25 @@ msgstr ""
 "Името или пощенския адрес на този контакт вече съществува\n"
 "в тази папка. Искате ли да я добавите въпреки това?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Кое да е поле съдържа"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Категорията е"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "Електронната поща започва с"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Името започва с"
@@ -2859,9 +2853,9 @@ 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:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Заявка"
 
@@ -2883,11 +2877,11 @@ msgstr "Модел"
 msgid "Error modifying card"
 msgstr "Грешка при промяна на карта"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Източник"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
@@ -2896,96 +2890,95 @@ msgstr "Източник"
 msgid "Type"
 msgstr "Тип"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Запазване като VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1259
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Отваряне"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Нов контакт..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Нов _списък с контакти..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Запазване като VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Препращане на контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Препращане на контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Изпращане на _писмо до контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Изпращане на _писмо до списък"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Изпращане на _писмо до контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Печат"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Копиране в адресника..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "_Преместване в адресника..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Изрязване"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1267
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3125 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Копиране"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "_Поставяне"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Всяка категория"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "Печатане на карти"
 
@@ -3030,7 +3023,7 @@ msgid "Company Phone"
 msgstr "Служебен телефон"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Електронна поща"
@@ -3080,7 +3073,7 @@ msgid "Manager"
 msgstr "Мениджър"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Мобилен телефон"
 
@@ -3089,7 +3082,7 @@ msgid "Nickname"
 msgstr "Прякор"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Бележка"
 
@@ -3098,7 +3091,7 @@ msgid "Office"
 msgstr "Офис"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Организация"
 
@@ -3216,7 +3209,7 @@ msgstr "Макс. дължина на името на полето"
 msgid "Column Width"
 msgstr "Ширина на колоната"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3230,7 +3223,7 @@ msgstr ""
 "\n"
 "или натиснете два пъти с мишката тук за нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3244,7 +3237,7 @@ msgstr ""
 "\n"
 "Натиснете два пъти тук, за да създадете нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3254,7 +3247,7 @@ msgstr ""
 "\n"
 "Търсене за контакти."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3264,7 +3257,7 @@ msgstr ""
 "\n"
 "Няма обекти, които да бъдат показани в тази гледка."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Адаптер"
 
@@ -3276,89 +3269,68 @@ msgstr "Избрани"
 msgid "Has Cursor"
 msgstr "Има показалец"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Отваряне на връзката в _браузър"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "Копиране на мес_тоположението на връзката"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Изпращане на ново писмо до..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Копиране на _адреса на е-пощата"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(карта)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "карта"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Изброяване на членове"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-поща"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Позиция"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Видео разговор"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Видео конференция"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Факс"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "на работа"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Домашна страница"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
 msgstr "Блог"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "личен"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Длъжност"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Домашна страница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Блог"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3389,7 +3361,7 @@ msgstr "Не са дефинирани собствените данни"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Достъпът е отказан"
 
@@ -3414,7 +3386,7 @@ msgstr "Протоколът не се подържа"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Отменено"
 
@@ -3545,7 +3517,7 @@ 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:695
 msgid "Error adding contact"
 msgstr "Грешка при добавяне на контакт"
 
@@ -3562,7 +3534,7 @@ 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:650
 msgid "Error removing contact"
 msgstr "Грешка при премахване на контакт"
 
@@ -3581,7 +3553,7 @@ msgstr[1] ""
 "Отварянето на %d контакта ще отвори %d нови прозореца.\n"
 "Наистина ли искате показването на всички тези контакти?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3590,69 +3562,69 @@ msgstr ""
 "%s вече съществува\n"
 "Искате ли да го презапишете?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "контакт"
 msgstr[1] "контакта"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 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:756
 msgid "Move contact to"
 msgstr "Преместване на контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Копиране на контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Преместване на контакти в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Копиране на контакти в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard за %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Информация за контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Информация за %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Запитване до адресника..."
 
@@ -3742,12 +3714,12 @@ msgstr "Интерфейс за внасяне на VCard"
 msgid "Print envelope"
 msgstr "Печатане на плик"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Печатане на контакти"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Печатане на контакт"
 
@@ -3796,7 +3768,7 @@ msgstr "Формат"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Горен колонтитул"
@@ -3900,7 +3872,7 @@ msgstr "Сенки"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4140,17 +4112,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Сигурни ли сте, че искате да изтриете тази среща?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Сигурни ли сте, че искате да изтриете този запис в дневника?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Сигурни ли сте, че искате да прекъснете и изтриете това събрание?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Сигурни ли сте, че искате да изтриете тази задача?"
 
@@ -4427,8 +4396,8 @@ msgstr "Разделяне на събития, по-дълги от един д
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server не може да се стартира"
 
@@ -4462,12 +4431,12 @@ 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:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Календар и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4516,12 +4485,12 @@ 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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/exchange-operations/exchange-folder.c:592
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4541,13 +4510,13 @@ msgstr "_Задачи"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Услуга за алармите към календара на Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минути"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4559,7 +4528,7 @@ msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часове"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Начало"
 
@@ -4570,10 +4539,10 @@ msgstr "Срещи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Местоположение:"
 
@@ -4587,12 +4556,12 @@ msgstr "Време за _отлагане:"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Редактиране"
 
@@ -4604,31 +4573,32 @@ msgstr "_Отлагане"
 msgid "location of appointment"
 msgstr "място на среща"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Няма обобщение."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Няма описание."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Няма информация за местоположението."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Имате %d аларми."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4640,7 +4610,7 @@ msgstr ""
 "да изпраща поща. Вместо това, Evolution ще покаже стандартен прозорец за "
 "напомняне."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4657,7 +4627,7 @@ msgstr ""
 "\n"
 "Сигурни ли сте, че искате да стартирате тази програма?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Без запитвания за тази програма отново."
 
@@ -4758,104 +4728,92 @@ msgid "Default reminder value"
 msgstr "Единици на стандартното напомняне"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Преливка за събитие"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Прозрачност за събитие"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Адрес-УРЛ на сървър свободен/зает"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Шаблон за адрес-УРЛ свободен/зает"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Преливка за събитието в календарния изглед"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Скриване на завършените задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Скриване на единиците на задачите"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Скриване на стойността на задачата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Позиция на хоризонталния панел"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Час, в който свършва работния ден, в 24 часов формат от 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Час, в който започва работния ден, в 24 часов формат от 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Интервалите, показани в прегледите за деня или за работната седмица, в "
 "минути."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Последно време на алармиране"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Списък с адресите-УРЛ за публикуване свободен/зает."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Крива на Маркус Бейнс"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Цвят на кривата на Маркус Бейнс - изглед за деня"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Цвят на кривата на Маркус Бейнс - поле за време"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Минута, в която завършва работния ден, от 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Минута, в която започва работния ден, от 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Позиция на хоризонталния панел за месечния изглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Позицията на вертикалния панел в месечния изглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Брой единици за определяне на стандартно напомняне."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Брой единици за определяне кога да се скриват задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Цвят на просрочените задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4863,7 +4821,7 @@ msgstr ""
 "Позицията на хоризонталния панел, между навигатора за датите и списъка със "
 "задачи, когато не сте в месечния изглед; в пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4871,7 +4829,7 @@ msgstr ""
 "Позицията на хоризонталния панел, между навигатора за прегледа и датите и "
 "списъка със задачи в месечния изглед; в пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4879,7 +4837,7 @@ msgstr ""
 "Позиция на вертикалния панел, между списъка със задачи и панела за преглед "
 "на задачи, в пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4887,7 +4845,7 @@ msgstr ""
 "Позицията на вертикалния панел, между навигатора за прегледа и датата и "
 "списъка със задачи в месечния изглед; в пиксели;"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4895,67 +4853,67 @@ msgstr ""
 "Позицията на вертикалния панел, между навигатора за прегледа и датите и "
 "списъка със задачите, когато не сте в месечния изглед; в пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Програми, които могат да бъдат стартирани от аларми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Показване на полето „Моля, отговорете“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Показване на полето „Роля“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Показване на края на срещите в седмичните и месечните календарни изгледи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Показване на полето „Категория“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Показване на алармите в зоната за уведомяване"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Показване на полето „Състояние“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Показване на панела „Предварителен преглед на писмата“"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Показване на панела „Предварителен преглед на писмата“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Показване на полето „Часови пояс“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Показване на полето „Вид“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Показване номерата на седмиците при прегледа на дати"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Цвят на задачите за днес"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Разположение на вертикалния панел със задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4964,7 +4922,7 @@ msgstr ""
 "Шаблонът за адреси-УРЛ за състояние свободен/зает, %u се заменя с "
 "потребителската част от адреса на е-поща, а %d се заменя от домейна."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4972,144 +4930,136 @@ msgstr ""
 "Стандартният часови пояс за дати и време в календара, във вид на непреведена "
 "база от данни на Olsen за местоположения, например „America/New York“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Времеви разделения"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Времето на последната аларма, в time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Часови пояс"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Степен на прозрачност за събитията в календарния изглед (число в интервала "
-"0÷10, по подразбиране събитията са непрозрачни)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24 часов формат на времето"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Мерни единици в подразбиращото се напомняне - „минути“, „часове“ или „дни“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Единици за определяне кога да се скриват задачи, „минути“, „часове“ или "
 "„дни“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Начало на седмицата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ден, в който започва работната седмица, от неделя (0) до събота (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Дали да се използва зоната за уведомяване за изобразяване на аларми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Дали да пита за потвърждение при изтриване на среща или задача."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Дали да пита за потвърждение при изтриване на срещи или задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
-"Дали да се вместват почивните дни в месечния изглед, което ще изобрази "
+"Дали да се свиват почивните дни в месечния изглед, което ще изобрази "
 "съботите и неделите като един разделителен почивен ден."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Дали да се показва края на срещите в седмичните и месечните календарни "
 "изгледи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Дали да се изобразява кривата на Маркус Бейнс (в текущо време) в календара."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Дали да се скриват завършените задачи в списъка със задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Дали да бъде зададено стандартното напомняне за срещи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Дали да се показва полето „Моля, отговорете“ редактора за събития/задачи/"
 "срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Дали да се показва полето „Категория“ в редактора за събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Дали да се показва полето „Роля“ в редактора за събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Дали да се показва полето „Състояние“ в редактора за събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Дали времето да се показва в 24-часов формат вместо с am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Дали да се показва полето „Часови пояс“ в редактора за събития/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Дали да се показва полето „Вид“ в редактора за събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Дали да се показват номерата на седмиците в навигатора за дати."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Работни дни"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Час, в който завършва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Минута, в която завършва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Час, в който започва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Минута, в която започва работния ден"
 
@@ -5121,19 +5071,19 @@ msgstr "Обобщението съдържа"
 msgid "Description contains"
 msgstr "Описанието съдържа"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Коментарът съдържа"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Местонахождението съдържа"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Несъвпадащ"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
@@ -5142,9 +5092,9 @@ msgstr "Печат"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
@@ -5211,59 +5161,59 @@ msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Неуспех при отварянето на календара „%s“ за създаване на събития и събрания"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Няма наличен календар за създаване на събития и събрания"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Местонахождение на календара"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Нова среща"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "Срещ_а"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Създаване на нова среща"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Ново събрание"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "Събрани_е"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Създаване на ново искане за събрание"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Нова среща за цял ден"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Среща за _цял ден"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Създаване на нова среща за цял ден"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Нов календар"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Създаване на нов календар"
 
@@ -5295,11 +5245,11 @@ msgstr "Методът не е поддържан при отварянето н
 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:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Неизвестна грешка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "Редактиране на аларма"
 
@@ -5421,18 +5371,47 @@ msgstr "Д_обавяне"
 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
-msgid "_Suggest automatic display of attachment"
-msgstr "Предлагане на _автоматично показване на прикрепен обект"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Предлагане на автоматично показване на прикрепен обект"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Прикрепяне на файл(ове)"
 
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Настройки на прикрепения документ"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Описание:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "File name:"
+msgstr "Име на файл:"
+
+#: ../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 тип:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Избрани календари за аларми"
@@ -5494,7 +5473,7 @@ msgid "Display"
 msgstr "Показване"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Свободен/зает"
@@ -5545,192 +5524,186 @@ msgstr ""
 msgid "Pick a color"
 msgstr "Избор на цвят"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_Нд"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Събота"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Избор на календари за проверка за аларми"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "Пока_зване на напомняне"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Показване на номерата на седмиците в навигацията за _ден"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Неделя"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "Зада_чи за днес:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "_Чт"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Шаблон:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Часови _пояс:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Формат на време:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Сряда"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "С_едмицата започва от:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Работни дни:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 часа (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 часа"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Питане за потвърждение при изтриване на обекти"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
-msgstr "Вместване на почивните дни в месечен пре_глед"
+msgstr "Сбиване на почивните дни в месечен пре_глед"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Денят започва в:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "П_т"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "Скриване на завършени_те задачи след"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Пн"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "_Просрочени задачи:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "С_б"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Показване края на срещите в седмичните и месечните календарни изгледи"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "_Времеви интервали:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_Вт"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Ср"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "преди всяка среща"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr ""
-"Копиране на събитията в календара за _локална употреба в режим „Изключен“"
+"Копиране на събитията в календара за локална употреба в режим „Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr ""
-"Копиране на съдържанието на списъка със задачи за _локална употреба в режим "
+"Копиране на съдържанието на списъка със задачи за локална употреба в режим "
 "„Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr ""
-"Копиране на съдържанието на списъка с бележки за _локална употреба в режим "
+"Копиране на съдържанието на списъка с бележки за локална употреба в режим "
 "„Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Цвят:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Списък със задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Списък с бележки"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Настройки на календара"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Нов календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Настройки на списък със задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Нов списък с бележки"
 
@@ -5819,49 +5792,49 @@ msgstr "%s  Няма направени промени, да се обнови �
 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:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " до "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Приключено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Приключено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Краен срок "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Краен срок "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2861
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Прикрепено писмо - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2866
-#: ../composer/e-msg-composer.c:3062
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Прикрепено писмо"
 msgstr[1] "%d прикрепени писма"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3126
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "Пре_местване"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3128
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Отказване на _извлачването"
 
@@ -5869,7 +5842,7 @@ msgstr "Отказване на _извлачването"
 msgid "Could not update object"
 msgstr "Обектът не може да бъде обновен"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2490
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5881,98 +5854,99 @@ msgid "Hide Attachment _Bar"
 msgstr "_Скриване на лентата за прикрепени файлове"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "_Показване на лентата за прикрепени файлове"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3624
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "Пре_махване"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3625 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Настройки"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3627
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Прикрепяне на файл...."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Показване на прикрепени файлове"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 "Натиснете интервал, за да превключите показването на лентата за прикрепяне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Редактиране на среща"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Събрание - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Среща - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Назначена задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запис в дневника - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Няма обобщение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "прикрепено"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Промените по този запис може да бъдат презаписани, ако пристигне обновяване"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Не може да се използва текущата версия!"
 
@@ -5988,10 +5962,6 @@ msgstr "Местоположението не може да бъде отвор�
 msgid "Destination is read only"
 msgstr "Имате права само за четене"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Изтриване на този обект от пощенските кутии на всички получатели?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Събитието не може да бъде изтрито, заради грешка в corba"
@@ -6053,17 +6023,17 @@ msgstr "Делегиране на:"
 msgid "Enter Delegate"
 msgstr "Въвеждане на делегат"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_Среща"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Повторение"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Това събитие има аларми"
 
@@ -6073,7 +6043,7 @@ msgid "Cale_ndar:"
 msgstr "К_алендар:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6087,95 +6057,103 @@ msgstr "_Делегати"
 msgid "Atte_ndees"
 msgstr "_Присъстващи"
 
-#: ../calendar/gui/dialogs/event-page.c:1083
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Събитие без начална дата"
 
-#: ../calendar/gui/dialogs/event-page.c:1086
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Събитие без крайна дата"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Началната дата е грешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1264
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Крайната дата е грешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Началният час е грешен"
 
-#: ../calendar/gui/dialogs/event-page.c:1294
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Крайният час е грешен"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Избраният организатор вече няма абонамент."
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Необходим е организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Необходим е поне един участник."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "Доб_авяне "
 
-#: ../calendar/gui/dialogs/event-page.c:2618
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не може да се отвори календара „%s“."
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d ден преди среща"
 msgstr[1] "%d дни преди среща"
 
-#: ../calendar/gui/dialogs/event-page.c:2929
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d час преди среща"
 msgstr[1] "%d часа преди среща"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d минута преди среща"
 msgstr[1] "%d минути преди среща"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Персонализиране"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2282
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
 #: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
@@ -6194,7 +6172,8 @@ msgid "15 minutes before appointment"
 msgstr "15 минути преди среща"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "_Присъстващи..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6215,12 +6194,16 @@ msgstr "Описани_е:"
 msgid "Event Description"
 msgstr "Описание на събитие"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "Местоположен_ие:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "О_бобщение:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Аларма"
 
@@ -6242,6 +6225,14 @@ msgstr "за"
 msgid "until"
 msgstr "докато"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "Деле_гати"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "От:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6288,7 +6279,7 @@ msgstr "Моля, отговорете"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Състояние"
 
@@ -6309,11 +6300,11 @@ msgid "Organizer"
 msgstr "Организатор"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Бележка"
 
@@ -6575,15 +6566,15 @@ msgstr "<span weight=\"bold\">Състояние</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Завършено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Високо"
 
@@ -6592,20 +6583,20 @@ msgstr "Високо"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "В прогрес"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1027
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Ниско"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Нормално"
 
@@ -6613,7 +6604,7 @@ msgstr "Нормално"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Не е стартиран"
 
@@ -6626,7 +6617,7 @@ msgid "Stat_us:"
 msgstr "Състо_яние:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Неопределено"
 
@@ -6643,12 +6634,12 @@ msgstr "_Приоритет:"
 msgid "_Web Page:"
 msgstr "_Интернет страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Подробности на задачата"
 
@@ -6661,10 +6652,6 @@ msgstr "Крайният срок е невалиден"
 msgid "Unable to open tasks in '%s'."
 msgstr "Не може да се отворят задачите в „%s“."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Присъстващи..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Ка_тегории..."
@@ -6805,7 +6792,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s е неизвестен тип за превключване"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Натиснете, за да отворите %s"
@@ -6825,7 +6812,7 @@ msgstr "Неименувано"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Обобщено:"
 
@@ -6843,7 +6830,7 @@ msgstr "Крайна дата:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Състояние:"
 
@@ -6851,26 +6838,18 @@ msgstr "Състояние:"
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: ../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:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Публичен"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Частен"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Поверително"
 
@@ -6890,13 +6869,13 @@ msgid "Summary"
 msgstr "Обобщение"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Заето"
 
@@ -6910,17 +6889,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Не"
@@ -6931,21 +6910,21 @@ msgstr "Не"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Неизвестен"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Повтарящ се"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Назначен"
 
@@ -6953,7 +6932,7 @@ msgstr "Назначен"
 msgid "Save As..."
 msgstr "Запазване като..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2081
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Изберете папка, където да се запазят избраните прикрепени файлове..."
 
@@ -6962,9 +6941,9 @@ msgstr "Изберете папка, където да се запазят из�
 msgid "untitled_image.%s"
 msgstr "неозаглавено_изображение.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Запазване като..."
 
@@ -6982,79 +6961,74 @@ msgstr "_Запазване на избраните"
 msgid "Open in %s..."
 msgstr "Отваряне в %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Изтриване на избраните обекти"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Обновяване на обектите"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Запазване като..."
 
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Нова _задача"
-
-#: ../calendar/gui/e-calendar-table.c:1260 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Отваряне на страница в _Интернет"
 
-#: ../calendar/gui/e-calendar-table.c:1262
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7062,44 +7036,44 @@ msgstr "Отваряне на страница в _Интернет"
 msgid "_Print..."
 msgstr "_Разпечатване..."
 
-#: ../calendar/gui/e-calendar-table.c:1266
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Из_рязване"
 
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Поставяне"
 
-#: ../calendar/gui/e-calendar-table.c:1272 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Задаване на задача"
 
-#: ../calendar/gui/e-calendar-table.c:1273 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Препращане като iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1274
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Отбелязване като приключено"
 
-#: ../calendar/gui/e-calendar-table.c:1275
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Отбелязване на избраните задачи като приключени"
 
-#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Изтриване на избраните задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1513
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Натиснете, за да добавите задача"
@@ -7134,101 +7108,105 @@ msgstr "Начална дата"
 msgid "Task sort"
 msgstr "Подреждане на задачи"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Преместване на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Копиране на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Нова _среща..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Всички нови _събития за деня"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Ново _събрание"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Нова _задача"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Текущ изглед"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Избиране на _днешна дата"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "Избор на д_ата..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Копиране в _календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Преме_стване в календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Делегиране на събрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Насрочване на с_ъбрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "Препра_ща като iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "Отгово_р"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Отговор до _всички"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Прави това събитие пр_еместваемо"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Изтриване на това с_ъбитие"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Изтриване на всички _събития"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Местоположение: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -7258,7 +7236,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Разделения от по %02i минути"
@@ -7269,22 +7247,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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "сутрин"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "следобед"
 
@@ -7394,22 +7370,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Прието"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Неуверено прието"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Отказано"
 
@@ -7631,7 +7607,7 @@ msgid "Attendee status updated\n"
 msgstr "Състоянието на присъстващия е осъвременено\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Състоянието на присъстващия не може да бъде осъвременено, защото обекта вече "
@@ -7685,30 +7661,43 @@ msgstr "Изпращане на най-новата информация"
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--до--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Съобщение на календар"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Дата:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Зареждане на календар"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Календарът се зарежда..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Съобщение на сървър:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "крайна дата"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "начална дата"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Председателстващи"
@@ -7727,65 +7716,65 @@ msgid "Resources"
 msgstr "Ресурси"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Индивидуално"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Група"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Ресурс"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Помещение"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Председател"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Заявен участник"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Възможен участник"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Не е участник"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Необходими действия"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Пробен"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Делегиран"
 
@@ -7794,14 +7783,14 @@ msgstr "Делегиран"
 msgid "Attendee                          "
 msgstr "Присъстващ"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "В прогрес"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7809,86 +7798,86 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Извън офиса"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Няма информация"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Присъстващи..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "Оп_ции"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Показване _само на работните часове"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Показване като _умалено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Обновяване на „свободен/зает“"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Авт. избиране"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Всички хора и ресурси"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Вси_чки хора и един ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Ну_жни хора"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Нужни хора и _един ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Начало:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Край:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Изтриване на избраните бележки"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Натиснете, за да добавите бележка"
 
@@ -7896,7 +7885,7 @@ msgstr "Натиснете, за да добавите бележка"
 msgid "Memo sort"
 msgstr "Подреждане на бележки"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7915,7 +7904,7 @@ msgstr "Зареждане на бележки"
 msgid "Opening memos at %s"
 msgstr "Отваряне на бележки в %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Изтриване на избраните обекти..."
 
@@ -7924,32 +7913,31 @@ msgstr "Изтриване на избраните обекти..."
 msgid "Enter the password for %s"
 msgstr "Въведете паролата за %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Зареждане на задачи"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отваряне на задачи в %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Завършване на задачи..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Изчистване на изтритите писма"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "Избор на часови пояс"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8098,9 +8086,22 @@ msgstr "iCalendar информация"
 msgid "You must be an attendee of the event."
 msgstr "Трябва да сте участник в събитието."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "_Нов списък с бележки"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Копиране"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Изтриване"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Настройки..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8205,240 +8206,240 @@ msgstr "Неуспех при мигрирането на календара „
 msgid "Unable to migrate tasks `%s'"
 msgstr "Неуспех при мигрирането на задачите „%s“"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1ви"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2ри"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3ти"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4ти"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5ти"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6ти"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7ми"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8ми"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9ти"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20ти"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21ви"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22ри"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23ти"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24ти"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25ти"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26ти"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27ми"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28ми"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29ти"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30ти"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31ви"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Нд"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Пн"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Вт"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Ср"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Чт"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Пт"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Сб"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Избран ден (%a %b %d %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Избрана седмица (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Избран месец (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Среща"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Задача"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Обобщено: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Състояние: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 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
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Преглед преди разпечатване"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Печат на обект"
 
@@ -8504,7 +8505,7 @@ msgstr "Спис_ък със задачи"
 msgid "Create a new task list"
 msgstr "Създаване на нов списък със задачи"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8516,11 +8517,11 @@ msgstr ""
 "\n"
 "Наистина ли искате да изтриете тези задачи?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Да не се задава този въпрос отново."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Задачи за разпечатване"
 
@@ -10115,7 +10116,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Лента за прикрепени файлове"
 
@@ -10123,43 +10124,28 @@ msgstr "Лента за прикрепени файлове"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Не може да се прикрепи файла %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Не може да се прикрепи файла %s: не е обикновен файл"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Настройки на прикрепения документ"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Име на файл:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME тип:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Получател на пощата"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Избор на папки, в които да бъде копирано писмото."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Натиснете тук за адресника"
 
@@ -10170,45 +10156,45 @@ msgstr "Натиснете тук за адресника"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "От_говор до:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_От:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Тема:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_До:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Въведете получател(и) на писмото"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
-msgstr "_Копие:"
+msgstr "_Копие до:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Въведете адресите на получатели на копие на това писмо"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
-msgstr "_Скрито копие:"
+msgstr "_Скрито копие до:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10219,15 +10205,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "Копиране в _папка:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Натиснете тук, за да въведете папки, в които да бъде копирано писмото"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Копиране в папка:"
 
@@ -10235,7 +10221,7 @@ msgstr "Копиране в папка:"
 msgid "A_ttach"
 msgstr "_Прикрепяне"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "При_крепяне на файл"
 
@@ -10254,12 +10240,12 @@ msgstr ""
 "Изпращащото се писмо не може да бъде криптирано: няма зададен сертификат за "
 "криптиране към този абонамент"
 
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Скрив_ане на лентата за прикрепени файлове"
 
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Показв_ане на лентата за прикрепени файлове"
 
@@ -10285,21 +10271,21 @@ msgstr "Писмо без тема"
 msgid "Open File"
 msgstr "Отваряне на файл"
 
-#: ../composer/e-msg-composer.c:2162 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Автоматично генериран"
 
-#: ../composer/e-msg-composer.c:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "_Подпис:"
 
-#: ../composer/e-msg-composer.c:2533 ../composer/e-msg-composer.c:3752
-#: ../composer/e-msg-composer.c:3755
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Писане на писмо"
 
-#: ../composer/e-msg-composer.c:4979
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10447,7 +10433,7 @@ msgstr "_Запазване на писмото"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10571,7 +10557,7 @@ msgstr ""
 "Какво трябва да предприеме Evolution, когато се получи писмо, настояващо да "
 "бъде прочетено?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10579,28 +10565,28 @@ msgstr ""
 "Файл със същото име вече съществува.\n"
 "Да бъде ли презаписан?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Презаписване на файла?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Предупреждение на Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Информация за Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Заявка на Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Вътрешна грешка, изисква се непозната грешка „%s“"
@@ -10695,23 +10681,23 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Изберете време, за да го сравните с"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Избор на файл"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
-msgstr "Трябва да се направи"
+msgstr "Да се направи"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "По-късно"
@@ -10761,11 +10747,11 @@ msgid "Include threads"
 msgstr "Включване на нишките"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Входящи"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Изходящи"
 
@@ -10861,7 +10847,7 @@ msgstr "преди"
 msgid "months"
 msgstr "месеци"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "секунди"
 
@@ -10932,11 +10918,11 @@ msgstr "Контрол за настройки на редактора за пи
 msgid "Evolution Mail preferences control"
 msgstr "Настройки на пощата на Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Поща"
@@ -11017,11 +11003,11 @@ msgstr "Получаване на настройки"
 msgid "Checking for New Mail"
 msgstr "Проверка за нова поща"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Редактор на абонаменти"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Помощник на Evolution за абонаментите"
 
@@ -11056,7 +11042,7 @@ msgid "Protocol"
 msgstr "Протокол"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Без име"
 
@@ -11132,12 +11118,6 @@ msgstr "Получено на дата"
 msgid "Date sent"
 msgstr "Изпратено на дата"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Изтриване"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Изтрито"
@@ -11235,7 +11215,7 @@ msgstr "Спам"
 msgid "Junk Test"
 msgstr "Тест за спам"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Етикет"
 
@@ -11279,7 +11259,7 @@ msgstr "Изпълнение на звук"
 msgid "Read"
 msgstr "Прочитане"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Получатели"
 
@@ -11307,11 +11287,11 @@ msgstr "връщане на по-малко от"
 msgid "Run Program"
 msgstr "Стартиране на програма"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Резултат"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Подател"
 
@@ -11343,9 +11323,9 @@ msgstr "започва с"
 msgid "Stop Processing"
 msgstr "Спиране на обработването"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11361,42 +11341,10 @@ msgstr "Неопределено състояние"
 msgid "<b>Then</b>"
 msgstr "<b>Тогава</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Създаване на папка за търсене на чисто..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Всички писма"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Непрочетени писма"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Няма етикет"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Прочетени писма"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Последни писма"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Писмата от последните 5 дни"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Писма с прикачени файлове"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Писмата, които не са спам"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
@@ -11430,7 +11378,7 @@ msgid "Folder _name:"
 msgstr "Име на _папка:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Папки за търсене"
 
@@ -11445,7 +11393,7 @@ msgstr "Чернови"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Пощенска кутия"
 
@@ -11461,77 +11409,77 @@ msgstr "Изпратени"
 msgid "Loading..."
 msgstr "Зареждане..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Дърво на папката с пощата"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Преместване на папка %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копиране на папка %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Преместване на писма в папка %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копиране на писма в папка %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Неуспех при пускането на писмото(та) във висше хранилище"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Копиране в папка"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Преместване в _папка"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в „%s“"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Отваряне в _нов прозорец"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Копиране..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "Пре_местване..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Нова папка..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "П_реименуване..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Изчистване на _кошчето"
 
@@ -11540,14 +11488,13 @@ msgstr "Изчистване на _кошчето"
 msgid "Copying `%s' to `%s'"
 msgstr "Копиране на „%s“ в „%s“"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Копиране"
 
@@ -11569,176 +11516,168 @@ msgstr "Създаване на папка"
 msgid "Specify where to create the folder:"
 msgstr "Указване къде да бъде създадена папката:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Отговор до подателя"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Препращане"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "Р_едактиране като ново писмо..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "В_ъзстановяване на изтрито"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Пре_местване в папка..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Копиране в папка..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "От_белязване като прочетено"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Отбелязване като _непрочетено"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Отбелязване като ва_жно"
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Отбелязване като не_важно"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Отбелязване като _спам"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Отбелязване като различ_но от спам"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Отбелязване за просле_дяване..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Етикет"
 
-#: ../mail/em-folder-view.c:1141
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Без"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Фла_гът е завършен"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Из_чистване на отбелязването"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "С_ъздаване на правило от писмо"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Папка за търсене по _тема"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Папка за търсене по _подател"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Папка за търсене по полу_чатели"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Папка за търсене по по_щенски списък"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Филтър по т_ема"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Филтър по п_одател"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Филтър по получ_атели"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Филтър по поще_нски списък"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Стандартно"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Разпечатване на писмото"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Писмото не може да се получи"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "Копиране на мес_тоположението на връзката"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Създаване на п_апка за търсене"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_От този адрес"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_До този адрес"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Натиснете, за да изпратите писмо на %s"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Натиснете за скриване/показване на адресите"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:501
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Съвпадения: %d"
 
-#: ../mail/em-format-html-display.c:644
-msgid "Find:"
-msgstr "Търсене:"
-
-#: ../mail/em-format-html-display.c:675
-msgid "M_atch case"
-msgstr "_Зачитане на малки/големи"
-
-#: ../mail/em-format-html-display.c:923 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Неподписано"
 
-#: ../mail/em-format-html-display.c:923
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Това писмо не е подписано. Няма гаранции, че това писмо е автентично."
 
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Валиден подпис"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11746,11 +11685,11 @@ msgstr ""
 "Това писмо е подписано и е валидно, което означава, че най-вероятно е "
 "автентично."
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Невалиден подпис"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11758,11 +11697,11 @@ msgstr ""
 "Подписът на това писмо не може да бъде проверен. Възможно е то вече да е "
 "било променено, преди да бъде получено."
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Валиден подпис, не може да се потвърди подателя"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11770,11 +11709,11 @@ msgstr ""
 "Това писмо е подписано с валиден подпис, но подателят не може да бъде "
 "проверен."
 
-#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Некриптирано"
 
-#: ../mail/em-format-html-display.c:932
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11782,11 +11721,11 @@ msgstr ""
 "Това писмо не е криптирано. Докато пътува през Интернет, трети лица могат да "
 "видят неговото съдържание."
 
-#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Слабо криптиране"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11796,11 +11735,11 @@ msgstr ""
 "трудно, но не невъзможно, да декриптират неговото съдържание за практически "
 "период от време."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Криптирано"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11808,11 +11747,11 @@ msgstr ""
 "Това писмо е криптирано. На трети лица ще бъде много трудно да видят "
 "неговото съдържание."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Силно криптирано"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11821,72 +11760,72 @@ msgstr ""
 "Това писмо е криптирано чрез силен алгоритъм. За трети лица ще бъде много "
 "трудно да го декриптират за практически период от време."
 
-#: ../mail/em-format-html-display.c:1036 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Преглед на сертификат"
 
-#: ../mail/em-format-html-display.c:1051
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Този сертификат не може да се преглежда"
 
-#: ../mail/em-format-html-display.c:1342
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завършено на %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1350
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Просрочено:"
 
-#: ../mail/em-format-html-display.c:1353
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "с %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1413
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Вграден преглед"
 
-#: ../mail/em-format-html-display.c:1414
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Скриване"
 
-#: ../mail/em-format-html-display.c:1415
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Съразмерно ширината"
 
-#: ../mail/em-format-html-display.c:1416
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Оригинален раз_мер"
 
-#: ../mail/em-format-html-display.c:1835 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Прикрепен файл"
 
-#: ../mail/em-format-html-display.c:2042
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Изберете папка, където да се запазят всички прикрепени файлове"
 
-#: ../mail/em-format-html-display.c:2089
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Запазване на избраното..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2156
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d _прикрепен файл"
 msgstr[1] "%d _прикрепени файла"
 
-#: ../mail/em-format-html-display.c:2163 ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Запазване"
 
-#: ../mail/em-format-html-display.c:2174
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "_Запазване на всички"
 
-#: ../mail/em-format-html-display.c:2235
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Няма прикрепени файлове"
 
@@ -11900,94 +11839,94 @@ msgstr "Страница %d от %d"
 msgid "Retrieving `%s'"
 msgstr "Получаване на „%s“"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Валиден подпис, но не може да се потвърди подателя"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Зле форматирана външна част на тялото на писмото"
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указател към FTP сайт (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указател към локален файл (%s), валиден на сайта „%s“"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указател към локален файл (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указател към отдалечени данни (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указател към неизвестни външни данни (тип „%s“)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Форматиране на писмо"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "От"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Отговор до"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
-msgstr "Копие"
+msgstr "Копие до"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
-msgstr "Скрито копие"
+msgstr "Скрито копие до"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Пощенска програма"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Дата"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Групи за новини"
@@ -12040,7 +11979,7 @@ msgstr "Един път седмично"
 msgid "Once per month"
 msgstr "Един път месечно"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12052,48 +11991,48 @@ msgstr ""
 "\n"
 "Изчакайте, докато Evolution мигрира вашите папки..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Неуспех при създаването на новата папка „%s“: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Неуспех при копирането на папка „%s“ в „%s“: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Неуспех при сканирането за съществуващи пощенски кутии на „%s“: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Неуспех при отварянето на стари данни, пазени на POP сървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Неуспех при създаването на папка за данни, пазени на POP3 сървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Неуспех при копирането на данни, пазени на POP3 сървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Неуспех при създаването на локалното хранилище за пощата „%s“: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Неуспех при създаване на локални папки към „%s“: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12110,6 +12049,10 @@ msgstr "_Отговор на подателя"
 msgid "Reply to _List"
 msgstr "Отговор до _списъка"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Отваряне на връзката в _браузър"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Изпращане на ново писмо до..."
@@ -12139,28 +12082,28 @@ msgstr "Изберете сървър."
 msgid "No server has been selected"
 msgstr "Не е избран сървър"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Това писмо да не се показва отново."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Пощенски _филтри"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "писмо"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Запазване на писмо..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Добавяне на адрес"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Писма от %s"
@@ -12202,112 +12145,84 @@ msgid "Composer Window default width"
 msgstr "Стандартна ширина на прозореца за писане на писма"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Вместване на адрестите на е-поща в „До/Копие/Скрито копие“"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Вместване на адресите на е-поща в „До/Копие/Скрито копие“ до броя указан в "
-"ключа address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Стандартната кодова таблица, в която да се пишат писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Стандартната кодова таблица, в която да се пишат писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Стандартна кодова таблица, чрез която да се изобразяват писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Стандартна кодова таблица, чрез която да се изобразяват писмата."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Стандартен стил на препращане"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Стандартната височина на прозореца за писане на писма"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Стандартната височина на прозореца за писма"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Стандартната височина на прозореца за абониране"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Стандартен стил на отговор"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Стандартната ширина на прозореца за писане на писма"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Стандартната ширина на прозореца за писма"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Стандартна ширина на прозореца за абониране"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Изобразяване на индикатори за грешки в правописа по време на писане."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Изчистване на папката „Кошче“ при спирането на програмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Изчистване на всички кошчета при спирането на Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Включване на режим „Каретка“, така че курсорът да се вижда при четене на "
 "писмата."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Вклюване/изключване на търсене с автоматично довършване"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Включване на търсенето в страничната лента. Това позволява да стартирате "
-"интерактивни търсения като просто въведете текста. Например - така лесно "
-"можете да откривате и да избирате папка в страничната лента като въведете "
-"името й."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Включване/изключване на режим „Каретка“"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Височина на панела със списъка на писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Височина на пенела със списъка на писмата."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12315,13 +12230,7 @@ msgstr ""
 "Ако потребител се опита да отвори 10 или повече писма едновременно, да бъде "
 "питан дали наистина иска да направи това."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-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.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12332,23 +12241,23 @@ msgstr ""
 "компонент, съдържащ се в базата от данни за MIME-тип на GNOME, могат да "
 "бъдат използвани за изобразяване на съдържание."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Последният път, когато е изпразвано кошчето"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Списък с етикети и техните асоциирани цветове"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Списък с приетите лицензи"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Списък на абонаментите"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12356,11 +12265,11 @@ msgstr ""
 "Списък с пощенските абонаменти в Evolution. Съдържа имена, които се "
 "използват и за под-папките на /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Списък на специфични заглавни части и дали са активирани."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12368,21 +12277,21 @@ msgstr ""
 "Списък с цветови етикети в Evolution. Съдържа двойки „име:цвят“, където "
 "цветът е в шестнадесетичен HTML формат."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Списък от MIME-типове, за които да се проверява за съществуваща система за "
 "преглед чрез Bonobo компоненти"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Списък с протоколни имена, чиито лицензи са били приети."
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Зареждане на изображенията в писмата, форматирани в HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12392,103 +12301,99 @@ msgstr ""
 "0 - никога не се зареждат изображения от мрежата, 1 - изображенията се "
 "зареждат, ако подателят е в адресника и 2 - изображенията се зареждат винаги."
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Записване на дейността на филтрите в дневник"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Записване в дневник на дейността на филтрите в определен файл."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Файл за записване дейността на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Файл за записване дейността на филтрите."
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Отбелязване като видяно след определено време"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Отбелязване като видяно след определено време."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Отбелязване на цитатите в прегледа на писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Отбелязване на цитатите в прегледа на писмата."
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Стандартна височина на прозореца за писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Стандартна ширина на прозореца за писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Начин на показване на писмата („обикновен“, „всички заглавни части“, "
 "„изходен код“)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 "Минимален брой дни между изчистване на кошчето при затваряне на програмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Минимално време между изчистването на кошчето при затваряне на програмата, в "
 "дни."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Нов звуков файл за информиране за поща"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Нов тип информиране за поща"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Брой на адреси, които да се показват в До/Копие/Скрито копие"
-
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Запитване при непопълнено поле „Тема“"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Предупреждаване на потребителя, когато иска да изчисти папка."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Запитване до потребителя, когато се опита да прати писмо без тема."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Предупреждаване при изчистване"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
-msgstr "Предупреждаване, когато потребителя попълни само „Скрито копие“"
+msgstr "Предупреждаване, когато потребителя попълни само „Скрито копие до“"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Предупреждаване, когато потребител се опита да отвори 10 или повече писма "
 "едновременно"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12496,101 +12401,90 @@ msgstr ""
 "Предупреждаване на потребителя при изпращане на писма в HTML формат до "
 "получатели, които може да не искат да получават такава поща."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Предупреждаване на потребителя при изпращане на писма без адрес в полетата "
-"„До“ или „Копие“."
+"„До“ или „Копие до“."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Предупреждаване на потребителя, когато се опита да изпрати нежелан HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Разпознаване на връзките в текста и заместването им."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Разпознаване на усмивките в текста и замяна с изображения."
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Проверяване на входящата поща за спам"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Изпращане на поща в HTML формат по подразбиране (не се препоръчва)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Изпращане на поща в HTML формат по подразбиране (не се препоръчва)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Показване на анимации"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Показване на анимирани изображения като анимации."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Показване на изтритите писма като зачертани в списъка."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Показване на изтритите писма в списъка с писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr ""
-"Показване адреса на е-поща на подателя в съставна колона в списъка с писмата"
-
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Показване адреса на е-поща на подателя в колона в списъка с писмата"
-
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Изпълнение на звуков файл при пристигане на ново писмо."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Задаване вида на уведомяването за нова поща."
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Вградена проверка на правопис"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Стандартната височина на прозореца за абониране"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Стандартната ширина на прозореца за абониране"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Терминален шрифт"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Последният път, когато е изчиствано кошчето, в дни от „Епохата“."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Терминалният шрифт за показване на пощата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Използваният за показване на писмата шрифт с променлива широчина"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12602,112 +12496,99 @@ msgstr ""
 "„&lt;header enabled&gt; - set enabled“ в случай, че заглавната част трябва "
 "да бъде показвана."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-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:94
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Подреждане на списъка с писма в нишки."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Подреждане на списъка с писма в нишки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Подреждане на списъка с писма в нишки на основата на „Тема“."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Време за отбелязване на дадено писмо като видяно"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Време за отбелязване на дадено писмо като видяно."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Низ UID на стандартния абонамент."
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Използване на демона и клиента на Spamasssassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Използване на демона и клиента на Spamasssassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Използване на лични шрифтове"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Използване на лични шрифтове за показване на пощата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Използване само на локални спам тестове."
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Използване само на локални спам тестове (без DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "Use side-by-side or wide layout"
-msgstr "Да се ползва широк изглед"
-
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Шрифт с променлива ширина"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
-msgstr "„Изглед/Скрито копие“ е активирано"
+msgstr "„Изглед/Скрито копие до“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
-msgstr "„Изглед/Скрито копие“ е активирано."
+msgstr "„Изглед/Скрито копие до“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
-msgstr "„Изглед/Копие“ е активирано"
+msgstr "„Изглед/Копие до“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
-msgstr "„Изглед/Копие“ е активирано."
+msgstr "„Изглед/Копие до“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "„Изглед/От“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "„Изглед/От“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "„Изглед/Копиране в папка“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "„Изглед/Копиране в папка“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "„Изглед/Отговор до“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "„Изглед/Отговор до“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12715,14 +12596,6 @@ msgstr ""
 "Дали да се използва преглед на писмата в нишки по „Тема“, когато те не "
 "съдържат заглавни части „В отговор на“ или „Препратки“."
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
-msgid "Width of the message-list pane"
-msgstr "Шерочина на панела със списъка на писмата"
-
-#: ../mail/evolution-mail.schemas.in.in.h:120
-msgid "Width of the message-list pane."
-msgstr "Широчина на пенела със списъка на писмата."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Внасят се данни от Elm"
@@ -12754,15 +12627,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Внасяне на пощенски папки формат Berkley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Внасяне на „%s“"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Изчакайте"
 
@@ -12942,31 +12815,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", непрочетено %d"
 msgstr[1] ", непрочетени %d"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Ново _писмо"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Писмо"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Създаване на ново писмо"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Нова пощенска папка"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "По_щенска папка"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Създаване на нова пощенска папка"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Неуспех при обновяването на пощенските настройки или папки."
 
@@ -13140,11 +13013,11 @@ msgstr "Също да се _криптира, когато се изпраща �
 
 #: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Винаги _копие (cc) до:"
+msgstr "Винаги _копие до (cc):"
 
 #: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Винаги _скрито копие (bcc) до:"
+msgstr "Винаги _скрито копие до (bcc):"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
@@ -13393,7 +13266,8 @@ msgstr "Изберете от следните опции"
 #: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
-"Напомняне при изпращане на писма с получатели само в полето „Скрито копие:“"
+"Напомняне при изпращане на писма с получатели само в полето „Скрито копие "
+"до:“"
 
 #: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
@@ -13601,26 +13475,18 @@ msgid "_Show image animations"
 msgstr "_Показване на анимации"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "Вме_стване на „До/Копие/Скрито копие“"
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "_Използване на сигурна връзка (SSL):"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Използване на същите шрифтове като останалите програми"
 
-#: ../mail/mail-config.glade.h:177
-msgid "addresses"
-msgstr "адреси"
-
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "цвят"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "описание"
 
@@ -13733,21 +13599,21 @@ msgstr "с всички локални папки"
 msgid "Pinging %s"
 msgstr "Проверяване на %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Филтър върху папка"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Изтегляне на пощата"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспех при прилагането на филтрите за изходящата поща: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13756,114 +13622,123 @@ msgstr ""
 "Грешка при добавянето към %s: %s\n"
 "Вместо това писмото е добавено към локалната папка „Изпратени“."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Грешка при добавянето към локалната папка „Изпратени“: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Изпращане на писмо %d от %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Неуспех при изпращането на %d от %d писма"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Отмненено."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Приключено."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Запазване на писмото в папка"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Преместване на писма в %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на писма в %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Препратени писма"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отваряне на папка %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Отваряне на хранилище %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтриване на папка %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка „%s“"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Зачеркване и запазване на абонамент „%s“"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Запазване на абонамент „%s“"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Изчистване на кошчето в „%s“"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Локални папки"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получаване на писмо %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Получаване на %d писмо"
 msgstr[1] "Получаване на %d писма"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Запазване на %d писмо"
 msgstr[1] "Запазване на %d писма"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Не може да се създаде изходен файл: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13872,11 +13747,11 @@ msgstr ""
 "Грешка при запазване на писма в: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Запазване на прикрепен файл"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13885,22 +13760,22 @@ msgstr ""
 "Неуспех при създаването на изходен файл: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Неуспех при записването на данните: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Изключване от %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторно свързване с %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Проверка на услугата"
 
@@ -13928,26 +13803,17 @@ msgstr "Изчакване..."
 msgid "Checking for new mail"
 msgstr "Проверка за нови писма"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Въведете парола за %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Въвеждане на парола"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведете парола за %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Въвеждане на парола"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Потребителят отмени операцията."
 
@@ -14003,11 +13869,11 @@ msgstr "Обновяване на папки за търсене за „%s:%s�
 msgid "Updating Search Folders for '%s'"
 msgstr "Обновяване на папките за търсене за „%s“"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Редактиране на папките за търсене"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Нова папка за търсене"
 
@@ -14095,7 +13961,7 @@ msgstr "Сигурни ли сте, че искате да изпратите п
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Сигурни ли сте, че искате да изпратите писмото само с получатели в полето "
-"„Скрито копие“?"
+"„Скрито копие до“?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
@@ -14325,9 +14191,9 @@ msgid ""
 "recipient."
 msgstr ""
 "Много системи за поща добавят заглавна част „Очевидно до“ към писмата, които "
-"имат само получатели със „Скрито копие“. Ако тази заглавна част е добавена, "
-"всички получатели ще се покажат така или иначе. За да избегнете това, "
-"добавете поне един получател в полето „До“ или „Копие“."
+"имат само получатели със „Скрито копие до“. Ако тази заглавна част е "
+"добавена, всички получатели ще се покажат така или иначе. За да избегнете "
+"това, добавете поне един получател в полето „До“ или „Копие до“."
 
 #: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
@@ -14420,11 +14286,11 @@ msgstr "Подписът вече съществува"
 
 #: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"За да работи правилно Evolution, програмата се нуждае от системни папки, "
-"които не можете да преименувате, премествате или изтривате."
+"За да работи правилно Ximian Evolution, програмата се нуждае от системни "
+"папки, които не можете да преименувате, премествате или изтривате."
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -14438,9 +14304,9 @@ msgstr ""
 "Списъкът, до който пращате писмото, е конфигуриран да скрива получателите.\n"
 "\n"
 "Много системи за поща добавят заглавна част „Очевидно до“ към писмата, които "
-"имат само получатели със „Скрито копие“. Ако тази заглавна част е добавена, "
-"всички получатели ще се покажат така или иначе. За да избегнете това, "
-"добавете поне един получател в полето „До“ или „Копие“. "
+"имат само получатели със „Скрито копие до“. Ако тази заглавна част е "
+"добавена, всички получатели ще се покажат така или иначе. За да избегнете "
+"това, добавете поне един получател в полето „До“ или „Копие до“. "
 
 #: ../mail/mail.error.xml.h:93
 msgid ""
@@ -14591,74 +14457,74 @@ msgstr "_Изчистване"
 msgid "_Open Messages"
 msgstr "Отваряне на _писма"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Прегледано"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Отговорено"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрегледани писма"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Множество писма"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Най-ниска"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Ниска"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Висока"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Най-висока"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Днес %l:%M %p"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Писма"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Генериране на списък на писмата"
 
@@ -14678,15 +14544,15 @@ msgstr "Отбелязано"
 msgid "Follow Up Flag"
 msgstr "Следващо в разговора писмо"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Оригинално местонахождение"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Получено"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Изпратени съобщения"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Размер"
@@ -14957,6 +14823,10 @@ msgstr ""
 "Пробна приставка, която демонстрира изскачащо меню, което позволява да "
 "копирате неща в буфера за обмен."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Копиране на _адреса на е-пощата"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Инструмент за копиране"
@@ -15159,15 +15029,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:662
 #, 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
 msgid "Custom"
 msgstr "Личен"
 
@@ -15287,7 +15155,7 @@ msgstr "Име на папка"
 msgid "Folder Size"
 msgstr "Размер на папката"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Абониране за папката на друг потребител"
@@ -15302,14 +15170,14 @@ msgstr "Дървовидна структура на Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Преустановяване на абонамент за папката..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Отписване от папка „%s“?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Спиране на абонамента за „%s“"
@@ -15435,26 +15303,22 @@ msgid "Cannot display folders."
 msgstr "Папките не могат да бъдат показани."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Промените в настройките на абонамента към Exchange „{0}“ ще влязат в сила "
-"след като рестартирате Evolution."
+"Промените в настройките на абонаментите към Exchange ще влязат в сила след "
+"като рестартирате Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Неуспех при идентифицирането пред сървъра."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Не може да се смени паролата."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15464,55 +15328,55 @@ msgstr ""
 "поради неясна грешка. Проверете адресът-УРЛ, потребителското\n"
 "име и паролата и опитайте отново."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Не може да се осъществи връзка със сървъра на Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Не може да се осъществи връзка със сървъра {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Не може да се определят правата на делегатите за папката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Неуспех при търсенето на системата на уеб хранилището на Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Не може да бъде намерен сървъра {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "{0} не може да стане делегат"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Не могат да се прочетат правата за папката"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Не могат да се прочетат правата за папката"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Състоянието „Извън офиса“ не може да бъде прочетено."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Не могат да бъдат обновени правата за папката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Състоянието „Извън офиса“ не може да бъде обновено"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 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:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15541,28 +15405,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Неуспех при обновяването на делегатите:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Папката вече съществува"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Папката не съществува"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Папката е в режим „Изключена“"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Грешка"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15570,64 +15434,64 @@ msgstr ""
 "Ако OWA е стартиран с различен път, трябва да го укажете в диалога за "
 "настройките на абонамента."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Пощенската кутия за {0} не е на този сървър."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Уверете се, че адреса (URL) е правилен и опитайте отново."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Уверете се, че името на сървъра е изписано правилно и опитайте отново."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Уверете се, че потребителското име и паролата са правилни и опитайте отново."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Не е указан сървър за глобален каталог за този абонамент."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Няма пощенска кутия за потребителя {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Няма потребител: {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Паролата е променена успешно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "За да влязат промените в сила, рестартирайте Evolution"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Рестартирайте Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Изберете потребител."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Сървъра отхвърли паролата, защото е прекалено ненадеждна."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Абонаментът към Exchange ще бъде изключен, щом затворите Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Абонаментът към Exchange ще бъде премахнат, щом затворите Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Сървърът за Exchange не е съвместим с Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15635,7 +15499,7 @@ msgstr ""
 "На сървъра върви Exchange 5.5 Exchange Connector \n"
 "поддържа само Microsoft Exchange 2000 и 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15649,58 +15513,58 @@ msgstr ""
 "\n"
 "Възможно е и просто да сте написали погрешно паролата си."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Опитайте отново с различна парола."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Неуспех при добавяне на потребителя към списъка за контрол на достъпа:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Неуспех при редактирането на делегатите."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Неизвестна грешка при преглеждането на {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Неизвестна грешка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Неизвестен вид"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Операцията не се поддържа"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Почти сте запълнили квотата си за запазване на писма на този сървър."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Не може да направите себе си Ваш собствен делегат."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Надвишили сте квотата си за запазване на писма на този сървър."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Може да настроите само един абонамент към Exchange"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
 "В момента сте заели: {0}KB. Освободете малко място като изтриете писма."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -15708,7 +15572,7 @@ msgstr ""
 "В момента сте заели: {0}KB. Няма да можете нито да пращате, нито да "
 "получавате писма."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15716,19 +15580,19 @@ msgstr ""
 "В момента сте заели: {0}KB. Няма да можете да изпращате писма, докато не "
 "освободите място като изтриете малко писма."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Срокът на валидност на паролата Ви е изтекъл"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} не може да бъде добавен към списъка за контрол на достъпа"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} вече е делегат."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} вече е в списъка"
 
@@ -15923,10 +15787,7 @@ msgstr "Влизане в сървъра-посредник"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВъведете парола за %s (потребител %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "_Влизане в сървъра-посредник..."
 
@@ -15989,12 +15850,12 @@ msgid "Select Calendar"
 msgstr "Избор на календар"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Внасяне"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "файлов формат на iCalendar (.ics)"
 
@@ -16049,104 +15910,104 @@ msgstr ""
 "Списъкът с календари/задачи на Evolution не може да бъде отворен за "
 "изнасянето на данни."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Календарът „%s“ не може да се зареди."
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Среща в календара „%s“ се застъпва с тази"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Срещата е открита в календара „%s“."
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Не може да се открие нито един календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Тази среща не може да се открие в никой календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Тази задача не може да се открие в нито един списък със задачи"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Този запис не е открит в нито един дневник"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Търсене за съществуваща версия на тази среща"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Неуспех при анализирането на елемента"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Не може да се изпрати елемент към календара „%s“.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Изпратено до календар „%s“ като прието"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Изпратено до календар „%s“ като несигурен"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Изпратено до календар „%s“ като отказ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Изпратено до календар „%s“ като отменено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатора е махнал делегата %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "На делегата е изпратено известие за отмяна"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Не може да се изпрати известие за отмяна на делегатите"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Състоянието на присъстващия не може да бъде обновено заради невалидно "
 "състояние"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Неуспех при обновяването на участник. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Състоянието на присъстващия е обновено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Добавеният календар е невалиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16154,15 +16015,15 @@ msgstr ""
 "Писмото би трябвало да съдържа календар, но календарът не е валиден "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Обектът в календара не е валиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16170,11 +16031,11 @@ msgstr ""
 "Писмото съдържа календар, но в календара няма събития, задачи или данни за "
 "свободен/зает."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Добавеният календар съдържа множество обекти"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16184,17 +16045,17 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Изтриване на писмото след действието"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Търсене на застъпвания"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Избор на календари за проверка за застъпвания в събранията"
 
@@ -16539,26 +16400,26 @@ msgid "_Update"
 msgstr "_Обновяване"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Начало:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Край:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Изпращане на обновената информация на участниците"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "Прилагане към всички случаи"
 
@@ -16573,8 +16434,8 @@ msgstr "Вносители, тип Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr "„{0}“ е делегирал събранието. Искате ли да добавите делегата „{1}“?"
+"&quot;{1}&quot; ?"
+msgstr "„{0}“ е делегирал събранието. Искате ли да добавите делегата „{1}“ ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16815,7 +16676,7 @@ msgid "Mark All Read"
 msgstr "Отбелязване на всичко като прочетено"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Отбелязване на писмата като про_четени"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -17080,16 +16941,16 @@ msgstr "Запазване на прикрепените файлове..."
 msgid "Save all attachments"
 msgstr "Запазване на всички прикрепени файлове"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Избор на основното име за запис"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME тип"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Запазване"
 
@@ -17199,7 +17060,7 @@ msgid "RDF format (.rdf)"
 msgstr "Формат RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Избор на целеви файл"
 
@@ -17247,19 +17108,19 @@ msgstr ""
 "\n"
 "Натиснете бутона „Напред“. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Изберете информацията, която искате да внесете:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, 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:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Внасяне на данни."
 
@@ -17353,15 +17214,11 @@ msgstr ""
 "Пропускане на диалоговия прозорец с предупреждението за разработващата се "
 "версия"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Стартиране в режим „Изключен“"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Лентата за състоянието е видима"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17369,19 +17226,19 @@ msgstr ""
 "Подробна версия на настроките на Evolution - номер на версия/подверсия/"
 "конфигурационно ниво (напр. „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Стандартната височина на основния прозорец, в пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Стандартната ширина на основния прозорец, в пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Стандартна ширина на страничната лента, в пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17389,7 +17246,7 @@ msgstr ""
 "Подробна версия на последните настроки на Evolution - номер на версия/"
 "подверсия/конфигурационно ниво (напр. „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17399,47 +17256,43 @@ msgstr ""
 "„toolbar“. Ако зададете „toolbar“, стилът на изобразяване ще зависи от "
 "стандартните настройки на GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Лентата с инструменти е видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Дали Evolution да стартира в режим „Изключен“, вместо в режим „Включен“."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
-msgstr "Дали прозорцът да е максимизиран"
+msgstr "Дали прозорцът да е максимизиран."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Дали страничната лента е видима."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Дали лентата за състоянието трябва да е видима."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Дали лентата с инструменти трябва да е видима."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Дали предупредителното съобщение в нестабилните версии на Evolution, да бъде "
 "показвано."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Дали бутоните на прозорците да са видими."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Стил на бутоните на прозорците"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Бутоните на прозорците са видими"
 
@@ -17461,11 +17314,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Без име)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Изберете типа на вносителя за изпълнение:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17479,11 +17332,11 @@ msgstr ""
 "Ако не знаете, може да изберете „Автоматично“ и Evolution ще се опита да го "
 "определи."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Изберете къде да бъде внесена тази информация"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17495,23 +17348,23 @@ msgstr ""
 "намерено нищо за внасяне. Ако искате да\n"
 "опитате отново, то натиснете бутона „Назад“.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Име на _файл:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Избор на файл"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Тип на файла:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Внасяне на информация и настройки от по-_стари програми"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Внасяне на _единичен файл"
 
@@ -17575,7 +17428,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "Работа в режим „_Включен“"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "Работа в режим „_Изключен“"
 
@@ -17604,40 +17457,32 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Превключване към %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Непозната системна грешка."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "Да"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Грешни аргументи"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Не може да регистрира в OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Конфигурационната база от данни не е намерена"
 
-#: ../shell/e-user-creatable-items-handler.c:689
-#: ../shell/e-user-creatable-items-handler.c:748
-msgid " New "
-msgstr " Нов "
-
-#: ../shell/e-user-creatable-items-handler.c:693
-#: ../shell/e-user-creatable-items-handler.c:705
-#: ../shell/e-user-creatable-items-handler.c:752
-#: ../shell/e-user-creatable-items-handler.c:764
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Нов"
 
@@ -17692,7 +17537,7 @@ msgstr ""
 "внасяне на външни файлове в Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17726,7 +17571,7 @@ msgstr ""
 "Надяваме се резултатът от усилената ни работа да Ви радва\n"
 "и с нетърпение очакваме да ни помогнете в разработката!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17734,39 +17579,35 @@ msgstr ""
 "Благодарности\n"
 "От екипа на Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Да не се показва отново"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Стартиране на Evolution, активирайки избрания компонент"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Стартиране в режим „Включен“"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Принудително затваряне на всички компоненти на Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Принудително мигриране от Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Изпращане изхода от дебъга на всички компоненти във файл."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Спиране зареждането на каквито и да е приставки."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr " - организатор и пощенски клиент - Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18202,7 +18043,7 @@ msgid "_Edit CA Trust"
 msgstr "_Редактиране на 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:664
 msgid "Certificate already exists"
 msgstr "Сертификатът вече съществува"
 
@@ -18434,12 +18275,6 @@ 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-tasks.xml.h:2
-msgid "Copy"
-msgstr "Копиране"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Копиране на избраните контакти в друга папка..."
@@ -18541,7 +18376,7 @@ msgid "Select All"
 msgstr "Избор на всичко"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Избор на _всичко"
@@ -18611,7 +18446,7 @@ msgstr "Пре_местване на контакта в..."
 msgid "_Move Folder Contacts To"
 msgstr "Пре_местване на папката с контакти в"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Нов"
 
@@ -18672,7 +18507,6 @@ msgid "Month"
 msgstr "Месец"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Следващ"
 
@@ -18681,7 +18515,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Преглед на календар за печат"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Предишен"
 
@@ -18769,11 +18603,11 @@ msgstr "Изрязване на избраното в буфера за обме
 msgid "Paste from clipboard"
 msgstr "Поставяне от буфера за обмен"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Поставяне на текст от буфера за обмен"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Избиране на целия текст"
 
@@ -18808,31 +18642,30 @@ msgstr "Натиснете тук, за да прегледате налична
 msgid "Close"
 msgstr "Затваряне"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Вмъква_не"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Прикрепен..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Затваряне"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Файл"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Помощ"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Вмъкване"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Настройки"
@@ -18932,11 +18765,6 @@ msgstr "Превключване между това дали времето д�
 msgid "_Alarms"
 msgstr "_Аларми"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Категории"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19002,73 +18830,53 @@ msgid "F_older"
 msgstr "П_апка"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Пре_глед на писмата"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Преместване на избраната папка в друга"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h: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 "Търсене в папк_и"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Показване на _преглед на писмо"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Показване на преглед на писмо под списъка с писма"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Показване на преглед на писмо до списъка с писма"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Показване на предишен прозорец на писмо"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Абониране и отписване за папки на отдалечени сървъри"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Класически изглед"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Копиране на папката в..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Пощенски _филтри"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "Пре_местване на папка в..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Нов..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Преглед"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Абонаменти"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "_Вертикален изглед"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Промяна на името на тази папка"
@@ -19626,10 +19434,6 @@ msgid "_Unread"
 msgstr "_Непрочетено"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Увеличаване"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Намаляване"
 
@@ -19637,7 +19441,7 @@ msgstr "_Намаляване"
 msgid "Close this window"
 msgstr "Затваряне на този прозорец"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Главна лента с инструменти"
 
@@ -19712,6 +19516,11 @@ msgstr "Получаване на известие, когато писмото
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Вмъква_не"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Отваряне на файл"
@@ -19800,11 +19609,13 @@ msgstr "Подписване с Вашия сертификат за S/MIME за
 #: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
-"Превключване между това дали полето „Скрито копие“ да бъде показвано или не"
+"Превключване между това дали полето „Скрито копие до“ да бъде показвано или "
+"не"
 
 #: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the CC field is displayed"
-msgstr "Превключване между това дали полето „Копие“ да бъде показвано или не"
+msgstr ""
+"Превключване между това дали полето „Копие до“ да бъде показвано или не"
 
 #: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the From chooser is displayed"
@@ -19827,11 +19638,11 @@ msgstr "Превключване между това дали полето „Д
 
 #: ../ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
-msgstr "Поле „_Скрито копие“"
+msgstr "Поле „_Скрито копие до“"
 
 #: ../ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
-msgstr "Поле „_Копие“"
+msgstr "Поле „_Копие до“"
 
 #: ../ui/evolution-message-composer.xml.h:45
 msgid "_Delete all"
@@ -20045,51 +19856,43 @@ msgstr "_Икони и текст"
 msgid "Import data from other programs"
 msgstr "Внасяне на данни от други програми"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "Подред_ба"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Нов _прозорец"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Настройки"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Изпращане/получаване"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "_Изпращане/получаване"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Изпращане на обекти, чакащи на опашката и извличане на нови обекти."
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Настройка на Pilot"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Показване на информация относно Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
+msgid "Side _Bar"
 msgstr "Ст_ранична лента"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Лента за _състоянието"
+msgid "Status _Bar"
+msgstr "Лента за състоянието"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Лента с _инструменти"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Показване на информация относно Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Изпращане на доклад за грешка"
 
@@ -20097,71 +19900,75 @@ msgstr "Изпращане на доклад за грешка"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Изпращане на _доклад за грешка"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Изпращане на доклад за грешка чрез Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Превключване на работа в режим „Включен“/„Изключен“"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Лента с _инструменти"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Стил на лентата с _инструменти"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Показване/скриване на страничната лента"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Показване/Скриване на лентата за състоянието"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Относно:"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "Зат_варяне на този прозорец"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Изчистване на запомнените _пароли"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Скриване на бутоните"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Са_мо икони"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Бърза справка"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Спиране на програмата"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Изглед на превключвател"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Опции за _синхронизация..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Само _текст"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Прозорец"
 
@@ -20198,34 +20005,26 @@ msgid "_Work Week View"
 msgstr "Изглед за _работна седмица"
 
 #: ../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 "Като папка за _изпратените"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "По съ_стояние"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "По изпра_щач"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "По _тема"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "По _последователност в разговора"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "За широк изглед"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Писма"
 
@@ -20241,12 +20040,8 @@ 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20302,7 +20097,7 @@ msgid "_Edit..."
 msgstr "_Редактиране..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20367,19 +20162,14 @@ msgstr "Вид изглед"
 msgid "Type of view:"
 msgstr "Вид изглед:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Предлагане на автоматично показване на прикрепен обект"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "ПВСЧПСН"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20447,7 +20237,7 @@ msgid "Minimum Width"
 msgstr "Минимална ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Разстояние"
 
@@ -20589,23 +20379,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Разширен"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Дали разширителя е разширен или не"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Текст на етикета на разширителя"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Използване на подчертаване"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20613,90 +20403,74 @@ msgstr ""
 "Ако е зададено, подчертаването в текста обозначава, че следващия знак трябва "
 "да се използва като клавиш за мнемоничен ускорител"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Разстояние, което да бъде поставено между етикета и детето"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Графичен обект за етикети"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Графичен обект за показване на място на обичайния етикет на разширителя"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Размер на разширителя"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Размер на стрелката на разширителя"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Разстояние на индикатора"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Разстояние около стрелката за оразмеряване"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Допълнително търсене"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Запазване на търсенето"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Търсения"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Търсения"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Запазване на търсенето"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Запазване на търсенето..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Редактиране на запазени търсения..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Разширено търсене..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Всички абонаменти"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Текущ абонамент"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Текуща папка"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Текущо писмо"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 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."
@@ -20728,45 +20502,45 @@ msgstr "Модел на изливане на текста"
 msgid "Column width"
 msgstr "Ширина на колоната"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Търсене"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Търсене"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Намиране сега"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "Изчиств_ане"
 
-#: ../widgets/misc/e-search-bar.c:787
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Тип търсене"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Идентификатор на елемента"
 
-#: ../widgets/misc/e-search-bar.c:794 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "Идентификатор на поделемента"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Текст"
 
-#. 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:913
-msgid "Show: "
-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:929
-msgid "S_earch: "
-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:940
-msgid " in "
-msgstr " в "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Търсене _сега"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20966,23 +20740,23 @@ msgstr "Фокусирана колона"
 msgid "Unselected Column"
 msgstr "Неизбрана колона"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Зачертана колона"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Подчертана колона"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Получерна колона"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Оцветена колона"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Фонов цвят на колона"
 
@@ -20997,7 +20771,6 @@ msgstr "_Налични полета:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Възходящо"
 
@@ -21008,7 +20781,6 @@ 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 "Descending"
 msgstr "Низходящо"
 
@@ -21106,14 +20878,14 @@ msgstr "_Показване на тези полета в реда:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "ИиП код"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Пълна заглавна част"
 
@@ -21231,69 +21003,65 @@ msgstr "Стандартна височина на колона"
 msgid "Frozen"
 msgstr "От"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Персонифициране на текущия изглед"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Възходящо подреждане"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Низходящо подреждане"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Премахване на подреждането"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Групиране по това поле"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Групиране по кутия"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Премахване на тази колона"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Добавяне на колона..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Подравняване"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Съразмерно екрана"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Форматиране на колони..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Персонифициране на текущия изглед..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Подреждане по"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Набор от шрифтове"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Информация за подреждането"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
diff --git a/po/br.po b/po/br.po
new file mode 100644
index 0000000000..d847b7ca89
--- /dev/null
+++ b/po/br.po
@@ -0,0 +1,20471 @@
+# Breton translation of evolution.
+# Copyright (C) 2004-2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the evolution package.
+# Jérémy Ar Floc'h <jeremy.lefloch@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: Evolution 2-14\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-14 02:39-0500\n"
+"PO-Revision-Date: 2006-05-13 14:07+0000\n"
+"Last-Translator: tangi.bzh <tangidan@yahoo.fr>\n"
+"Language-Team: GNOME Breton team <jeremy.lefloch@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:169
+msgid "evolution addressbook"
+msgstr "karned chomlec'h evolution"
+
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:226
+msgid "New Contact"
+msgstr "Darempred nevez"
+
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:234
+msgid "New Contact List"
+msgstr "Roll darempred nevez"
+
+#: ../a11y/addressbook/ea-minicard-view.c:152
+#, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "Ar renkell karned chomlec'h en implij en deus %d kartenn"
+msgstr[1] "Ar renkell karned chomlec'h en implij en deus %d kartenn"
+
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../ui/evolution-message-composer.xml.h:12
+msgid "Open"
+msgstr "Digeriñ"
+
+#: ../a11y/addressbook/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Roll an darempredoù "
+
+#: ../a11y/addressbook/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Darempred: "
+
+#: ../a11y/addressbook/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "Kartenn vihan Evolution"
+
+#: ../a11y/calendar/ea-cal-view-event.c:266
+msgid "It has alarms."
+msgstr "Alarmoù en deus."
+
+#: ../a11y/calendar/ea-cal-view-event.c:269
+msgid "It has recurrences."
+msgstr "Adwezhioù en deus."
+
+#: ../a11y/calendar/ea-cal-view-event.c:272
+msgid "It is a meeting."
+msgstr "Un emvod eo."
+
+#: ../a11y/calendar/ea-cal-view-event.c:278
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Degouezh deiziadurel: ar berrskrid 'zo %s."
+
+#: ../a11y/calendar/ea-cal-view-event.c:280
+msgid "Calendar Event: It has no summary."
+msgstr "Degouezh deiziadurel: n'eus ket berrskrid."
+
+#: ../a11y/calendar/ea-cal-view-event.c:299
+msgid "calendar view event"
+msgstr "Sell degouezhioù an deiziadur"
+
+#: ../a11y/calendar/ea-cal-view-event.c:528
+msgid "Grab Focus"
+msgstr "Tapout ar Fokus"
+
+#: ../a11y/calendar/ea-cal-view.c:302
+msgid "New Appointment"
+msgstr "Emgav nevez"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "New All Day Event"
+msgstr "Degouezh nevez un devezh a-bezh"
+
+#: ../a11y/calendar/ea-cal-view.c:304
+msgid "New Meeting"
+msgstr "Emvod nevez"
+
+#: ../a11y/calendar/ea-cal-view.c:305
+msgid "Go to Today"
+msgstr "Mont d'an deiz a hiziv"
+
+#: ../a11y/calendar/ea-cal-view.c:306
+msgid "Go to Date"
+msgstr "Mont d'an deiziad"
+
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr "un daolenn 'benn diskouez pe dibab stumm an eur"
+
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "%d degouezh en deus."
+msgstr[1] "%d degouezh en deus."
+
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
+msgid "It has no events."
+msgstr "N'en deus degouezhioù ebet."
+
+#: ../a11y/calendar/ea-day-view.c:155
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Sell labour sizhuniek: %s. %s"
+
+#: ../a11y/calendar/ea-day-view.c:158
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Sell bemdeziek: %s. %s"
+
+#: ../a11y/calendar/ea-day-view.c:189
+msgid "calendar view for a work week"
+msgstr "Sell an deiziadur evit ur sizhunvezh labour"
+
+#: ../a11y/calendar/ea-day-view.c:191
+msgid "calendar view for one or more days"
+msgstr "Sell an deiziadur evit unan pe meur a zeiz"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:661
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:772
+msgid "Gnome Calendar"
+msgstr "Deiziadur Gnome"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:290
+msgid "search bar"
+msgstr "Barrenn enklask"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:291
+msgid "evolution calendar search bar"
+msgstr "Barrenn enklask deiziadur Evolution"
+
+#: ../a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr "Nozelenn sailh"
+
+#: ../a11y/calendar/ea-jump-button.c:158
+msgid "Click here, you can find more events."
+msgstr "En ur glikañ amañ, e c'hallez kavout muioc'h a zegouezhioù."
+
+#: ../a11y/calendar/ea-week-view.c:157
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Sell mizieg: %s. %s"
+
+#: ../a11y/calendar/ea-week-view.c:161
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Sell sizhunieg: %s. %s"
+
+#: ../a11y/calendar/ea-week-view.c:192
+msgid "calendar view for a month"
+msgstr "Sell an deiziadur evit ur mizvezh"
+
+#: ../a11y/calendar/ea-week-view.c:194
+msgid "calendar view for one or more weeks"
+msgstr "Sell an deiziadur evit unan pe muioc'h a sizhunioù"
+
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+msgid "popup"
+msgstr "prenestr-trumm"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+msgid "popup a child"
+msgstr "diskouezh ur mab"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+msgid "edit"
+msgstr "embann"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+msgid "begin editing this cell"
+msgstr "kregiñ gant embann ar gell-mañ"
+
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+msgid "toggle"
+msgstr "kemmañ"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+msgid "toggle the cell"
+msgstr "kemmañ ar gell"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+msgid "expand"
+msgstr "astenn"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+msgid "expands the row in the ETree containing this cell"
+msgstr "astenn al linenn e-barzh an ETree a zalc'h ar gell-mañ"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+msgid "collapse"
+msgstr ""
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+msgid "collapses the row in the ETree containing this cell"
+msgstr ""
+
+#: ../a11y/e-table/gal-a11y-e-cell.c:107
+msgid "Table Cell"
+msgstr "Kell an daolenn"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
+#: ../widgets/table/e-table-click-to-add.c:574
+msgid "click to add"
+msgstr "klikit evit ouzhpennañ"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+msgid "click"
+msgstr "klikit"
+
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+msgid "sort"
+msgstr "dibab"
+
+#: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../a11y/widgets/ea-calendar-item.c:304
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Deiziadur: eus %s beteg %s"
+
+#: ../a11y/widgets/ea-calendar-item.c:339
+msgid "evolution calendar item"
+msgstr "Elfenn an deiziadur Evolution"
+
+#: ../a11y/widgets/ea-combo-button.c:40
+msgid "Combo Button"
+msgstr ""
+
+#: ../a11y/widgets/ea-combo-button.c:50
+msgid "Activate Default"
+msgstr "Implij an dibab dre-ziouer"
+
+#: ../a11y/widgets/ea-combo-button.c:52
+msgid "Popup Menu"
+msgstr "Meuziad prenistri trumm"
+
+#: ../addressbook/addressbook.error.xml.h:1
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Un darempred a zo anezhañ dija gant ar chomlec'h-mañ. C'hoant az pefe "
+"ouzhpennañ ur gartenn nevez gant ar memes chomlec'h memestra?"
+
+#: ../addressbook/addressbook.error.xml.h:2
+msgid "Address '{0}' already exists."
+msgstr "Ar chomlec'h '{0}' a zo anezhañ dija."
+
+#: ../addressbook/addressbook.error.xml.h:3
+msgid "Cannot move contact."
+msgstr "N'eus ket tu da zilec'hiañ an darempred."
+
+#: ../addressbook/addressbook.error.xml.h:4
+msgid "Category editor not available."
+msgstr "An aozer rummadoù n'eo ket hegerz."
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Gwiriekait hag eñ eo bet distaget mad ho ker-kuzh hag emaoc'h oc'h implijout "
+"un doare mad d'en em lugañ. Dalc'hit sonj o deus ar gerioù-kuzh doujans deus "
+"stummoù al lizherennoù; marteze emañ ho 'caps lock' lakaet war implij."
+
+#: ../addressbook/addressbook.error.xml.h:6
+msgid "Could not get schema information for LDAP server."
+msgstr "Dic'houest da gaout keloù war stumm an tres evit ar sevijer LDAP."
+
+#: ../addressbook/addressbook.error.xml.h:7
+msgid "Could not remove addressbook."
+msgstr "N'eus ket tu dilemel ar c'harned chomlec'h."
+
+#: ../addressbook/addressbook.error.xml.h:8
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:9
+msgid "Delete address book '{0}'?"
+msgstr "Dilemel ar c'harned chomlec'h '{0}'?"
+
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Error loading addressbook."
+msgstr "Fazi o kargañ ar c'harned chomlec'h."
+
+#: ../addressbook/addressbook.error.xml.h:11
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Fazi o wareziñ {0} war-du {1}: {2}"
+
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "Failed to authenticate with LDAP server."
+msgstr "Fazi oc'h en em kinnig da servijer LDAP."
+
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "GroupWise Address book creation:"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:14
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Ne respont ket LDAP gant keloù ur stumm-tres mad."
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid "Server Version"
+msgstr "Aozerezh ar servijer"
+
+#: ../addressbook/addressbook.error.xml.h:16
+msgid "Some features may not work properly with your current server"
+msgstr "Marteze ne 'z' a ket traoù 'zo en dro gant stad a vremañ ho servijer"
+
+#: ../addressbook/addressbook.error.xml.h:17
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Kuitaet en deus karned chomlec'h Evolution hep abeg."
+
+#: ../addressbook/addressbook.error.xml.h:18
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Bras a walc'h eo ar skeudenn ho peus dibabet. Daoust ha c'hoant 'pefe "
+"adventañ ha gwareziñ anezhi?"
+
+#: ../addressbook/addressbook.error.xml.h:19
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Sur walc'h e implij ar servijer LDAP se un aozerezh LDAP kozhoc'h n'eo ket "
+"evit gouzañv seurt urzhioù pe n'eo ket bet stummet mad. Goulennit digant ho "
+"aozer-sistem 'benn kaout an urzhioù diazez asantet."
+
+#: ../addressbook/addressbook.error.xml.h:20
+msgid "This address book will be removed permanently."
+msgstr "Skarzhet 'vo ar c'harned-chomlec'h se da viken."
+
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "This addressbook could not be opened."
+msgstr "Ne c'hell ket ar c'harned-chomlec'h se bezañ digoret."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+"N'eo ket ar c'harned-chomlec'h se 'vit gouzañv keloù stumm-tres LDAPv3."
+
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "Unable to open addressbook"
+msgstr "Dic'houest da zigeriñ ar c'harned-chomlec'h"
+
+#: ../addressbook/addressbook.error.xml.h:26
+msgid "Unable to perform search."
+msgstr "Dic'houest da gas an enklask da benn."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "Unable to save {0}."
+msgstr "Dic'houest da wareziñ {0}."
+
+#: ../addressbook/addressbook.error.xml.h:28
+msgid "Would you like to save your changes?"
+msgstr "C'hoant 'pefe gwareziñ ar cheñchamantoù?"
+
+#: ../addressbook/addressbook.error.xml.h:29
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Klask a reoc'h dilec'hiañ un darempred deus ur c'harned-chomlec'h beteg un "
+"all met ne c'hell ket bezañ skarzhet deus ar c'harned a orin. C'hoant 'pefe "
+"gwareziñ un eilskouer dioutañ?"
+
+#: ../addressbook/addressbook.error.xml.h:30
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:31
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+"Kemmet eo bet an darempred se. C'hoant 'pefe gwareziñ ar cheñchamantoù?"
+
+#: ../addressbook/addressbook.error.xml.h:32
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Ne vo ket tu deoc'h kaout darempredoù {0} araog bezañ digoret Evolution en "
+"dro."
+
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
+#: ../plugins/groupwise-features/junk-settings.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:15
+msgid "_Add"
+msgstr "_Ouzhpennañ"
+
+#: ../addressbook/addressbook.error.xml.h:34
+msgid "_Discard"
+msgstr "_Nullañ"
+
+#: ../addressbook/addressbook.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+msgid "{0}"
+msgstr "{0}"
+
+#: ../addressbook/addressbook.error.xml.h:36
+msgid "{1}"
+msgstr "{1}"
+
+#: ../addressbook/conduit/address-conduit.c:300
+msgid "Default Sync Address:"
+msgstr "Chomlec'h kenlusk a ziouer:"
+
+#: ../addressbook/conduit/address-conduit.c:1241
+#: ../addressbook/conduit/address-conduit.c:1242
+msgid "Could not load addressbook"
+msgstr "Dic'houest da gargañ ar c'harned-chomlec'h"
+
+#: ../addressbook/conduit/address-conduit.c:1310
+#: ../addressbook/conduit/address-conduit.c:1313
+msgid "Could not read pilot's Address application block"
+msgstr "Dic'houest da lenn blok blenier poellad ar chomlec'hioù"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "D_arempredoù"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Testennioù"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr ""
+
+#. Create the contacts group
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
+msgid "Contacts"
+msgstr "Darempredoù"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book"
+msgstr "Karned-chomlec'h Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address pop-up"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book address viewer"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book card viewer"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Address Book component"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr ""
+
+#. create the local source group
+#. On This Computer is always first and Search Folders is always last
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:483
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
+#: ../mail/mail-vfolder.c:223
+msgid "On This Computer"
+msgstr ""
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. Create the default Person addressbook
+#. orange
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
+msgid "Personal"
+msgstr "Personelaet"
+
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+msgid "On LDAP Servers"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-component.c:227
+msgid "_Contact"
+msgstr "Darempred"
+
+#: ../addressbook/gui/component/addressbook-component.c:228
+msgid "Create a new contact"
+msgstr "Krouiñ un darempred nevez"
+
+#: ../addressbook/gui/component/addressbook-component.c:235
+msgid "Contact _List"
+msgstr "Roll an darempredoù"
+
+#: ../addressbook/gui/component/addressbook-component.c:236
+msgid "Create a new contact list"
+msgstr "Krouiñ roll an darempredoù nevez"
+
+#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-config.c:1202
+msgid "New Address Book"
+msgstr "Karned chomlec'h nevez"
+
+#: ../addressbook/gui/component/addressbook-component.c:243
+msgid "Address _Book"
+msgstr "Karned chomlec'h"
+
+#: ../addressbook/gui/component/addressbook-component.c:244
+msgid "Create a new address book"
+msgstr "Krouiñ ur c'harned chomlec'h nevez"
+
+#: ../addressbook/gui/component/addressbook-component.c:406
+msgid "Failed upgrading Address Book settings or folders."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:329
+msgid "Base"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:192
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "Seurt :"
+
+#: ../addressbook/gui/component/addressbook-config.c:632
+msgid "Copy book content locally for offline operation"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "Hollek"
+
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
+#: ../mail/importers/pine-importer.c:392
+msgid "Address Book"
+msgstr "Karned chomlec'h"
+
+#: ../addressbook/gui/component/addressbook-config.c:986
+msgid "Server Information"
+msgstr "Titour ar servijer"
+
+#: ../addressbook/gui/component/addressbook-config.c:988
+msgid "Authentication"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "Munud"
+
+#: ../addressbook/gui/component/addressbook-config.c:992
+msgid "Searching"
+msgstr "O klask"
+
+#: ../addressbook/gui/component/addressbook-config.c:994
+msgid "Downloading"
+msgstr "O pellgargañ"
+
+#: ../addressbook/gui/component/addressbook-config.c:1200
+#: ../addressbook/gui/component/ldap-config.glade.h:13
+msgid "Address Book Properties"
+msgstr "Perzhioù ar c'harned chomlec'h"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
+msgid "Migrating..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
+#, c-format
+msgid "Migrating `%s':"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:629
+msgid "LDAP Servers"
+msgstr "Servijeroù LDAP"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:744
+msgid "Autocompletion Settings"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "Adenvel ar renkell"
+
+#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:445
+msgid "A Folder with this name already exists"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:953
+msgid "_New Address Book"
+msgstr "Karned chomlec'h nevez"
+
+#. FIXME: need to disable for undeletable folders
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "Dilemel"
+
+#: ../addressbook/gui/component/addressbook-view.c:956
+msgid "Save As Vcard..."
+msgstr "Gwarediñ evel Vcard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
+msgid "_Properties..."
+msgstr "Perzhioù..."
+
+#: ../addressbook/gui/component/addressbook-view.c:1346
+msgid "Contact Source Selector"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook.c:99
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
+msgid "Failed to authenticate.\n"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Roit ar ger-kuzh evit %s (implijer %s)"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "Autocomplete length"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid "EFolderList XML for the list of completion URIs"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "EFolderList XML for the list of completion URIs."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+msgid "Show preview pane"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+msgid "Vertical pane position"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+msgid "Whether to show the preview pane."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
+msgid "3268"
+msgstr "3268"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:3
+msgid "389"
+msgstr "389"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:4
+msgid "5"
+msgstr "5"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:5
+msgid "636"
+msgstr "636"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+msgid "<b>Display</b>"
+msgstr "<b>Diskouez</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:8
+msgid "<b>Downloading</b>"
+msgstr "<b>O pellgargañ</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:9
+msgid "<b>Searching</b>"
+msgstr "<b>O klask</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:10
+msgid "<b>Server Information</b>"
+msgstr "<b>Titour ar servijer</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:11
+msgid "<b>Type:</b>"
+msgstr "<b>Seurt :</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+msgid "Add Address Book"
+msgstr "Ouzhpennañ ur c'harned chomlec'h"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../mail/em-account-editor.c:777
+msgid "Always"
+msgstr "Atav"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "Anonymously"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
+msgid "Basic"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+msgid "Distinguished name"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid "Email address"
+msgstr "Chomlec'h postel"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:20
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid "Find Possible Search Bases"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+msgid "Lo_gin:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:776
+msgid "Never"
+msgstr "Morse"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:304
+msgid "No encryption"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "One"
+msgstr "Unan"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:312
+msgid "SSL encryption"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search Filter"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search _base:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid "Search _filter:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+msgid "Search filter"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+msgid "Sub"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:37
+msgid "Supported Search Bases"
+msgstr ""
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:308
+msgid "TLS encryption"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:40
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:41
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:43
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:44
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:46
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+msgid "Using email address"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:48
+msgid "Whenever Possible"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:49
+msgid "_Add Address Book"
+msgstr "Ouzhpennañ ur c'harned chomlec'h"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Download limit:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+msgid "_Find Possible Search Bases"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:52
+msgid "_Login method:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+msgid "_Name:"
+msgstr "Anv :"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+msgid "_Port:"
+msgstr "Porzh :"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:55
+msgid "_Search scope:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+msgid "_Server:"
+msgstr "Servijer :"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:57
+msgid "_Timeout:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:58
+msgid "_Use secure connection:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:59
+msgid "cards"
+msgstr "kartennoù"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
+#: ../plugins/calendar-http/calendar-http.c:286
+#: ../plugins/calendar-weather/calendar-weather.c:563
+msgid "minutes"
+msgstr "munutoù"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "<b>Email</b>"
+msgstr "<b>Postel</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "<b>Home</b>"
+msgstr "<b>Chomlec'h</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "<b>Instant Messaging</b>"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "<b>Job</b>"
+msgstr "<b>Micher</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>A bep seurt</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "<b>Other</b>"
+msgstr "<b>All</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "<b>Telephone</b>"
+msgstr "<b>Pellgomz</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "<b>Web Addresses</b>"
+msgstr "<b>Gwiadva</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+msgid "<b>Work</b>"
+msgstr "<b>Labour</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:182
+msgid "Contact"
+msgstr "Darempred"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
+msgid "Contact Editor"
+msgstr "Aozer darempredoù"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Full _Name..."
+msgstr "Anv leun..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Image"
+msgstr "Skeudenn"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+msgid "MSN Messenger"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "Mailing Address"
+msgstr "Chomlec'h postel"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Ni_ckname:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+msgid "Novell Groupwise"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "Personal Information"
+msgstr "Titouroù personelaet"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "Telephone"
+msgstr "Pellgomz"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
+msgid "Work"
+msgstr "Labour"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_Address:"
+msgstr "Chomlec'hioù"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Anniversary:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Assistant:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Birthday:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1652
+msgid "_Calendar:"
+msgstr "Deiziadur :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "Rummadoù"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_City:"
+msgstr "Kêr :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Company:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Country:"
+msgstr "Bro :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Department:"
+msgstr "Departament :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_File under:"
+msgstr "Restr dindan :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Free/Busy:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Home Page:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_Manager:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+msgid "_Notes:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+msgid "_Office:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_PO Box:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+msgid "_Profession:"
+msgstr "Micher :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+msgid "_Spouse:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_State/Province:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+msgid "_Title:"
+msgstr "Titl :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+msgid "_Video Chat:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+msgid "_Wants to receive HTML mail"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+msgid "_Web Log:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+msgid "_Where:"
+msgstr "Pelec'h :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "_Zip/Postal Code:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
+msgid "Address"
+msgstr "Chomlec'h"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
+#: ../addressbook/gui/widgets/e-minicard-view.c:520
+#: ../addressbook/gui/widgets/e-minicard.c:175
+#: ../widgets/menus/gal-define-views-model.c:181
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
+msgid "Editable"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "United States"
+msgstr "Stadoù Unanet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Albania"
+msgstr "Albani"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+msgid "Algeria"
+msgstr "Aljeri"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+msgid "American Samoa"
+msgstr "Samoa (SU)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+msgid "Andorra"
+msgstr "Andorre"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+msgid "Angola"
+msgstr "Angola"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+msgid "Antarctica"
+msgstr "Antartik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Antigua And Barbuda"
+msgstr "Antigua ha Barbuda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+msgid "Argentina"
+msgstr "Arc'hantin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Armenia"
+msgstr "Armeni"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+msgid "Aruba"
+msgstr "Aruba"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+msgid "Australia"
+msgstr "Aostralia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+msgid "Austria"
+msgstr "Aotrich"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Azerbaijan"
+msgstr "Azerbaijan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+msgid "Barbados"
+msgstr "Barbados"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+msgid "Belgium"
+msgstr "Beljik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "Belize"
+msgstr "Belize"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Benin"
+msgstr "Benin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+msgid "Bolivia"
+msgstr "Bolivi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+msgid "Bosnia And Herzegowina"
+msgstr "Bosnie Herzegovine"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+msgid "Botswana"
+msgstr "Botswana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+msgid "Bouvet Island"
+msgstr "Enez Bouvet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Brazil"
+msgstr "Brezil"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+msgid "Brunei Darussalam"
+msgstr "runei Darussalam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+msgid "Bulgaria"
+msgstr "Bulgari"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "Burundi"
+msgstr "Burundi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+msgid "Cambodia"
+msgstr "Kambodj"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Cameroon"
+msgstr "Kameroun"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "Cape Verde"
+msgstr "Kap Gwer"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+msgid "Cayman Islands"
+msgstr "Inizi Cayman"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Central African Republic"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+msgid "Chad"
+msgstr "Tchad"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+msgid "Chile"
+msgstr "Chili"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "China"
+msgstr "Sina"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+msgid "Christmas Island"
+msgstr "Enez Nedeleg"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+msgid "Colombia"
+msgstr "Kolombi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+msgid "Comoros"
+msgstr "Comoros"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+msgid "Congo"
+msgstr "Kongo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+msgid "Congo, The Democratic Republic Of The"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+msgid "Cook Islands"
+msgstr "Inizi Cook"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+msgid "Croatia"
+msgstr "Croitia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+msgid "Cuba"
+msgstr "Cuba"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+msgid "Cyprus"
+msgstr "Cyprus"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Czech Republic"
+msgstr "Republik tchek"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+msgid "Denmark"
+msgstr "Danmark"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Dominica"
+msgstr "Dominik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+msgid "Dominican Republic"
+msgstr "Republik dominikan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Ecuador"
+msgstr "Kehider"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Egypt"
+msgstr "Ejipt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+msgid "El Salvador"
+msgstr "Salvador"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "Estonia"
+msgstr "Estoni"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "Ethiopia"
+msgstr "Ethiopi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "Falkland Islands"
+msgstr "Inizi Falklands"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "Faroe Islands"
+msgstr "Inizi Faroe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+msgid "Fiji"
+msgstr "Fiji"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+msgid "Finland"
+msgstr "Finlan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+msgid "France"
+msgstr "Bro-C'hall"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+msgid "French Guiana"
+msgstr "Guine Gallaoued"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+msgid "French Polynesia"
+msgstr "Polinesi Gallaoued"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+msgid "Gabon"
+msgstr "Gabon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Gambia"
+msgstr "Gambi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Georgia"
+msgstr "Jeorji"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+msgid "Germany"
+msgstr "Alamagn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+msgid "Greece"
+msgstr "Gres"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+msgid "Greenland"
+msgstr "Greenland"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Grenada"
+msgstr "Grenad"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guadeloupe"
+msgstr "Gwadeloup"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+msgid "Guam"
+msgstr "Guam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+msgid "Guernsey"
+msgstr "Guernsey"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+msgid "Guinea"
+msgstr "Guine"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+msgid "Guinea-bissau"
+msgstr "Guine-bissau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Guyana"
+msgstr "Gwiana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+msgid "Haiti"
+msgstr "Haiti"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Heard And McDonald Islands"
+msgstr "Inizi Head ha McDonald"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+msgid "Holy See"
+msgstr "Vatikan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+msgid "Honduras"
+msgstr "Honduras"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+msgid "Hungary"
+msgstr "Hongri"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+msgid "Iceland"
+msgstr "Island"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+msgid "India"
+msgstr "Indez"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Indonesia"
+msgstr "Indonezi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+msgid "Iran"
+msgstr "Iran"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Ireland"
+msgstr "Iwerzhon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+msgid "Isle of Man"
+msgstr "Enez Man"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+msgid "Israel"
+msgstr "Israel"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+msgid "Italy"
+msgstr "Itali"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Jamaica"
+msgstr "Jamaik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Japan"
+msgstr "Japon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Jersey"
+msgstr "Jersey"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+msgid "Jordan"
+msgstr "Jordan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+msgid "Kenya"
+msgstr "Kenya"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Korea, Democratic People's Republic Of"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+msgid "Korea, Republic Of"
+msgstr "Kore, Republik Ar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Kuwait"
+msgstr "Kowait"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Laos"
+msgstr "Laos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+msgid "Latvia"
+msgstr "Letoni"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Lebanon"
+msgstr "Liban"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Liberia"
+msgstr "Liberia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Libya"
+msgstr "Libi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+msgid "Lithuania"
+msgstr "Lithuani"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Luxembourg"
+msgstr "Luksembourg"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Macao"
+msgstr "Macao"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+msgid "Macedonia"
+msgstr "Makedonia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+msgid "Madagascar"
+msgstr "Madagascar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Malawi"
+msgstr "Malawi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+msgid "Malaysia"
+msgstr "Malezia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Maldives"
+msgstr "Maldives"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+msgid "Mali"
+msgstr "Mali"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Malta"
+msgstr "Malt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Marshall Islands"
+msgstr "Inizi Marshall"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Martinique"
+msgstr "Martinik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+msgid "Mauritania"
+msgstr "MAOURITANI"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Mauritius"
+msgstr "Maoris"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+msgid "Mexico"
+msgstr "Meksik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+msgid "Micronesia"
+msgstr "Mikronesi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+msgid "Moldova, Republic Of"
+msgstr "Moldavi, Republik Ar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+msgid "Monaco"
+msgstr "Monaco"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+msgid "Mongolia"
+msgstr "Mongoli"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Morocco"
+msgstr "Marok"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+msgid "Mozambique"
+msgstr "Mozambik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+msgid "Namibia"
+msgstr "Namibi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+msgid "Nauru"
+msgstr "Nauru"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+msgid "Netherlands"
+msgstr "Izelvroioù"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Netherlands Antilles"
+msgstr "Antilh Izelvroioù"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+msgid "New Caledonia"
+msgstr "Kaledoni nevez"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+msgid "New Zealand"
+msgstr "Zeland nevez"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+msgid "Niger"
+msgstr "Niger"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+msgid "Niue"
+msgstr "Niue"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+msgid "Norfolk Island"
+msgstr "Enez Norfolk"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+msgid "Norway"
+msgstr "Norway"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+msgid "Oman"
+msgstr "Oman"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Palau"
+msgstr "Palau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Palestinian Territory"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Panama"
+msgstr "Panama"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+msgid "Peru"
+msgstr "Perou"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Philippines"
+msgstr "Filipin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Poland"
+msgstr "Pologn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+msgid "Qatar"
+msgstr "Qatar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+msgid "Reunion"
+msgstr "Reunion"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+msgid "Romania"
+msgstr "Romani"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+msgid "Russian Federation"
+msgstr "Rusi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+msgid "Saint Vincent And The Grenadines"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+msgid "Samoa"
+msgstr "Samoa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+msgid "San Marino"
+msgstr "San Marino"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Senegal"
+msgstr "Senegal"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Serbia And Montenegro"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Seychelles"
+msgstr "Seychelles"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+msgid "Singapore"
+msgstr "Singapour"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+msgid "Slovakia"
+msgstr "Slovaki"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+msgid "Slovenia"
+msgstr "Sloveni"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Solomon Islands"
+msgstr "Inizi Solomon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+msgid "Somalia"
+msgstr "Somali"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "South Africa"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+msgid "Spain"
+msgstr "Spagn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "St. Helena"
+msgstr "St. Elen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+msgid "St. Pierre And Miquelon"
+msgstr "St. Pierre ha Miquelon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Sudan"
+msgstr "Soudan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Suriname"
+msgstr "Surinam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Inizi Svalbard ha Jan Mayen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+msgid "Sweden"
+msgstr "Sued"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "Switzerland"
+msgstr "Suis"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+msgid "Syria"
+msgstr "Siri"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+msgid "Timor-Leste"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+msgid "Togo"
+msgstr "Togo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+msgid "Trinidad And Tobago"
+msgstr "Trinidad ha Tobago"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+msgid "Tunisia"
+msgstr "Tunizi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+msgid "Turkey"
+msgstr "Turki"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+msgid "Uganda"
+msgstr "Uganda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+msgid "United Kingdom"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+msgid "Virgin Islands, British"
+msgstr "Inizi Virgin, Saoz"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+msgid "Virgin Islands, U.S."
+msgstr "Inizi Virgin, S.U"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+msgid "Wallis And Futuna Islands"
+msgstr "Inizi Wallis ha Futuna"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+msgid "Western Sahara"
+msgstr "Sahara kornog"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+msgid "Yemen"
+msgstr "Yemen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+msgid "Zambia"
+msgstr "Zambi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/save-attachments/save-attachments.c:369
+#: ../widgets/menus/gal-view-new-dialog.c:73
+msgid "Name"
+msgstr "Anv"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "AOL Instant Messenger"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
+msgid "Service"
+msgstr "Servij"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:497
+#: ../plugins/save-calendar/csv-format.c:400
+msgid "Location"
+msgstr "Lec'hiadur"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+msgid "Username"
+msgstr "Anv implijer"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+msgid "Home"
+msgstr "Kêr"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+msgid "Other"
+msgstr "All"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
+msgid "GroupWise"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
+msgid "Source Book"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
+msgid "Target Book"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
+msgid "Is New Contact"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
+msgid "Writable Fields"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
+msgid "Required Fields"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
+msgid "Changed"
+msgstr "Kemmet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
+#, c-format
+msgid "Contact Editor - %s"
+msgstr "Aozer darempredoù - %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+msgid "Please select an image for this contact"
+msgstr "Diuzit ur skeudenn evit an darempred-mañ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "Skeudenn ebet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
+msgid ""
+"The contact data is invalid:\n"
+"\n"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+msgid "Invalid contact."
+msgstr "Darempred siek."
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
+msgid "_Edit Full"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "Anv leun"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "Postel"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+msgid "_Select Address Book"
+msgstr "Diuzit ur c'harned chomlec'h"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s) ?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s) ?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Address _2:"
+msgstr "Chomlec'h 2 :"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Ci_ty:"
+msgstr "Kêr :"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr "Bro :"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "Full Address"
+msgstr "Chomlec'h leun"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_ZIP Code:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "Full Name"
+msgstr "Anv leun"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Jr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Miss"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mr."
+msgstr "Ao."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Mrs."
+msgstr "It."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Ms."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "Sr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_First:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Last:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Middle:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Suffix:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:2
+msgid "Add IM Account"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:3
+msgid "_Account name:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+msgid "_IM Service:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
+msgid "_Location:"
+msgstr "Lec'hiadur :"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr "Ouzhpennañ ur bostel d'ar roll"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
+msgid "Contact List Editor"
+msgstr "Aozer ar roll darempredoù"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "Insert email addresses from Address Book"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Members"
+msgstr "Implijerion"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+msgid "Remove an email address from the List"
+msgstr "Dilemel ur chomlec'h postel eus ar roll"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+msgid "_List name:"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+msgid "_Select"
+msgstr "Diuz"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
+msgid "Book"
+msgstr "Levr"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
+msgid "Is New List"
+msgstr "Roll nevez eo"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
+msgid "_Members"
+msgstr "Implijerion"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
+msgid "Contact List Members"
+msgstr "Implijerion eus ar roll darempredoù"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Darempred kemmet :"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+msgid "Duplicate Contact Detected"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+msgid "New Contact:"
+msgstr "Darempred nevez :"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+msgid "Original Contact:"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
+msgid "Any field contains"
+msgstr ""
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Rummad eo"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr ""
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Darempred ebet"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d darempred"
+msgstr[1] "%d darempred"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
+msgid "Query"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+msgid "Error getting book view"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../widgets/table/e-table-click-to-add.c:502
+#: ../widgets/table/e-table-selection-model.c:311
+#: ../widgets/table/e-table.c:3329
+#: ../widgets/table/e-tree-selection-model.c:825
+#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
+msgid "Model"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Fazi o kemmañ ar gartenn"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+msgid "Source"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-meeting-list-view.c:486
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Type"
+msgstr "Seurt"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Gwarediñ evel VCard..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
+#: ../ui/evolution-addressbook.xml.h:56
+msgid "_Open"
+msgstr "Digeriñ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+msgid "_New Contact..."
+msgstr "Darempred nevez..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+msgid "New Contact _List..."
+msgstr "Roll darempredoù nevez"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+msgid "_Save as VCard..."
+msgstr "Gwarediñ evel VCard..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+msgid "_Forward Contact"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+msgid "_Forward Contacts"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+msgid "Send _Message to Contact"
+msgstr "Kas ur gemennadenn d'an darempred"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+msgid "Send _Message to List"
+msgstr "Kas ur gemennadenn d'ar roll"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+msgid "Send _Message to Contacts"
+msgstr "Kas ur gemennadenn d'an darempredoù"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+msgid "_Print"
+msgstr "Moulañ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+msgid "Cop_y to Address Book..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+msgid "Mo_ve to Address Book..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "Troc'hañ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/dialogs/comp-editor.c:445
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "Kopiañ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+msgid "P_aste"
+msgstr "Pegañ"
+
+#. All, unmatched, separator
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
+msgid "Any Category"
+msgstr "An holl rummadoù"
+
+#. FIXME: Allow range selection in table views, as in minicard view
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
+msgid "Print cards"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
+msgid "Categories"
+msgstr "Rummadoù"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "Postel"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Postel 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Postel 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Anv-familh"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Kazetenn"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+msgid "Mobile Phone"
+msgstr "Pellgomzer hezoug"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Lesanv"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
+msgid "Note"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Organization"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Pellgomzer all"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Skingomz"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../calendar/gui/e-meeting-list-view.c:497
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+msgid "Role"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr ""
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "Telex"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "Titl"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "Gwiadva"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:138
+#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
+#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
+#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
+msgid "Width"
+msgstr "Led"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:145
+#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
+#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
+msgid "Height"
+msgstr "Uhelder"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:153
+msgid "Has Focus"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+msgid "Column Width"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
+msgid "Adapter"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard.c:161
+msgid "Selected"
+msgstr "Diuzet"
+
+#: ../addressbook/gui/widgets/e-minicard.c:168
+msgid "Has Cursor"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
+msgid "(map)"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
+msgid "map"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
+msgid "List Members"
+msgstr "Roll an implijerion"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
+msgid "E-mail"
+msgstr "Postel"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Position"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+msgid "Phone"
+msgstr "Pellgomz"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
+msgid "Fax"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "personelaet"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+msgid "Job Title"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
+msgid "Home page"
+msgstr ""
+
+#. E_BOOK_ERROR_OK
+#: ../addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
+msgid "No Self Contact defined"
+msgstr ""
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "N'eo ket kavet an darempred"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
+msgid "Canceled"
+msgstr "Nullet"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Could not cancel"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../calendar/gui/comp-editor-factory.c:433
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Not available in offline mode"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Other error"
+msgstr "Fazi all"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+msgid "Invalid server version"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:94
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:103
+#, c-format
+msgid ""
+"We were unable to open this addressbook.  Please check that the path %s "
+"exists and that you have permission to access it."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:112
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:147
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+msgid "Error adding list"
+msgstr "Fazi oc'h ouzhpennañ ar roll"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
+msgid "Error adding contact"
+msgstr "Fazi oc'h ouzhpennañ an darempred"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
+msgid "Error modifying list"
+msgstr "Fazi o kemmañ ar roll"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
+msgid "Error modifying contact"
+msgstr "Fazi o kemmañ an darempred"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+msgid "Error removing list"
+msgstr "Fazi o tilemel ar roll"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
+msgid "Error removing contact"
+msgstr "Fazi o tilemel an darempred"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#, c-format
+msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
+msgid "Overwrite"
+msgstr "Skrivañ war"
+
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "Darempred"
+msgstr[1] "Darempredoù"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
+msgid "card.vcf"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
+msgid "Select Address Book"
+msgstr "Diuzit ur c'harned chomlec'h"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
+msgid "list"
+msgstr "roll"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
+msgid "Move contact to"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
+msgid "Copy contact to"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
+msgid "Move contacts to"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
+msgid "Copy contacts to"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
+msgid "Multiple VCards"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard evit %s"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+msgid "Contact information"
+msgstr "Titouroù an darempred"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
+#, c-format
+msgid "Contact information for %s"
+msgstr "Titouroù an darempred %s"
+
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
+msgid "Querying Address Book..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "There is one other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Un darempred all ez eus."
+msgstr[1] "%d darempred all ez eus."
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
+msgid "Show Full VCard"
+msgstr "Diskouez ar VCard leun"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+msgid "Save in addressbook"
+msgstr "Gwarediñ e-barzh ar c'harned chomlec'h"
+
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr "Sell kartenn"
+
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
+msgid "GTK Tree View"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "Oc'h enporzhiañ..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "Outlook CSV pe Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+msgid "Outlook CSV and Tab Importer"
+msgstr "Enporzhier Outlook CSV ha Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "Mozilla CSV pe Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Enporzhier Mozilla CSV ha Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:844
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "Evolution CSV pe Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
+msgid "Evolution CSV and Tab Importer"
+msgstr "Enporzhier Evolution CSV ha Tab"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+msgid "Importing ..."
+msgstr "Oc'h enporzhiañ..."
+
+#: ../addressbook/importers/evolution-ldif-importer.c:754
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Furmad (.ldif)"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:755
+msgid "Evolution LDIF importer"
+msgstr "Enporzhier Evolution LDIF"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:547
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:548
+msgid "Evolution VCard Importer"
+msgstr "Enporzhier Evolution VCard"
+
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
+msgid "Print envelope"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.c:923
+msgid "Print contacts"
+msgstr "Moulañ an darempredoù"
+
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
+msgid "Print contact"
+msgstr "Moulañ an darempred"
+
+#: ../addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
+
+#: ../addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
+
+#: ../addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:7
+msgid "F_ont..."
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Furmad"
+
+#: ../addressbook/printing/e-contact-print.glade.h:11
+#: ../widgets/table/e-table-click-to-add.c:495
+#: ../widgets/table/e-table-field-chooser-dialog.c:91
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1826
+#: ../widgets/table/e-table-selection-model.c:318
+msgid "Header"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Uhelder :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:22
+msgid "Number of columns:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Neuziadoù"
+
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:120
+msgid "Orientation"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "Pajenn"
+
+#: ../addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Rakwelet :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr ""
+
+#. FIXME: Take care of i18n
+#: ../addressbook/printing/e-contact-print.glade.h:36
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
+msgid "Size:"
+msgstr "Ment :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:176
+msgid "Type:"
+msgstr "Seurt :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Led :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr ""
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
+msgid "Contact Print Style Editor Test"
+msgstr ""
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:53
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright (C) 2000, Ximian, Inc."
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
+msgid "This should test the contact print style editor widget"
+msgstr ""
+
+#: ../addressbook/printing/test-print.c:52
+msgid "Contact Print Test"
+msgstr ""
+
+#: ../addressbook/printing/test-print.c:55
+msgid "This should test the contact print code"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+msgid "Can not open file"
+msgstr "N'eus ket tu da zigeriñ ar restr"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+msgid "Couldn't get list of addressbooks"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+msgid "failed to open book"
+msgstr "C'hwitet digeriñ al levr"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:58
+msgid "List local addressbook folders"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr "Diskouez kartennoù evel vcard pe restr csv"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr "NIVER"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there is no need for the size option."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:153
+msgid "Unhandled error"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Fazi o kargañ ar c'harned chomlec'h."
+
+#: ../addressbook/tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-import.c:82
+msgid "No filename provided."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:1
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:3
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:5
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:6
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:7
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:8
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:9
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:10
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:11
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:12
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:13
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:14
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:16
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete this appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:18
+msgid "Are you sure you want to delete this journal entry?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete this meeting?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:22
+msgid "Are you sure you want to send the task without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:23
+msgid "Cannot create a new event"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:24
+msgid "Delete calendar '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:25
+msgid "Delete memo list '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:26
+msgid "Delete task list '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:27
+msgid "Do _not Send"
+msgstr "Chom hep kas"
+
+#: ../calendar/calendar.error.xml.h:28
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:29
+msgid "Download in progress. Do you want to save the task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:30
+msgid "Editor could not be loaded."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:31
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:32
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:33
+msgid "Error loading calendar"
+msgstr "Fazi o kargañ an deiziadur"
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Error loading memo list"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Error loading task list"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:36
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:37
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:38
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:39
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:40
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:41
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:43
+msgid "Some features may not work properly with your current server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:44
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:45
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "The calendar is not marked for offline usage."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:48
+msgid "The memo list is not marked for offline usage"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "The task list is not marked for offline usage."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "This calendar will be removed permanently."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "This memo list will be removed permanently."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:52
+msgid "This task list will be removed permanently."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Would you like to save your changes to this appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to save your changes to this memo?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:55
+msgid "Would you like to save your changes to this task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to send a cancelation notice for this journal entry?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:58
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:62
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:63
+msgid "You have changed this appointment, but not yet saved it."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:64
+msgid "You have changed this task, but not yet saved it."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:68
+#: ../composer/mail-composer.error.xml.h:27
+msgid "_Discard Changes"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:53
+msgid "_Save"
+msgstr "Gwarediñ"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "_Save Changes"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
+msgid "_Send"
+msgstr "Kas"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "_Send Notice"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "{0}."
+msgstr "{0}."
+
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "Roit ar ger-kuzh"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
+#: ../calendar/conduits/memo/memo-conduit.c:854
+#: ../calendar/conduits/memo/memo-conduit.c:855
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
+msgid "Could not start evolution-data-server"
+msgstr "Ne oa ket tu da lañsiñ evolution-data-server"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: ../calendar/conduits/memo/memo-conduit.c:937
+#: ../calendar/conduits/memo/memo-conduit.c:940
+msgid "Could not read pilot's Memo application block"
+msgstr ""
+
+#: ../calendar/conduits/memo/memo-conduit.c:976
+#: ../calendar/conduits/memo/memo-conduit.c:979
+msgid "Could not write pilot's Memo application block"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:239
+msgid "Default Priority:"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:1112
+#: ../calendar/conduits/todo/todo-conduit.c:1115
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
+msgid "Could not write pilot's ToDo application block"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:1969
+msgid "Calendar and Tasks"
+msgstr "Deiziadur ha traoù d'ober"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1291
+msgid "Calendars"
+msgstr "Deiziadurioù"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Deizhiadur ha traoù d'ober Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Aozer Evolution evit an deiziadur/traoù d'ober"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Tasks component"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
+msgid "Memos"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Traoù d'ober"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "Deiziadurioù"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "Traoù d'ober"
+
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "munut"
+msgstr[1] "munutoù"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "eur"
+msgstr[1] "eurioù"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
+msgid "Start time"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+msgid "Appointments"
+msgstr "Emgavioù"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
+#: ../calendar/gui/e-itip-control.c:1113
+#: ../plugins/itip-formatter/itip-view.c:880
+msgid "Location:"
+msgstr "Lec'hiadur :"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze _time:"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:40
+msgid "_Edit"
+msgstr "Aozañ"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "_Snooze"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+msgid "location of appointment"
+msgstr "lec'hiadur hag emgav"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
+msgid "No summary available."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
+msgid "No description available."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
+msgid "No location information available."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
+#, c-format
+msgid "You have %d alarms"
+msgstr "%d alarm hoc'h eus"
+
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
+msgid "Warning"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
+msgid "Do not ask me about this program again."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/notify-main.c:140
+msgid "Could not initialize Bonobo"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/notify-main.c:153
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/util.c:41
+msgid "invalid time"
+msgstr ""
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d eur"
+msgstr[1] "%d eur"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d munut"
+msgstr[1] "%d munut"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d eilenn"
+msgstr[1] "%d eilenn"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Alarm programs"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Calendars to run alarms for"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Compress weekends in month view"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Confirm expunge"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Default appointment reminder"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Default reminder units"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Default reminder value"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Free/busy server URLs"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Free/busy template URL"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Hide completed tasks"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Hide task units"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Hide task value"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Horizontal pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Last alarm time"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "List of server URLs for free/busy publishing."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Marcus Bains Line"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Minute the workday ends on, 0 to 59."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Minute the workday starts on, 0 to 59."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Month view horizontal pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Month view vertical pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Number of units for determining a default reminder."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+msgid "Number of units for determining when to hide tasks."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+msgid "Overdue tasks color"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+msgid "Programs that are allowed to be run by alarms."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+msgid "Show appointment end times in week and month views"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+msgid "Show display alarms in notification tray"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+msgid "Show week numbers in date navigator"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+msgid "Tasks due today color"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+msgid "Tasks vertical pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+msgid "Time divisions"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+msgid "Time the last alarm ran, in time_t."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+msgid "Timezone"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+msgid "Week start"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+msgid "Whether to set a default reminder for appointments."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+msgid "Whether to show week numbers in the date navigator."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+msgid "Work days"
+msgstr "Deizioù labour"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+msgid "Workday end hour"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+msgid "Workday end minute"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+msgid "Workday start hour"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+msgid "Workday start minute"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:48
+msgid "Summary contains"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:49
+msgid "Description contains"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:51
+msgid "Comment contains"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:52
+msgid "Location contains"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:347
+msgid "Unmatched"
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Moulañ"
+
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Deiziadur"
+
+#: ../calendar/gui/calendar-commands.c:348
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:354
+msgid "Purge events older than"
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:359
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../widgets/misc/e-send-options.glade.h:36
+msgid "days"
+msgstr "deizioù"
+
+#. Create the On the web source group
+#. Create the LDAP source group
+#. Create the Webcal source group
+#. Create the LDAP source group
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
+#: ../calendar/gui/tasks-component.c:217
+msgid "On The Web"
+msgstr "War ar gwiad"
+
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
+msgid "Birthdays & Anniversaries"
+msgstr ""
+
+#. Create the weather group
+#: ../calendar/gui/calendar-component.c:259
+#: ../plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "Amzer"
+
+#: ../calendar/gui/calendar-component.c:536
+msgid "_New Calendar"
+msgstr "Deiziadur nevez"
+
+#: ../calendar/gui/calendar-component.c:840
+msgid "Failed upgrading calendars."
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1139
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1152
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1266
+msgid "Calendar Source Selector"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1457
+msgid "New appointment"
+msgstr "Emgav nevez"
+
+#: ../calendar/gui/calendar-component.c:1458
+msgid "_Appointment"
+msgstr "Emgav"
+
+#: ../calendar/gui/calendar-component.c:1459
+msgid "Create a new appointment"
+msgstr "Krouiñ un emgav nevez"
+
+#: ../calendar/gui/calendar-component.c:1465
+msgid "New meeting"
+msgstr "Emvod nevez"
+
+#: ../calendar/gui/calendar-component.c:1466
+msgid "M_eeting"
+msgstr "Emvod"
+
+#: ../calendar/gui/calendar-component.c:1467
+msgid "Create a new meeting request"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1473
+msgid "New all day appointment"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1474
+msgid "All Day A_ppointment"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1475
+msgid "Create a new all-day appointment"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1481
+msgid "New calendar"
+msgstr "Deiziadur nevez"
+
+#: ../calendar/gui/calendar-component.c:1482
+msgid "Cale_ndar"
+msgstr "Deiziadur"
+
+#: ../calendar/gui/calendar-component.c:1483
+msgid "Create a new calendar"
+msgstr "Krouiñ un deiziadur nevez"
+
+#: ../calendar/gui/calendar-view-factory.c:109
+msgid "Day View"
+msgstr ""
+
+#: ../calendar/gui/calendar-view-factory.c:112
+msgid "Work Week View"
+msgstr ""
+
+#: ../calendar/gui/calendar-view-factory.c:115
+msgid "Week View"
+msgstr ""
+
+#: ../calendar/gui/calendar-view-factory.c:118
+msgid "Month View"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:415
+msgid "Error while opening the calendar"
+msgstr "Fazi o tigeriñ an deiziadur"
+
+#: ../calendar/gui/comp-editor-factory.c:421
+msgid "Method not supported when opening the calendar"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:427
+msgid "Permission denied to open the calendar"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+msgid "Unknown error"
+msgstr "Fazi dianav"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "Kemmañ an alarm"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
+msgid "<b>Alarm</b>"
+msgstr "<b>Alarm</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
+msgid "<b>Options</b>"
+msgstr "<b>Neuziadoù</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
+msgid "<b>Repeat</b>"
+msgstr "<b>Adober</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+msgid "Add Alarm"
+msgstr "Ouzhpennañ un alarm"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+msgid "Custom _message"
+msgstr "Kemennadenn personelaet"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+msgid "Custom alarm sound"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Mes_sage:"
+msgstr "Kemennadenn :"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:446
+msgid "Play a sound"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:450
+msgid "Pop up an alert"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:458
+msgid "Run a program"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Send To:"
+msgstr "Kas da :"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/e-alarm-list.c:454
+msgid "Send an email"
+msgstr "Kas ur bostel"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+msgid "_Arguments:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid "_Program:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+msgid "_Repeat the alarm"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Sound:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid "after"
+msgstr "goude"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+msgid "before"
+msgstr "araok"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "day(s)"
+msgstr "deiz(ioù)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+msgid "end of appointment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+msgid "extra times every"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "hour(s)"
+msgstr "eur(ioù)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+msgid "minute(s)"
+msgstr "munut(où)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+msgid "start of appointment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+msgid "Action/Trigger"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Ouzhpennañ"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
+msgid "Alarms"
+msgstr "Alarmoù"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+msgid "Attach file(s)"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "File name:"
+msgstr "Anv ar restr :"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "MIME type:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
+msgid "Selected Calendars for Alarms"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 munut\n"
+"30 munut\n"
+"15 munut\n"
+"10 munut\n"
+"05 munut"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Hollek</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Roll an traoù d'ober</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "<span weight=\"bold\">Time</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Day _ends:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Display"
+msgstr "Diskouez"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:730
+msgid "Friday"
+msgstr "Gwener"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"Munutoù\n"
+"Eurioù\n"
+"Deizioù"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/e-itip-control.c:726
+msgid "Monday"
+msgstr "Lun"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"Lun\n"
+"Meurzh\n"
+"Merc'her\n"
+"Yaou\n"
+"Gwener\n"
+"Sadorn\n"
+"Sul"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
+msgid "Pick a color"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "S_un"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:731
+msgid "Saturday"
+msgstr "Sadorn"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Select the calendars for alarm notification"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Sh_ow a reminder"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Show week _numbers in date navigator"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:725
+msgid "Sunday"
+msgstr "Sul"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "T_asks due today:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "T_hu"
+msgstr "Yao"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Template:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:729
+msgid "Thursday"
+msgstr "Yaou"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+msgid "Time _zone:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Time format:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/e-itip-control.c:727
+msgid "Tuesday"
+msgstr "Meurzh"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/e-itip-control.c:728
+msgid "Wednesday"
+msgstr "Merc'her"
+
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Work days:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "_12 hour (AM/PM)"
+msgstr "12 eur (AM/PM)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "_24 hour"
+msgstr "24 eur"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+msgid "_Compress weekends in month view"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "_Day begins:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "_Fri"
+msgstr "Gwe"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "_Hide completed tasks after"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "_Mon"
+msgstr "Lun"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "_Overdue tasks:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "_Sat"
+msgstr "Sad"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "_Time divisions:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "_Tue"
+msgstr "Meu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+msgid "_Wed"
+msgstr "Mer"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+msgid "before every appointment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:288
+msgid "Copy calendar contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
+msgstr "Roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:461
+msgid "Calendar Properties"
+msgstr "Perzhioù an deiziadur"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:463
+msgid "New Calendar"
+msgstr "Deiziadur nevez"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:529
+msgid "Task List Properties"
+msgstr "Perzhioù ar roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
+msgid "New Memo List"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Ouzhpennañ un deizhiadur"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Task List"
+msgstr "Ouzhpennañ ur roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "Ouzhpennañ un deizhiadur"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Task List"
+msgstr "Ouzhpennañ ur roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-weather/calendar-weather.c:548
+msgid "_Refresh:"
+msgstr "Adkargañ :"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
+msgid "_URL:"
+msgstr "URL :"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:566
+msgid "weeks"
+msgstr "sizhunioù"
+
+#: ../calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr "An dra d'ober-mañ he deus bet kemmet."
+
+#: ../calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
+msgid " to "
+msgstr " da "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
+msgid " (Completed "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
+msgid "Completed "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
+msgid " (Due "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
+msgid "Due "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
+#, c-format
+msgid "Attached message - %s"
+msgstr ""
+
+#. translators, this count will always be >1
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
+msgid "_Move"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
+msgid "Cancel _Drag"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:802
+msgid "Could not update object"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
+#, c-format
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:977
+msgid "Hide Attachment _Bar"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
+msgid "Show Attachment _Bar"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3619
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "Dilemel"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+msgid "_Properties"
+msgstr "Perzhioù"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3622
+msgid "_Add attachment..."
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
+msgid "Show Attachments"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1469
+msgid "Press space key to toggle attachment bar"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
+msgid "Edit Appointment"
+msgstr "Kemmañ an emgav"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
+#, c-format
+msgid "Meeting - %s"
+msgstr "Emvod - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
+#, c-format
+msgid "Appointment - %s"
+msgstr "Emgav - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
+#, c-format
+msgid "Assigned Task - %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
+#, c-format
+msgid "Task - %s"
+msgstr "Tra d'ober - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
+msgid "No summary"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
+msgid "attachment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2845
+msgid "Unable to use current version!"
+msgstr ""
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+msgid "Could not open source"
+msgstr ""
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+msgid "Could not open destination"
+msgstr ""
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+msgid "Destination is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:54
+msgid "The event could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:57
+msgid "The task could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:60
+msgid "The journal entry could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:63
+msgid "The item could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:70
+msgid "The event could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:73
+msgid "The task could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:76
+msgid "The journal entry could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:79
+msgid "The item could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:86
+msgid "The event could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:89
+msgid "The task could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:92
+msgid "The journal entry could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:95
+msgid "The item could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Contacts..."
+msgstr "Darempredoù"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-delegates.c:421
+msgid "Delegate To:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:547
+msgid "Appoint_ment"
+msgstr "Emgav"
+
+#: ../calendar/gui/dialogs/event-editor.c:551
+#: ../ui/evolution-event-editor.xml.h:14
+msgid "Recurrence"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
+msgid "This event has alarms"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Deiziadur :"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.c:441
+msgid "Or_ganizer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:916
+msgid "_Delegatees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:918
+msgid "Atte_ndees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1086
+msgid "Event with no start date"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1089
+msgid "Event with no end date"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
+msgid "Start date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1267
+msgid "End date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1290
+msgid "Start time is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1297
+msgid "End time is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/task-page.c:905
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
+#: ../calendar/gui/dialogs/task-page.c:911
+msgid "An organizer is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
+#: ../calendar/gui/dialogs/task-page.c:926
+msgid "At least one attendee is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:1199
+msgid "_Add "
+msgstr "Ouzhpennañ "
+
+#: ../calendar/gui/dialogs/event-page.c:2621
+#, c-format
+msgid "Unable to open the calendar '%s'."
+msgstr "N'eus ket tu da zigeriñ an deiziadur '%s'."
+
+#: ../calendar/gui/dialogs/event-page.c:2924
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "%d deiz araok an emgav"
+msgstr[1] "%d deiz araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.c:2932
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "%d eur araok an emgav"
+msgstr[1] "%d eur araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.c:2940
+#, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "%d munut araok an emgav"
+msgstr[1] "%d munut araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.c:2956
+msgid "Customize"
+msgstr ""
+
+#. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:649
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "Ebet"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "1 deiz araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 hour before appointment"
+msgstr "1 eur araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
+msgid "15 minutes before appointment"
+msgstr "15 munut araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Rummadoù..."
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Custom Alarm:"
+msgstr "Alarm personelaet :"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+msgid "Event Description"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "Lec'hiadur"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+msgid "Su_mmary:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+msgid "_Alarm"
+msgstr "Alarm"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
+msgstr "evit"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Eus :"
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Yezh"
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Implijer"
+
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
+msgid "Status"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+msgid "<b>Att_endees</b>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
+msgid "C_hange Organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "Co_ntacts..."
+msgstr "Darempredoù..."
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+msgid "Organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
+msgid "Memo"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:551
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+msgid "_Memo Content:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+msgid "<b>Calendar options</b>"
+msgstr "<b>Neuziadoù an deiziadur</b>"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+msgid "Add New Calendar"
+msgstr "Ouzhpennañ un deiziadur nevez"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#, fuzzy
+msgid "Calendar Group"
+msgstr "Deiziadur"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+msgid "Calendar Location"
+msgstr "Lec'hiadur an deiziadur"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
+msgid "Calendar Name"
+msgstr "Anv an deiziadur"
+
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
+msgstr "<b>Neuziadoù ar roll an traoù d'ober</b>"
+
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+msgid "Add New Task List"
+msgstr "Ouzhpennañ ur roll an traoù d'ober nevez"
+
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Perzhioù ar roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
+msgid "Task List Name"
+msgstr "Anv ar roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/recur-comp.c:52
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:54
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:58
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:62
+msgid ""
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:90
+msgid "This Instance Only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:94
+msgid "This and Prior Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:100
+msgid "This and Future Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:105
+msgid "All Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:494
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:815
+msgid "Recurrence date is invalid"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:928
+msgid "on"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:992
+msgid "first"
+msgstr ""
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+msgid "second"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
+msgid "third"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
+msgid "fourth"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
+msgid "last"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "Other Date"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+msgid "1st to 10th"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+msgid "11th to 20th"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
+msgid "21st to 31st"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
+msgid "day"
+msgstr "deiz"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1219
+msgid "on the"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1408
+msgid "occurrences"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2377
+msgid "Date/Time"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "<b>Exceptions</b>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
+msgid "<b>Preview</b>"
+msgstr "<b>Rakwelet</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "<b>Recurrence</b>"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "This appointment rec_urs"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "forever"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
+msgid "month(s)"
+msgstr "miz(ioù)"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
+msgid "week(s)"
+msgstr "sizhun(ioù)"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+msgid "year(s)"
+msgstr "bloaz(ioù)"
+
+#: ../calendar/gui/dialogs/task-details-page.c:411
+#: ../calendar/gui/dialogs/task-details-page.c:431
+msgid "Completed date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.c:518
+msgid "Web Page"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\">A bep seurt</span>"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "<span weight=\"bold\">Status</span>"
+msgstr ""
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
+msgid "Completed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
+msgid "High"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:653
+#: ../calendar/gui/e-cal-model-tasks.c:728
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
+msgid "In Progress"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
+msgid "Low"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
+msgid "Normal"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:651
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
+msgid "Not Started"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+msgid "P_ercent complete:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Stat_us:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:389
+msgid "Undefined"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+msgid "_Date completed:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:31
+msgid "_Priority:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Web Page:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "Tra d'ober"
+
+#: ../calendar/gui/dialogs/task-editor.c:430
+msgid "Task Details"
+msgstr "Munudoù an tra d'ober"
+
+#: ../calendar/gui/dialogs/task-page.c:821
+msgid "Due date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:1649
+#, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "Rummadoù..."
+
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Or_ganiser:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Due date:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Neuziadoù an deiziadur</b>"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "<b>Neuziadoù an deiziadur</b>"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+msgid "Free/Busy Publishing Settings"
+msgstr ""
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#, fuzzy
+msgid "_Daily"
+msgstr "Postel"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#, fuzzy
+msgid "_Manual"
+msgstr "Postel"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "Ger-kuzh :"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr ""
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "Anv implijer :"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
+msgid "_Weekly"
+msgstr "Sizhuniek"
+
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d deiz"
+msgstr[1] "%d deiz"
+
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d sizhun"
+msgstr[1] "%d sizhun"
+
+#: ../calendar/gui/e-alarm-list.c:464
+msgid "Unknown action to be performed"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:478
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:483
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:501
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:506
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:513
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:537
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:545
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:72
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
+#, c-format
+msgid "Click to open %s"
+msgstr "Klikit evit digeriñ %s"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-preview.c:301
+msgid "Web Page:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Titl ebet"
+
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:217
+msgid "Due Date:"
+msgstr ""
+
+#. write status
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1127
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:905
+msgid "Status:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:248
+msgid "Priority:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+msgid "Public"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:365
+msgid "Private"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Confidential"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Summary"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:438
+msgid "Free"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
+msgid "Busy"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-tasks.c:603
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+msgid "Yes"
+msgstr "Ya"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:177
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "No"
+msgstr "Nann"
+
+#. This is the default filename used for temporary file creation
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
+#: ../plugins/itip-formatter/itip-formatter.c:240
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
+#: ../widgets/misc/e-charset-picker.c:63
+msgid "Unknown"
+msgstr "Dianav"
+
+#: ../calendar/gui/e-cal-model.c:920
+msgid "Recurring"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:922
+msgid "Assigned"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+msgid "Save As..."
+msgstr "Gwarediñ dindan..."
+
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
+msgid "Select folder to save selected attachments..."
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#, c-format
+msgid "untitled_image.%s"
+msgstr "Skeudenn_dianav.%s"
+
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+msgid "_Save As..."
+msgstr "Gwarediñ dindan..."
+
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:566
+msgid "Set as _Background"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:278
+msgid "_Save Selected"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
+#, c-format
+msgid "Open in %s..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "0%"
+msgstr "0%"
+
+#: ../calendar/gui/e-calendar-table.c:409
+msgid "10%"
+msgstr "10%"
+
+#: ../calendar/gui/e-calendar-table.c:410
+msgid "20%"
+msgstr "20%"
+
+#: ../calendar/gui/e-calendar-table.c:411
+msgid "30%"
+msgstr "30%"
+
+#: ../calendar/gui/e-calendar-table.c:412
+msgid "40%"
+msgstr "40%"
+
+#: ../calendar/gui/e-calendar-table.c:413
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-calendar-table.c:414
+msgid "60%"
+msgstr "60%"
+
+#: ../calendar/gui/e-calendar-table.c:415
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-calendar-table.c:416
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-calendar-table.c:417
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-calendar-table.c:418
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
+msgid "Deleting selected objects"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
+msgid "Updating objects"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
+msgid "Save as..."
+msgstr "Gwarediñ dindan..."
+
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
+msgid "Open _Web Page"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "Moulañ..."
+
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Troc'hañ"
+
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+msgid "_Paste"
+msgstr "Pegañ"
+
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
+msgid "_Assign Task"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
+#: ../ui/evolution-tasks.xml.h:26
+msgid "_Forward as iCalendar"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1189
+msgid "_Mark as Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1190
+msgid "_Mark Selected Tasks as Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1195
+msgid "_Delete Selected Tasks"
+msgstr "Dilemel an traoù d'ober diuzet"
+
+#: ../calendar/gui/e-calendar-table.c:1428
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Klikit evit ouzhpennañ un dra d'ober"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
+msgid "Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+msgid "Due date"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../plugins/save-calendar/csv-format.c:397
+msgid "Priority"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+msgid "Start date"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+msgid "Task sort"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1264
+msgid "Moving items"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1266
+msgid "Copying items"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1575
+msgid "New _Appointment..."
+msgstr "Emgav nevez..."
+
+#: ../calendar/gui/e-calendar-view.c:1576
+msgid "New All Day _Event"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1577
+msgid "New _Meeting"
+msgstr "Emvod nevez"
+
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Tra d'ober nevez"
+
+#. FIXME: hook in this somehow
+#: ../calendar/gui/e-calendar-view.c:1588
+msgid "_Current View"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1590
+msgid "Select T_oday"
+msgstr "Diuzit hiziv"
+
+#: ../calendar/gui/e-calendar-view.c:1591
+msgid "_Select Date..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1607
+msgid "Cop_y to Calendar..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1608
+msgid "Mo_ve to Calendar..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1609
+msgid "_Delegate Meeting..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1610
+msgid "_Schedule Meeting..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1611
+msgid "_Forward as iCalendar..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1612
+msgid "_Reply"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1618
+msgid "Make this Occurrence _Movable"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
+msgid "Delete this _Occurrence"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1620
+msgid "Delete _All Occurrences"
+msgstr ""
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:2033
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr ""
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2037
+#, c-format
+msgid "Organizer: %s"
+msgstr ""
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
+#, c-format
+msgid "Location: %s"
+msgstr "Lec'hiadur : %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2084
+#, c-format
+msgid "Time: %s %s"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:116
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:119
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#: ../calendar/gui/e-cell-date-edit-text.c:124
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:552
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. String to use in 12-hour time format for times in the morning.
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
+msgid "pm"
+msgstr "pm"
+
+#: ../calendar/gui/e-itip-control.c:759
+msgid "Yes. (Complex Recurrence)"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:770
+#, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:775
+#, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:785
+msgid " and "
+msgstr " ha "
+
+#: ../calendar/gui/e-itip-control.c:792
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:805
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:812
+#, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:816
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:827
+#, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:836
+msgid ", ending on "
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:857
+msgid "Starts"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:870
+msgid "Ends"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:904
+#: ../plugins/save-calendar/csv-format.c:395
+msgid "Due"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
+msgid "iCalendar Information"
+msgstr ""
+
+#. Title
+#: ../calendar/gui/e-itip-control.c:961
+msgid "iCalendar Error"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
+msgid "An unknown person"
+msgstr ""
+
+#. Describe what the user can do
+#: ../calendar/gui/e-itip-control.c:1084
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/itip-utils.c:669
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+msgid "Accepted"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:1642
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
+#: ../plugins/itip-formatter/itip-formatter.c:1645
+msgid "Declined"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1224
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1226
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1305
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1306
+msgid "Meeting Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1312
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1314
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1315
+msgid "Meeting Proposal"
+msgstr ""
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1321
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1322
+msgid "Meeting Update"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1326
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1327
+msgid "Meeting Update Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1334
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1335
+msgid "Meeting Reply"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1342
+#, c-format
+msgid "<b>%s</b> has canceled a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1343
+msgid "Meeting Cancelation"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1470
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1354
+msgid "Bad Meeting Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1381
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1382
+msgid "Task Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1389
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1391
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1392
+msgid "Task Proposal"
+msgstr ""
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1398
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1399
+msgid "Task Update"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1403
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1404
+msgid "Task Update Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1411
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1412
+msgid "Task Reply"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1419
+#, c-format
+msgid "<b>%s</b> has canceled a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1420
+msgid "Task Cancelation"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1431
+msgid "Bad Task Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1455
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1456
+msgid "Free/Busy Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1460
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1461
+msgid "Free/Busy Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1465
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1466
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1471
+msgid "Bad Free/Busy Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1546
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1605
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1638
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1670
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1904
+msgid "Update complete\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1932
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1942
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1954
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1971
+msgid "Attendee status updated\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:1029
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
+msgid "Item sent!\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
+msgid "The item could not be sent!\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2130
+msgid "Choose an action:"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2202
+msgid "Update"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2230
+#: ../plugins/groupwise-features/process-meeting.c:48
+msgid "Accept"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2231
+msgid "Tentatively accept"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2232
+#: ../plugins/groupwise-features/process-meeting.c:50
+msgid "Decline"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2261
+msgid "Send Free/Busy Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2289
+msgid "Update respondent status"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2317
+msgid "Send Latest Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
+#: ../ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:70
+msgid "Chair Persons"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:154
+msgid "Required Participants"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:72
+msgid "Optional Participants"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:73
+msgid "Resources"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
+msgid "Individual"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../widgets/table/e-table-config-no-group.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Group"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+msgid "Resource"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:168
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+msgid "Room"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
+msgid "Chair"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
+msgid "Required Participant"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+msgid "Optional Participant"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+msgid "Non-Participant"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
+msgid "Needs Action"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
+msgid "Tentative"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/itip-utils.c:678
+#: ../plugins/itip-formatter/itip-formatter.c:1648
+msgid "Delegated"
+msgstr ""
+
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:470
+msgid "Attendee                          "
+msgstr ""
+
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+msgid "In Process"
+msgstr ""
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
+msgid "%a %m/%d/%Y"
+msgstr ""
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
+msgid "%m/%d/%Y"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
+msgid "Out of Office"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:413
+msgid "No Information"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:427
+msgid "A_ttendees..."
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:444
+msgid "O_ptions"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _only working hours"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:471
+msgid "Show _zoomed out"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:486
+msgid "_Update free/busy"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:501
+msgid "_<<"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:519
+msgid "_Autopick"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:534
+msgid ">_>"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:551
+msgid "_All people and resources"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:560
+msgid "All _people and one resource"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:569
+msgid "_Required people"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Required people and _one resource"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:614
+msgid "_Start time:"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:641
+msgid "_End time:"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.c:870
+msgid "_Delete Selected Memos"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Memo sort"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:772
+msgid "Loading memos"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:853
+#, c-format
+msgid "Opening memos at %s"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
+msgid "Deleting selected objects..."
+msgstr ""
+
+#: ../calendar/gui/e-pub-utils.c:322
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Roit ho ger-kuzh evit %s"
+
+#: ../calendar/gui/e-tasks.c:884
+msgid "Loading tasks"
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:971
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:1216
+msgid "Completing tasks..."
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:1266
+msgid "Expunging"
+msgstr ""
+
+#: ../calendar/gui/e-timezone-entry.c:133
+msgid "Select Timezone"
+msgstr ""
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
+msgid "%d %B"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:786
+msgid "Updating query"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2234
+msgid "_Custom View"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2235
+msgid "_Save Custom View"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2240
+msgid "_Define Views..."
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2402
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2421
+#, c-format
+msgid "Loading tasks at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2525
+#, c-format
+msgid "Opening %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:3430
+msgid "Purging"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:5
+msgid "January"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:6
+msgid "July"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:7
+msgid "June"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:8
+msgid "March"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:9
+msgid "May"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:10
+msgid "November"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:11
+msgid "October"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:12
+msgid "Select Date"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:13
+msgid "September"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:14
+msgid "_Select Today"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:563
+msgid "An organizer must be set."
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:448
+msgid "At least one attendee is necessary"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
+msgid "Event information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
+msgid "Task information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
+msgid "Journal information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
+msgid "Free/Busy information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:639
+msgid "Calendar information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:688
+msgid "Updated"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:696
+msgid "Refresh"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:700
+msgid "Counter-proposal"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:772
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:782
+msgid "iCalendar information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:937
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:526
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
+#: ../mail/mail-component.c:560
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/memos-component.c:575
+msgid "Failed upgrading memos."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:871
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:884
+msgid "There is no calendar available for creating memos"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:972
+msgid "Memo Source Selector"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1155
+msgid "New memo"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1157
+msgid "Create a new memo"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1163
+msgid "New memo list"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1165
+msgid "Create a new memo list"
+msgstr ""
+
+#: ../calendar/gui/memos-control.c:340
+msgid "Print Memos"
+msgstr ""
+
+#: ../calendar/gui/migration.c:162
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../calendar/gui/migration.c:166
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#. FIXME: set proper domain/code
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:794
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:962
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "1st"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "2nd"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "3rd"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "4th"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "5th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "6th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "7th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "8th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "9th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "10th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "11th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "12th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "13th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "14th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "15th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "16th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "17th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "18th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "19th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "20th"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "21st"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "22nd"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "23rd"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "24th"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "25th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "26th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "27th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "28th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "29th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "30th"
+msgstr ""
+
+#: ../calendar/gui/print.c:499
+msgid "31st"
+msgstr ""
+
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:574
+msgid "Su"
+msgstr ""
+
+#: ../calendar/gui/print.c:574
+msgid "Mo"
+msgstr ""
+
+#: ../calendar/gui/print.c:574
+msgid "Tu"
+msgstr ""
+
+#: ../calendar/gui/print.c:574
+msgid "We"
+msgstr ""
+
+#: ../calendar/gui/print.c:575
+msgid "Th"
+msgstr ""
+
+#: ../calendar/gui/print.c:575
+msgid "Fr"
+msgstr ""
+
+#: ../calendar/gui/print.c:575
+msgid "Sa"
+msgstr ""
+
+#. Day
+#: ../calendar/gui/print.c:1923
+msgid "Selected day (%a %b %d %Y)"
+msgstr ""
+
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
+msgid "%a %b %d"
+msgstr ""
+
+#: ../calendar/gui/print.c:1949
+msgid "%a %d %Y"
+msgstr ""
+
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
+msgid "%a %b %d %Y"
+msgstr ""
+
+#: ../calendar/gui/print.c:1960
+#, c-format
+msgid "Selected week (%s - %s)"
+msgstr ""
+
+#. Month
+#: ../calendar/gui/print.c:1968
+msgid "Selected month (%b %Y)"
+msgstr ""
+
+#. Year
+#: ../calendar/gui/print.c:1975
+msgid "Selected year (%Y)"
+msgstr ""
+
+#: ../calendar/gui/print.c:2304
+msgid "Appointment"
+msgstr "Emgav"
+
+#: ../calendar/gui/print.c:2306
+msgid "Task"
+msgstr "Tra d'ober"
+
+#: ../calendar/gui/print.c:2328
+#, c-format
+msgid "Summary: %s"
+msgstr ""
+
+#: ../calendar/gui/print.c:2379
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: ../calendar/gui/print.c:2396
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: ../calendar/gui/print.c:2408
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: ../calendar/gui/print.c:2420
+#, c-format
+msgid "URL: %s"
+msgstr "URL : %s"
+
+#: ../calendar/gui/print.c:2434
+#, c-format
+msgid "Categories: %s"
+msgstr "Rummadoù: %s"
+
+#: ../calendar/gui/print.c:2445
+msgid "Contacts: "
+msgstr "Darempredoù : "
+
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
+msgid "Print Preview"
+msgstr ""
+
+#: ../calendar/gui/print.c:2620
+msgid "Print Item"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:441
+msgid "_New Task List"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:517
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tra d'ober"
+msgstr[1] "%d tra d'ober"
+
+#: ../calendar/gui/tasks-component.c:566
+msgid "Failed upgrading tasks."
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:877
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:890
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:987
+msgid "Task Source Selector"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1170
+msgid "New task"
+msgstr "Tra d'ober nevez"
+
+#: ../calendar/gui/tasks-component.c:1172
+msgid "Create a new task"
+msgstr "Krouiñ un dra d'ober nevez"
+
+#: ../calendar/gui/tasks-component.c:1178
+msgid "New assigned task"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1179
+msgid "Assigne_d Task"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1180
+msgid "Create a new assigned task"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1186
+msgid "New task list"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1187
+msgid "Task l_ist"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1188
+msgid "Create a new task list"
+msgstr ""
+
+#: ../calendar/gui/tasks-control.c:438
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+
+#: ../calendar/gui/tasks-control.c:441
+msgid "Do not ask me again."
+msgstr ""
+
+#: ../calendar/gui/tasks-control.c:475
+msgid "Print Tasks"
+msgstr ""
+
+#. The first letter of each day of the week starting with Sunday
+#: ../calendar/gui/weekday-picker.c:319
+msgid "SMTWTFS"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:79
+msgid "Appointments and Meetings"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
+msgid "Opening calendar"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:444
+msgid "iCalendar files (.ics)"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:445
+msgid "Evolution iCalendar importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:521
+msgid "Reminder!"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:573
+msgid "vCalendar files (.vcf)"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:574
+msgid "Evolution vCalendar importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:736
+msgid "Calendar Events"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:773
+msgid "Evolution Calendar intelligent importer"
+msgstr ""
+
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:7
+msgid "Africa/Abidjan"
+msgstr ""
+
+#: ../calendar/zones.h:8
+msgid "Africa/Accra"
+msgstr ""
+
+#: ../calendar/zones.h:9
+msgid "Africa/Addis_Ababa"
+msgstr ""
+
+#: ../calendar/zones.h:10
+msgid "Africa/Algiers"
+msgstr ""
+
+#: ../calendar/zones.h:11
+msgid "Africa/Asmera"
+msgstr ""
+
+#: ../calendar/zones.h:12
+msgid "Africa/Bamako"
+msgstr ""
+
+#: ../calendar/zones.h:13
+msgid "Africa/Bangui"
+msgstr ""
+
+#: ../calendar/zones.h:14
+msgid "Africa/Banjul"
+msgstr ""
+
+#: ../calendar/zones.h:15
+msgid "Africa/Bissau"
+msgstr ""
+
+#: ../calendar/zones.h:16
+msgid "Africa/Blantyre"
+msgstr ""
+
+#: ../calendar/zones.h:17
+msgid "Africa/Brazzaville"
+msgstr ""
+
+#: ../calendar/zones.h:18
+msgid "Africa/Bujumbura"
+msgstr ""
+
+#: ../calendar/zones.h:19
+msgid "Africa/Cairo"
+msgstr ""
+
+#: ../calendar/zones.h:20
+msgid "Africa/Casablanca"
+msgstr ""
+
+#: ../calendar/zones.h:21
+msgid "Africa/Ceuta"
+msgstr ""
+
+#: ../calendar/zones.h:22
+msgid "Africa/Conakry"
+msgstr ""
+
+#: ../calendar/zones.h:23
+msgid "Africa/Dakar"
+msgstr ""
+
+#: ../calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr ""
+
+#: ../calendar/zones.h:25
+msgid "Africa/Djibouti"
+msgstr ""
+
+#: ../calendar/zones.h:26
+msgid "Africa/Douala"
+msgstr ""
+
+#: ../calendar/zones.h:27
+msgid "Africa/El_Aaiun"
+msgstr ""
+
+#: ../calendar/zones.h:28
+msgid "Africa/Freetown"
+msgstr ""
+
+#: ../calendar/zones.h:29
+msgid "Africa/Gaborone"
+msgstr ""
+
+#: ../calendar/zones.h:30
+msgid "Africa/Harare"
+msgstr ""
+
+#: ../calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr ""
+
+#: ../calendar/zones.h:32
+msgid "Africa/Kampala"
+msgstr ""
+
+#: ../calendar/zones.h:33
+msgid "Africa/Khartoum"
+msgstr ""
+
+#: ../calendar/zones.h:34
+msgid "Africa/Kigali"
+msgstr ""
+
+#: ../calendar/zones.h:35
+msgid "Africa/Kinshasa"
+msgstr ""
+
+#: ../calendar/zones.h:36
+msgid "Africa/Lagos"
+msgstr ""
+
+#: ../calendar/zones.h:37
+msgid "Africa/Libreville"
+msgstr ""
+
+#: ../calendar/zones.h:38
+msgid "Africa/Lome"
+msgstr ""
+
+#: ../calendar/zones.h:39
+msgid "Africa/Luanda"
+msgstr ""
+
+#: ../calendar/zones.h:40
+msgid "Africa/Lubumbashi"
+msgstr ""
+
+#: ../calendar/zones.h:41
+msgid "Africa/Lusaka"
+msgstr ""
+
+#: ../calendar/zones.h:42
+msgid "Africa/Malabo"
+msgstr ""
+
+#: ../calendar/zones.h:43
+msgid "Africa/Maputo"
+msgstr ""
+
+#: ../calendar/zones.h:44
+msgid "Africa/Maseru"
+msgstr ""
+
+#: ../calendar/zones.h:45
+msgid "Africa/Mbabane"
+msgstr ""
+
+#: ../calendar/zones.h:46
+msgid "Africa/Mogadishu"
+msgstr ""
+
+#: ../calendar/zones.h:47
+msgid "Africa/Monrovia"
+msgstr ""
+
+#: ../calendar/zones.h:48
+msgid "Africa/Nairobi"
+msgstr ""
+
+#: ../calendar/zones.h:49
+msgid "Africa/Ndjamena"
+msgstr ""
+
+#: ../calendar/zones.h:50
+msgid "Africa/Niamey"
+msgstr ""
+
+#: ../calendar/zones.h:51
+msgid "Africa/Nouakchott"
+msgstr ""
+
+#: ../calendar/zones.h:52
+msgid "Africa/Ouagadougou"
+msgstr ""
+
+#: ../calendar/zones.h:53
+msgid "Africa/Porto-Novo"
+msgstr ""
+
+#: ../calendar/zones.h:54
+msgid "Africa/Sao_Tome"
+msgstr ""
+
+#: ../calendar/zones.h:55
+msgid "Africa/Timbuktu"
+msgstr ""
+
+#: ../calendar/zones.h:56
+msgid "Africa/Tripoli"
+msgstr ""
+
+#: ../calendar/zones.h:57
+msgid "Africa/Tunis"
+msgstr ""
+
+#: ../calendar/zones.h:58
+msgid "Africa/Windhoek"
+msgstr ""
+
+#: ../calendar/zones.h:59
+msgid "America/Adak"
+msgstr ""
+
+#: ../calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: ../calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: ../calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: ../calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: ../calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: ../calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: ../calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: ../calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: ../calendar/zones.h:68
+msgid "America/Belize"
+msgstr ""
+
+#: ../calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: ../calendar/zones.h:70
+msgid "America/Bogota"
+msgstr ""
+
+#: ../calendar/zones.h:71
+msgid "America/Boise"
+msgstr ""
+
+#: ../calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr ""
+
+#: ../calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr ""
+
+#: ../calendar/zones.h:74
+msgid "America/Cancun"
+msgstr ""
+
+#: ../calendar/zones.h:75
+msgid "America/Caracas"
+msgstr ""
+
+#: ../calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: ../calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: ../calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: ../calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: ../calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: ../calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: ../calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr ""
+
+#: ../calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: ../calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: ../calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: ../calendar/zones.h:86
+msgid "America/Dawson"
+msgstr ""
+
+#: ../calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr ""
+
+#: ../calendar/zones.h:88
+msgid "America/Denver"
+msgstr ""
+
+#: ../calendar/zones.h:89
+msgid "America/Detroit"
+msgstr ""
+
+#: ../calendar/zones.h:90
+msgid "America/Dominica"
+msgstr ""
+
+#: ../calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: ../calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: ../calendar/zones.h:93
+msgid "America/El_Salvador"
+msgstr ""
+
+#: ../calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr ""
+
+#: ../calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr ""
+
+#: ../calendar/zones.h:96
+msgid "America/Godthab"
+msgstr ""
+
+#: ../calendar/zones.h:97
+msgid "America/Goose_Bay"
+msgstr ""
+
+#: ../calendar/zones.h:98
+msgid "America/Grand_Turk"
+msgstr ""
+
+#: ../calendar/zones.h:99
+msgid "America/Grenada"
+msgstr ""
+
+#: ../calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: ../calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr ""
+
+#: ../calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: ../calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: ../calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: ../calendar/zones.h:105
+msgid "America/Havana"
+msgstr ""
+
+#: ../calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr ""
+
+#: ../calendar/zones.h:107
+msgid "America/Indiana/Indianapolis"
+msgstr ""
+
+#: ../calendar/zones.h:108
+msgid "America/Indiana/Knox"
+msgstr ""
+
+#: ../calendar/zones.h:109
+msgid "America/Indiana/Marengo"
+msgstr ""
+
+#: ../calendar/zones.h:110
+msgid "America/Indiana/Vevay"
+msgstr ""
+
+#: ../calendar/zones.h:111
+msgid "America/Indianapolis"
+msgstr ""
+
+#: ../calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr ""
+
+#: ../calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr ""
+
+#: ../calendar/zones.h:114
+msgid "America/Jamaica"
+msgstr ""
+
+#: ../calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: ../calendar/zones.h:116
+msgid "America/Juneau"
+msgstr ""
+
+#: ../calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr ""
+
+#: ../calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr ""
+
+#: ../calendar/zones.h:119
+msgid "America/La_Paz"
+msgstr ""
+
+#: ../calendar/zones.h:120
+msgid "America/Lima"
+msgstr ""
+
+#: ../calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr ""
+
+#: ../calendar/zones.h:122
+msgid "America/Louisville"
+msgstr ""
+
+#: ../calendar/zones.h:123
+msgid "America/Maceio"
+msgstr ""
+
+#: ../calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: ../calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: ../calendar/zones.h:126
+msgid "America/Martinique"
+msgstr ""
+
+#: ../calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: ../calendar/zones.h:128
+msgid "America/Mendoza"
+msgstr ""
+
+#: ../calendar/zones.h:129
+msgid "America/Menominee"
+msgstr ""
+
+#: ../calendar/zones.h:130
+msgid "America/Merida"
+msgstr ""
+
+#: ../calendar/zones.h:131
+msgid "America/Mexico_City"
+msgstr ""
+
+#: ../calendar/zones.h:132
+msgid "America/Miquelon"
+msgstr ""
+
+#: ../calendar/zones.h:133
+msgid "America/Monterrey"
+msgstr ""
+
+#: ../calendar/zones.h:134
+msgid "America/Montevideo"
+msgstr ""
+
+#: ../calendar/zones.h:135
+msgid "America/Montreal"
+msgstr ""
+
+#: ../calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: ../calendar/zones.h:137
+msgid "America/Nassau"
+msgstr ""
+
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "America/New_York"
+msgstr ""
+
+#: ../calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr ""
+
+#: ../calendar/zones.h:140
+msgid "America/Nome"
+msgstr ""
+
+#: ../calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: ../calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: ../calendar/zones.h:143
+msgid "America/Panama"
+msgstr ""
+
+#: ../calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: ../calendar/zones.h:145
+msgid "America/Paramaribo"
+msgstr ""
+
+#: ../calendar/zones.h:146
+msgid "America/Phoenix"
+msgstr ""
+
+#: ../calendar/zones.h:147
+msgid "America/Port-au-Prince"
+msgstr ""
+
+#: ../calendar/zones.h:148
+msgid "America/Port_of_Spain"
+msgstr ""
+
+#: ../calendar/zones.h:149
+msgid "America/Porto_Velho"
+msgstr ""
+
+#: ../calendar/zones.h:150
+msgid "America/Puerto_Rico"
+msgstr ""
+
+#: ../calendar/zones.h:151
+msgid "America/Rainy_River"
+msgstr ""
+
+#: ../calendar/zones.h:152
+msgid "America/Rankin_Inlet"
+msgstr ""
+
+#: ../calendar/zones.h:153
+msgid "America/Recife"
+msgstr ""
+
+#: ../calendar/zones.h:154
+msgid "America/Regina"
+msgstr ""
+
+#: ../calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: ../calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: ../calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: ../calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: ../calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: ../calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: ../calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: ../calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: ../calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: ../calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: ../calendar/zones.h:165
+msgid "America/St_Thomas"
+msgstr ""
+
+#: ../calendar/zones.h:166
+msgid "America/St_Vincent"
+msgstr ""
+
+#: ../calendar/zones.h:167
+msgid "America/Swift_Current"
+msgstr ""
+
+#: ../calendar/zones.h:168
+msgid "America/Tegucigalpa"
+msgstr ""
+
+#: ../calendar/zones.h:169
+msgid "America/Thule"
+msgstr ""
+
+#: ../calendar/zones.h:170
+msgid "America/Thunder_Bay"
+msgstr ""
+
+#: ../calendar/zones.h:171
+msgid "America/Tijuana"
+msgstr ""
+
+#: ../calendar/zones.h:172
+msgid "America/Tortola"
+msgstr ""
+
+#: ../calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr ""
+
+#: ../calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr ""
+
+#: ../calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr ""
+
+#: ../calendar/zones.h:176
+msgid "America/Yakutat"
+msgstr ""
+
+#: ../calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: ../calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: ../calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: ../calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: ../calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: ../calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: ../calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: ../calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: ../calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: ../calendar/zones.h:186
+msgid "Antarctica/Vostok"
+msgstr ""
+
+#: ../calendar/zones.h:187
+msgid "Arctic/Longyearbyen"
+msgstr ""
+
+#: ../calendar/zones.h:188
+msgid "Asia/Aden"
+msgstr ""
+
+#: ../calendar/zones.h:189
+msgid "Asia/Almaty"
+msgstr ""
+
+#: ../calendar/zones.h:190
+msgid "Asia/Amman"
+msgstr ""
+
+#: ../calendar/zones.h:191
+msgid "Asia/Anadyr"
+msgstr ""
+
+#: ../calendar/zones.h:192
+msgid "Asia/Aqtau"
+msgstr ""
+
+#: ../calendar/zones.h:193
+msgid "Asia/Aqtobe"
+msgstr ""
+
+#: ../calendar/zones.h:194
+msgid "Asia/Ashgabat"
+msgstr ""
+
+#: ../calendar/zones.h:195
+msgid "Asia/Baghdad"
+msgstr ""
+
+#: ../calendar/zones.h:196
+msgid "Asia/Bahrain"
+msgstr ""
+
+#: ../calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr ""
+
+#: ../calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr ""
+
+#: ../calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr ""
+
+#: ../calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr ""
+
+#: ../calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr ""
+
+#: ../calendar/zones.h:202
+msgid "Asia/Calcutta"
+msgstr ""
+
+#: ../calendar/zones.h:203
+msgid "Asia/Choibalsan"
+msgstr ""
+
+#: ../calendar/zones.h:204
+msgid "Asia/Chongqing"
+msgstr ""
+
+#: ../calendar/zones.h:205
+msgid "Asia/Colombo"
+msgstr ""
+
+#: ../calendar/zones.h:206
+msgid "Asia/Damascus"
+msgstr ""
+
+#: ../calendar/zones.h:207
+msgid "Asia/Dhaka"
+msgstr ""
+
+#: ../calendar/zones.h:208
+msgid "Asia/Dili"
+msgstr ""
+
+#: ../calendar/zones.h:209
+msgid "Asia/Dubai"
+msgstr ""
+
+#: ../calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr ""
+
+#: ../calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr ""
+
+#: ../calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr ""
+
+#: ../calendar/zones.h:213
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+#: ../calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: ../calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: ../calendar/zones.h:216
+msgid "Asia/Istanbul"
+msgstr ""
+
+#: ../calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr ""
+
+#: ../calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr ""
+
+#: ../calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr ""
+
+#: ../calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr ""
+
+#: ../calendar/zones.h:221
+msgid "Asia/Kamchatka"
+msgstr ""
+
+#: ../calendar/zones.h:222
+msgid "Asia/Karachi"
+msgstr ""
+
+#: ../calendar/zones.h:223
+msgid "Asia/Kashgar"
+msgstr ""
+
+#: ../calendar/zones.h:224
+msgid "Asia/Katmandu"
+msgstr ""
+
+#: ../calendar/zones.h:225
+msgid "Asia/Krasnoyarsk"
+msgstr ""
+
+#: ../calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr ""
+
+#: ../calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr ""
+
+#: ../calendar/zones.h:228
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: ../calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: ../calendar/zones.h:230
+msgid "Asia/Macau"
+msgstr ""
+
+#: ../calendar/zones.h:231
+msgid "Asia/Magadan"
+msgstr ""
+
+#: ../calendar/zones.h:232
+msgid "Asia/Makassar"
+msgstr ""
+
+#: ../calendar/zones.h:233
+msgid "Asia/Manila"
+msgstr ""
+
+#: ../calendar/zones.h:234
+msgid "Asia/Muscat"
+msgstr ""
+
+#: ../calendar/zones.h:235
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: ../calendar/zones.h:236
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: ../calendar/zones.h:237
+msgid "Asia/Omsk"
+msgstr ""
+
+#: ../calendar/zones.h:238
+msgid "Asia/Oral"
+msgstr ""
+
+#: ../calendar/zones.h:239
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: ../calendar/zones.h:240
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: ../calendar/zones.h:241
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: ../calendar/zones.h:242
+msgid "Asia/Qatar"
+msgstr ""
+
+#: ../calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../calendar/zones.h:244
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: ../calendar/zones.h:245
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: ../calendar/zones.h:246
+msgid "Asia/Saigon"
+msgstr ""
+
+#: ../calendar/zones.h:247
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: ../calendar/zones.h:248
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: ../calendar/zones.h:249
+msgid "Asia/Seoul"
+msgstr ""
+
+#: ../calendar/zones.h:250
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: ../calendar/zones.h:251
+msgid "Asia/Singapore"
+msgstr ""
+
+#: ../calendar/zones.h:252
+msgid "Asia/Taipei"
+msgstr ""
+
+#: ../calendar/zones.h:253
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: ../calendar/zones.h:254
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: ../calendar/zones.h:255
+msgid "Asia/Tehran"
+msgstr ""
+
+#: ../calendar/zones.h:256
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: ../calendar/zones.h:257
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: ../calendar/zones.h:258
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: ../calendar/zones.h:259
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: ../calendar/zones.h:260
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: ../calendar/zones.h:261
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: ../calendar/zones.h:262
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: ../calendar/zones.h:263
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: ../calendar/zones.h:264
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: ../calendar/zones.h:265
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: ../calendar/zones.h:266
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: ../calendar/zones.h:267
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: ../calendar/zones.h:268
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: ../calendar/zones.h:269
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: ../calendar/zones.h:270
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: ../calendar/zones.h:271
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: ../calendar/zones.h:272
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: ../calendar/zones.h:273
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: ../calendar/zones.h:274
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: ../calendar/zones.h:275
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: ../calendar/zones.h:276
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: ../calendar/zones.h:277
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: ../calendar/zones.h:278
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: ../calendar/zones.h:279
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: ../calendar/zones.h:280
+msgid "Australia/Darwin"
+msgstr ""
+
+#: ../calendar/zones.h:281
+msgid "Australia/Hobart"
+msgstr ""
+
+#: ../calendar/zones.h:282
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: ../calendar/zones.h:283
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: ../calendar/zones.h:284
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: ../calendar/zones.h:285
+msgid "Australia/Perth"
+msgstr ""
+
+#: ../calendar/zones.h:286
+msgid "Australia/Sydney"
+msgstr ""
+
+#: ../calendar/zones.h:287
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: ../calendar/zones.h:288
+msgid "Europe/Andorra"
+msgstr ""
+
+#: ../calendar/zones.h:289
+msgid "Europe/Athens"
+msgstr ""
+
+#: ../calendar/zones.h:290
+msgid "Europe/Belfast"
+msgstr ""
+
+#: ../calendar/zones.h:291
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: ../calendar/zones.h:292
+msgid "Europe/Berlin"
+msgstr ""
+
+#: ../calendar/zones.h:293
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: ../calendar/zones.h:294
+msgid "Europe/Brussels"
+msgstr ""
+
+#: ../calendar/zones.h:295
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: ../calendar/zones.h:296
+msgid "Europe/Budapest"
+msgstr ""
+
+#: ../calendar/zones.h:297
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: ../calendar/zones.h:298
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: ../calendar/zones.h:299
+msgid "Europe/Dublin"
+msgstr ""
+
+#: ../calendar/zones.h:300
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: ../calendar/zones.h:301
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: ../calendar/zones.h:302
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: ../calendar/zones.h:303
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: ../calendar/zones.h:304
+msgid "Europe/Kiev"
+msgstr ""
+
+#: ../calendar/zones.h:305
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: ../calendar/zones.h:306
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: ../calendar/zones.h:307
+msgid "Europe/London"
+msgstr ""
+
+#: ../calendar/zones.h:308
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: ../calendar/zones.h:309
+msgid "Europe/Madrid"
+msgstr ""
+
+#: ../calendar/zones.h:310
+msgid "Europe/Malta"
+msgstr ""
+
+#: ../calendar/zones.h:311
+msgid "Europe/Minsk"
+msgstr ""
+
+#: ../calendar/zones.h:312
+msgid "Europe/Monaco"
+msgstr ""
+
+#: ../calendar/zones.h:313
+msgid "Europe/Moscow"
+msgstr ""
+
+#: ../calendar/zones.h:314
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: ../calendar/zones.h:315
+msgid "Europe/Oslo"
+msgstr ""
+
+#: ../calendar/zones.h:316
+msgid "Europe/Paris"
+msgstr ""
+
+#: ../calendar/zones.h:317
+msgid "Europe/Prague"
+msgstr ""
+
+#: ../calendar/zones.h:318
+msgid "Europe/Riga"
+msgstr ""
+
+#: ../calendar/zones.h:319
+msgid "Europe/Rome"
+msgstr ""
+
+#: ../calendar/zones.h:320
+msgid "Europe/Samara"
+msgstr ""
+
+#: ../calendar/zones.h:321
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: ../calendar/zones.h:322
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: ../calendar/zones.h:323
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: ../calendar/zones.h:324
+msgid "Europe/Skopje"
+msgstr ""
+
+#: ../calendar/zones.h:325
+msgid "Europe/Sofia"
+msgstr ""
+
+#: ../calendar/zones.h:326
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: ../calendar/zones.h:327
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: ../calendar/zones.h:328
+msgid "Europe/Tirane"
+msgstr ""
+
+#: ../calendar/zones.h:329
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: ../calendar/zones.h:330
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: ../calendar/zones.h:331
+msgid "Europe/Vatican"
+msgstr ""
+
+#: ../calendar/zones.h:332
+msgid "Europe/Vienna"
+msgstr ""
+
+#: ../calendar/zones.h:333
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: ../calendar/zones.h:334
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: ../calendar/zones.h:335
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: ../calendar/zones.h:336
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: ../calendar/zones.h:337
+msgid "Europe/Zurich"
+msgstr ""
+
+#: ../calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: ../calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr ""
+
+#: ../calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr ""
+
+#: ../calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr ""
+
+#: ../calendar/zones.h:342
+msgid "Indian/Comoro"
+msgstr ""
+
+#: ../calendar/zones.h:343
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: ../calendar/zones.h:344
+msgid "Indian/Mahe"
+msgstr ""
+
+#: ../calendar/zones.h:345
+msgid "Indian/Maldives"
+msgstr ""
+
+#: ../calendar/zones.h:346
+msgid "Indian/Mauritius"
+msgstr ""
+
+#: ../calendar/zones.h:347
+msgid "Indian/Mayotte"
+msgstr ""
+
+#: ../calendar/zones.h:348
+msgid "Indian/Reunion"
+msgstr ""
+
+#: ../calendar/zones.h:349
+msgid "Pacific/Apia"
+msgstr ""
+
+#: ../calendar/zones.h:350
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: ../calendar/zones.h:351
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: ../calendar/zones.h:352
+msgid "Pacific/Easter"
+msgstr ""
+
+#: ../calendar/zones.h:353
+msgid "Pacific/Efate"
+msgstr ""
+
+#: ../calendar/zones.h:354
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: ../calendar/zones.h:355
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: ../calendar/zones.h:356
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: ../calendar/zones.h:357
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: ../calendar/zones.h:358
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: ../calendar/zones.h:359
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: ../calendar/zones.h:360
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: ../calendar/zones.h:361
+msgid "Pacific/Guam"
+msgstr ""
+
+#: ../calendar/zones.h:362
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: ../calendar/zones.h:363
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: ../calendar/zones.h:364
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: ../calendar/zones.h:365
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: ../calendar/zones.h:366
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: ../calendar/zones.h:367
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Midway"
+msgstr ""
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Niue"
+msgstr ""
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Palau"
+msgstr ""
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Truk"
+msgstr ""
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Wake"
+msgstr ""
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Yap"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:107
+#, c-format
+msgid "%.0fK"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:110
+#, c-format
+msgid "%.0fM"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:113
+#, c-format
+msgid "%.0fG"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:988
+msgid "Attachment Bar"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:557
+msgid "Posting destination"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:558
+msgid "Choose folders to post the message to."
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:589
+msgid "Click here for the address book"
+msgstr ""
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: ../composer/e-msg-composer-hdrs.c:619
+msgid "_Reply-To:"
+msgstr ""
+
+#.
+#. * From
+#.
+#: ../composer/e-msg-composer-hdrs.c:626
+msgid "Fr_om:"
+msgstr ""
+
+#.
+#. * Subject
+#.
+#: ../composer/e-msg-composer-hdrs.c:633
+msgid "S_ubject:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:642
+msgid "_To:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:643
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:646
+msgid "_Cc:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:647
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:650
+msgid "_Bcc:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:651
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+
+#.
+#. * Post-To
+#.
+#: ../composer/e-msg-composer-hdrs.c:658
+msgid "_Post To:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:663
+msgid "Click here to select folders to post to"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:669
+msgid "Post To:"
+msgstr ""
+
+#: ../composer/e-msg-composer-select-file.c:82
+msgid "A_ttach"
+msgstr ""
+
+#: ../composer/e-msg-composer-select-file.c:239
+msgid "Insert Attachment"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:828
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:835
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
+msgid "Hide _Attachment Bar"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
+msgid "Show _Attachment Bar"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
+#: ../plugins/mail-remote/e-corba-utils.c:135
+msgid "Unknown reason"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1402
+msgid "Could not open file"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1410
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1689
+msgid "Untitled Message"
+msgstr ""
+
+#. NB: This function is never used anymore
+#: ../composer/e-msg-composer.c:1724
+msgid "Open File"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
+msgid "Autogenerated"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:2254
+msgid "Si_gnature:"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
+msgid "Compose Message"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:4974
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:3
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:18
+msgid "Because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:6
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Could not create composer window."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Could not create message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Download in progress. Do you want to send the mail?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:17
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:22
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:23
+msgid "Unfinished messages found"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "Warning: Modified Message"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "You cannot attach the file `{0}' to this message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Do not Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Save Message"
+msgstr "Gwarediñ ar gemennadenn"
+
+#: ../data/evolution.desktop.in.in.h:1
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:515
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+msgid "Groupware Suite"
+msgstr ""
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "The Evolution PIM and Email Client"
+msgstr ""
+
+#: ../data/evolution.keys.in.in.h:1
+msgid "address card"
+msgstr ""
+
+#: ../data/evolution.keys.in.in.h:2
+msgid "calendar information"
+msgstr "Titouroù an deiziadur"
+
+#: ../designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Implijerion :</b>"
+
+#: ../designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:10
+msgid "No, Do not Change Status"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:12
+msgid "Out of Office Assistant"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:13
+msgid "Yes, Change Status"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
+msgid "<b>Receiving Email</b>"
+msgstr "<b>Oc'h atoriñ Postel</b>"
+
+#: ../designs/read_receipts/read.glade.h:3
+msgid "<b>Sending Email:</b>"
+msgstr "<b>O kas Postel :</b>"
+
+#: ../designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:6
+msgid "Always send back a read receipt"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: ../e-util/e-dialog-utils.c:281
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "Skrivañ war ar restr ?"
+
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+msgid "Evolution Error"
+msgstr "Fazi Evolution"
+
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+msgid "Evolution Warning"
+msgstr ""
+
+#: ../e-util/e-error.c:124
+msgid "Evolution Information"
+msgstr "Titour Evolution"
+
+#: ../e-util/e-error.c:126
+msgid "Evolution Query"
+msgstr ""
+
+#. setup a dummy error
+#: ../e-util/e-error.c:443
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file &quot;{0}&quot;."
+msgstr "N'eus ket tu da zigeriñ ar restr &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file &quot;{0}&quot;."
+msgstr "N'eus ket tu da warediñ ar restr &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists &quot;{0}&quot;."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
+msgid "_Overwrite"
+msgstr "Skrivañ war"
+
+#: ../e-util/eggtrayicon.c:121
+msgid "The orientation of the tray."
+msgstr ""
+
+#: ../filter/filter-datespec.c:78
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:79
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:285
+msgid "<click here to select a date>"
+msgstr ""
+
+#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+msgid "now"
+msgstr "bremañ"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/filter-datespec.c:295
+msgid "%d-%b-%Y"
+msgstr ""
+
+#: ../filter/filter-datespec.c:415
+msgid "Select a time to compare against"
+msgstr ""
+
+#: ../filter/filter-file.c:289
+msgid "Choose a file"
+msgstr "Dibabit ur restr"
+
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
+msgid "Important"
+msgstr ""
+
+#. forest green
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
+msgid "Later"
+msgstr "Diwezhatoc'h"
+
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr ""
+
+#: ../filter/filter-rule.c:799
+msgid "_Search name:"
+msgstr ""
+
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
+msgstr ""
+
+#: ../filter/filter-rule.c:866
+msgid "If all criteria are met"
+msgstr ""
+
+#: ../filter/filter-rule.c:866
+msgid "If any criteria are met"
+msgstr ""
+
+#: ../filter/filter-rule.c:868
+msgid "Find items:"
+msgstr ""
+
+#: ../filter/filter-rule.c:889
+msgid "All related"
+msgstr ""
+
+#: ../filter/filter-rule.c:889
+msgid "Replies"
+msgstr ""
+
+#: ../filter/filter-rule.c:889
+msgid "Replies and parents"
+msgstr ""
+
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr ""
+
+#: ../filter/filter-rule.c:891
+msgid "Include threads"
+msgstr ""
+
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:311
+msgid "Incoming"
+msgstr ""
+
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
+msgid "Outgoing"
+msgstr ""
+
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+msgid "Missing name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr ""
+
+#: ../filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr ""
+
+#: ../filter/filter.glade.h:2
+msgid "Compare against"
+msgstr ""
+
+#: ../filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr ""
+
+#: ../filter/filter.glade.h:5
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: ../filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.glade.h:12
+msgid "a time relative to the current time"
+msgstr ""
+
+#: ../filter/filter.glade.h:13
+msgid "ago"
+msgstr ""
+
+#: ../filter/filter.glade.h:17
+msgid "months"
+msgstr ""
+
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr ""
+
+#: ../filter/filter.glade.h:19
+msgid "the current time"
+msgstr ""
+
+#: ../filter/filter.glade.h:20
+msgid "the time you specify"
+msgstr ""
+
+#: ../filter/filter.glade.h:22
+msgid "years"
+msgstr ""
+
+#: ../filter/rule-editor.c:378
+msgid "Add Rule"
+msgstr ""
+
+#: ../filter/rule-editor.c:454
+msgid "Edit Rule"
+msgstr ""
+
+#: ../filter/rule-editor.c:732
+msgid "Rule name"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Postel"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Postel"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:531
+msgid "Mail Accounts"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Dibaboù gwellañ Postel"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "Postel"
+
+#: ../mail/em-account-editor.c:403
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: ../mail/em-account-editor.c:410
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
+msgid "Select Folder"
+msgstr ""
+
+#: ../mail/em-account-editor.c:778
+msgid "Ask for each message"
+msgstr ""
+
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
+msgid "Identity"
+msgstr ""
+
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
+msgid "Receiving Email"
+msgstr "Oc'h atoriñ Postel"
+
+#: ../mail/em-account-editor.c:2013
+msgid "Automatically check for _new mail every"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
+msgid "Sending Email"
+msgstr "O kas Postel"
+
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
+msgid "Defaults"
+msgstr "Dre ziouer"
+
+#. Security settings
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
+msgid "Security"
+msgstr ""
+
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
+msgid "Receiving Options"
+msgstr "Oc'h atoriñ neuziadoù"
+
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+msgid "Checking for New Mail"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
+msgid "Evolution Account Assistant"
+msgstr ""
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Disable"
+msgstr ""
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:411
+msgid "Enable"
+msgstr ""
+
+#. translators: default account indicator
+#: ../mail/em-account-prefs.c:466
+msgid "[Default]"
+msgstr ""
+
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:493
+msgid "Enabled"
+msgstr ""
+
+#: ../mail/em-account-prefs.c:524
+msgid "Account name"
+msgstr ""
+
+#: ../mail/em-account-prefs.c:526
+msgid "Protocol"
+msgstr ""
+
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:967
+msgid "Unnamed"
+msgstr ""
+
+#: ../mail/em-composer-prefs.c:936
+msgid "Language(s)"
+msgstr "Yezh(où)"
+
+#: ../mail/em-composer-prefs.c:979
+msgid "Add signature script"
+msgstr ""
+
+#: ../mail/em-composer-prefs.c:999
+msgid "Signature(s)"
+msgstr ""
+
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1665
+msgid "an unknown sender"
+msgstr ""
+
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: ../mail/em-composer-utils.c:1712
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: ../mail/em-filter-editor.c:155
+msgid "_Filter Rules"
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: ../mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:27
+msgid "is"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../ui/evolution-mail-message.xml.h:48
+msgid "Junk"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:39
+msgid "Match All"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:40
+msgid "Message Body"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:41
+msgid "Message Header"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:42
+msgid "Message is Junk"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:43
+msgid "Message is not Junk"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:44
+msgid "Move to Folder"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:45
+msgid "Pipe to Program"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:46
+msgid "Play Sound"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+msgid "Read"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:48
+msgid "Recipients"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:49
+msgid "Regex Match"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:50
+msgid "Replied to"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:51
+msgid "returns"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:52
+msgid "returns greater than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:53
+msgid "returns less than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:54
+msgid "Run Program"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:56
+msgid "Sender"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:57
+msgid "Set Status"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:58
+msgid "Size (kB)"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:59
+msgid "sounds like"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:60
+msgid "Source Account"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:61
+msgid "Specific header"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:62
+msgid "starts with"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:64
+msgid "Stop Processing"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:336
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1132
+msgid "Subject"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:66
+msgid "Unset Status"
+msgstr ""
+
+#. and now for the action area
+#: ../mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr ""
+
+#: ../mail/em-folder-browser.c:144
+msgid "C_reate Search Folder From Search..."
+msgstr ""
+
+#. TODO: can this be done in a loop?
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:150
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:163
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/em-folder-properties.c:316
+#: ../plugins/groupwise-features/properties.glade.h:3
+msgid "Folder Properties"
+msgstr ""
+
+#: ../mail/em-folder-selection-button.c:123
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: ../mail/em-folder-selector.c:261
+msgid "Create"
+msgstr "Krouiñ"
+
+#: ../mail/em-folder-selector.c:265
+msgid "Folder _name:"
+msgstr "Anv ar renkell :"
+
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
+msgid "Search Folders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+msgid "UNMATCHED"
+msgstr ""
+
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
+msgid "Drafts"
+msgstr ""
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
+#: ../plugins/exchange-operations/exchange-folder.c:598
+msgid "Inbox"
+msgstr ""
+
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
+msgid "Outbox"
+msgstr ""
+
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
+msgid "Sent"
+msgstr "Kaset"
+
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+msgid "Loading..."
+msgstr "O kargañ..."
+
+#: ../mail/em-folder-tree.c:694
+msgid "Mail Folder Tree"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:854
+#, c-format
+msgid "Moving folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:856
+#, c-format
+msgid "Copying folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:881
+msgid "Cannot drop message(s) into toplevel store"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
+msgid "_Copy to Folder"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
+msgid "_Move to Folder"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr ""
+
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:52
+msgid "_View"
+msgstr "Gwelout"
+
+#: ../mail/em-folder-tree.c:2043
+msgid "Open in _New Window"
+msgstr "Digeriñ e-barzh ur prenestr nevez"
+
+#: ../mail/em-folder-tree.c:2047
+msgid "_Copy..."
+msgstr "Kopiañ..."
+
+#: ../mail/em-folder-tree.c:2048
+msgid "_Move..."
+msgstr "Dilec'hiañ"
+
+#. FIXME: need to disable for nochildren folders
+#: ../mail/em-folder-tree.c:2052
+msgid "_New Folder..."
+msgstr "Renkell nevez..."
+
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
+msgid "_Rename..."
+msgstr "Adenvel..."
+
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
+msgid "_Empty Trash"
+msgstr ""
+
+#: ../mail/em-folder-utils.c:104
+#, c-format
+msgid "Copying `%s' to `%s'"
+msgstr ""
+
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
+msgid "Select folder"
+msgstr "Dibabit ur renkell"
+
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
+msgid "C_opy"
+msgstr "Kopiañ"
+
+#: ../mail/em-folder-utils.c:581
+#: ../plugins/groupwise-features/share-folder-common.c:145
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "O krouiñ ar renkell `%s'"
+
+#: ../mail/em-folder-utils.c:730
+#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/share-folder-common.c:388
+msgid "Create folder"
+msgstr "Krouiñ ur renkell"
+
+#: ../mail/em-folder-utils.c:730
+#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/share-folder-common.c:388
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
+msgid "_Reply to Sender"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:110
+msgid "_Forward"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
+msgid "_Edit as New Message..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1092
+msgid "U_ndelete"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1093
+msgid "_Move to Folder..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1094
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1097
+msgid "Mar_k as Read"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1098
+msgid "Mark as _Unread"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1099
+msgid "Mark as _Important"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1101
+msgid "Mark as _Junk"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1102
+msgid "Mark as _Not Junk"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1103
+msgid "Mark for Follo_w Up..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "Ebet"
+
+#: ../mail/em-folder-view.c:1111
+msgid "Fla_g Completed"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1112
+msgid "Cl_ear Flag"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1115
+msgid "Crea_te Rule From Message"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1116
+msgid "Search Folder from _Subject"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1117
+msgid "Search Folder from Se_nder"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1118
+msgid "Search Folder from _Recipients"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1119
+msgid "Search Folder from Mailing _List"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1123
+msgid "Filter on Sub_ject"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1124
+msgid "Filter on Sen_der"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1125
+msgid "Filter on Re_cipients"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1126
+msgid "Filter on _Mailing List"
+msgstr ""
+
+#. default charset used in mail view
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
+msgid "Default"
+msgstr "Dre ziouer"
+
+#: ../mail/em-folder-view.c:2110
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+#: ../plugins/print-message/print-message.c:87
+msgid "Print Message"
+msgstr "Moulañ ar gemennadenn"
+
+#: ../mail/em-folder-view.c:2266
+msgid "Unable to retrieve message"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2461
+msgid "Create _Search Folder"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2462
+msgid "_From this Address"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2463
+msgid "_To this Address"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2817
+#, c-format
+msgid "Click to mail %s"
+msgstr ""
+
+#. message-search popup match count string
+#: ../mail/em-format-html-display.c:496
+#, c-format
+msgid "Matches: %d"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
+msgid "Unsigned"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:756
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
+msgid "Valid signature"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:757
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
+msgid "Invalid signature"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:758
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:759
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:759
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
+msgid "Unencrypted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:765
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
+msgid "Encrypted, weak"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:766
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
+msgid "Encrypted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:767
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
+msgid "Encrypted, strong"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:768
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
+msgid "_View Certificate"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:884
+msgid "This certificate is not viewable"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1174
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1182
+msgid "Overdue:"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1185
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1245
+msgid "_View Inline"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1246
+msgid "_Hide"
+msgstr "Kuzhat"
+
+#: ../mail/em-format-html-display.c:1247
+msgid "_Fit to Width"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1248
+msgid "Show _Original Size"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1874
+msgid "Select folder to save all attachments..."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1921
+msgid "_Save Selected..."
+msgstr ""
+
+#. Cant i put in the number of attachments here ?
+#: ../mail/em-format-html-display.c:1988
+#, c-format
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
+msgid "S_ave"
+msgstr "Gwarediñ"
+
+#: ../mail/em-format-html-display.c:2006
+msgid "S_ave All"
+msgstr "Gwarediñ an holl"
+
+#: ../mail/em-format-html-display.c:2067
+msgid "No Attachment"
+msgstr ""
+
+#: ../mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
+#, c-format
+msgid "Retrieving `%s'"
+msgstr ""
+
+#: ../mail/em-format-html.c:610
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: ../mail/em-format-html.c:881
+msgid "Malformed external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:911
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:922
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: ../mail/em-format-html.c:924
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:945
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:956
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: ../mail/em-format-html.c:1183
+msgid "Formatting message"
+msgstr ""
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
+msgid "From"
+msgstr "Eus"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
+msgid "Reply-To"
+msgstr ""
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr ""
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
+msgid "Cc"
+msgstr ""
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
+msgid "Bcc"
+msgstr ""
+
+#. pseudo-header
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
+msgid "Mailer"
+msgstr ""
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: ../mail/em-format-html.c:1615
+msgid "<I> (%a, %R %Z)</I>"
+msgstr ""
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: ../mail/em-format-html.c:1618
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
+msgid "Date"
+msgstr ""
+
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
+msgid "Newsgroups"
+msgstr ""
+
+#: ../mail/em-format.c:1102
+#, c-format
+msgid "%s attachment"
+msgstr ""
+
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+
+#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: ../mail/em-format.c:1279
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: ../mail/em-format.c:1446
+msgid "Unsupported signature format"
+msgstr ""
+
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+msgid "Error verifying signature"
+msgstr ""
+
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+msgid "Unknown error verifying signature"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:103
+msgid "Every time"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:104
+msgid "Once per day"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:105
+msgid "Once per week"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:106
+msgid "Once per month"
+msgstr ""
+
+#: ../mail/em-migrate.c:1209
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:1648
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1674
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1859
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2063
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2077
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2106
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2712
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2731
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+msgid "_Reply to sender"
+msgstr ""
+
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
+msgid "Reply to _List"
+msgstr ""
+
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Digeriñ an ere e-barzh ar furcher gwiad"
+
+#: ../mail/em-popup.c:621
+msgid "_Send New Message To..."
+msgstr "Kas ur gemennadenn nevez da ..."
+
+#: ../mail/em-popup.c:622
+msgid "_Add to Address Book"
+msgstr "Ouzhpennañ d'ar c'harned chomlec'h"
+
+#: ../mail/em-subscribe-editor.c:615
+msgid "This store does not support subscriptions, or they are not enabled."
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:644
+msgid "Subscribed"
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:648
+msgid "Folder"
+msgstr "Renkell"
+
+#. FIXME: This is just to get the shadow, is there a better way?
+#: ../mail/em-subscribe-editor.c:869
+msgid "Please select a server."
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:890
+msgid "No server has been selected"
+msgstr "N'eus servijer ebet a zo bet diuzet"
+
+#: ../mail/em-utils.c:124
+msgid "Do not show this message again."
+msgstr ""
+
+#: ../mail/em-utils.c:319
+msgid "Message Filters"
+msgstr ""
+
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
+msgid "message"
+msgstr "Kemennadenn"
+
+#: ../mail/em-utils.c:668
+msgid "Save Message..."
+msgstr "Gwarediñ ar gemennadenn..."
+
+#: ../mail/em-utils.c:717
+msgid "Add address"
+msgstr "Ouzhpennañ ar chomlec'h"
+
+#. Drop filename for messages from a mailbox
+#: ../mail/em-utils.c:1201
+#, c-format
+msgid "Messages from %s"
+msgstr "Kemennadennoù eus %s"
+
+#: ../mail/em-vfolder-editor.c:112
+msgid "Search _Folders"
+msgstr "Klask renkelloù"
+
+#: ../mail/em-vfolder-rule.c:576
+msgid "Search Folder source"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight color"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight color."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:10
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:11
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:12
+msgid "Default forward style"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:13
+msgid "Default height of the Composer Window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:14
+msgid "Default height of the Message Window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:15
+msgid "Default height of the Subscribe dialog"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:16
+msgid "Default reply style"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:17
+msgid "Default width of the Composer Window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:18
+msgid "Default width of the Message Window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:19
+msgid "Default width of the Subscribe dialog"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:20
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:21
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:22
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:23
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:24
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:28
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:29
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:30
+msgid "List of Labels and their associated colors"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accepted licenses"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:32
+msgid "List of accounts"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:33
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:34
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:35
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:36
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:37
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:38
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:39
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images in mail from contacts 2 - Always "
+"load images off the net"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:40
+msgid "Log filter actions"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:41
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:42
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:43
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:44
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:45
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:46
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:47
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:48
+msgid "Message Window default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:49
+msgid "Message Window default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:50
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:51
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:52
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:53
+msgid "New Mail Notify sound file"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:54
+msgid "New Mail Notify type"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:55
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:56
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:57
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:58
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:59
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:60
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:61
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:62
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:63
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:64
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:65
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:66
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:67
+msgid "Send HTML mail by default"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:68
+msgid "Send HTML mail by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:69
+msgid "Show Animations"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:70
+msgid "Show animated images as animations."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:71
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:72
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:75
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:76
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:77
+msgid "Spell check inline"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:78
+msgid "Subscribe dialog default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:79
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:80
+msgid "Terminal font"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:81
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:82
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:83
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:85
+msgid "Thread the message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:86
+msgid "Thread the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:87
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:88
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:89
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:90
+msgid "UID string of the default account."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:91
+msgid "Use Spamassassin daemon and client"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:92
+msgid "Use Spamassassin daemon and client (spamc/spamd)"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:93
+msgid "Use custom fonts"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:94
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:95
+msgid "Use only local spam tests."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:96
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:97
+msgid "Variable width font"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:98
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:99
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:100
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:101
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:102
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:103
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:104
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:105
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:106
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:107
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:108
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:192
+msgid "Importing Elm data"
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:381
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:382
+msgid "Import mail from Elm."
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
+msgid "Destination folder:"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
+msgid "Select folder to import into"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:223
+msgid "Berkeley Mailbox (mbox)"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:224
+msgid "Importer Berkeley Mailbox format folders"
+msgstr ""
+
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
+#, c-format
+msgid "Importing `%s'"
+msgstr "Oc'h enporzhiañ `%s'"
+
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
+msgid "Please wait"
+msgstr ""
+
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
+msgid "Importing mailbox"
+msgstr ""
+
+#: ../mail/importers/mail-importer.c:376
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:74
+#, c-format
+msgid "Priority Filter \"%s\""
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:663
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:687
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:704
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:1251
+msgid "Evolution is importing your old Netscape data"
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:1708
+msgid "Importing Netscape data"
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:1908
+msgid "Settings"
+msgstr "Neuziadoù"
+
+#: ../mail/importers/netscape-importer.c:1913
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Postel da %s"
+
+#: ../mail/importers/netscape-importer.c:1934
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: ../mail/importers/pine-importer.c:229
+msgid "Importing Pine data"
+msgstr ""
+
+#: ../mail/importers/pine-importer.c:433
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: ../mail/importers/pine-importer.c:434
+msgid "Import mail from Pine."
+msgstr ""
+
+#: ../mail/mail-autofilter.c:79
+#, c-format
+msgid "Mail to %s"
+msgstr "Postel da %s"
+
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#, c-format
+msgid "Mail from %s"
+msgstr "Postel eus %s"
+
+#: ../mail/mail-autofilter.c:266
+#, c-format
+msgid "Subject is %s"
+msgstr ""
+
+#: ../mail/mail-autofilter.c:301
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: ../mail/mail-autofilter.c:372
+msgid "Add Filter Rule"
+msgstr ""
+
+#: ../mail/mail-component.c:521
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:523
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:546
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:548
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d kaset"
+msgstr[1] "%d kaset"
+
+#: ../mail/mail-component.c:550
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:554
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:556
+#, c-format
+msgid ", %d unread"
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:779
+msgid "New Mail Message"
+msgstr "Kemennadenn postel nevez"
+
+#: ../mail/mail-component.c:780
+msgid "_Mail Message"
+msgstr "Kemennadenn postel"
+
+#: ../mail/mail-component.c:781
+msgid "Compose a new mail message"
+msgstr "Skrivañ ur gemennadenn postel nevez"
+
+#: ../mail/mail-component.c:787
+msgid "New Mail Folder"
+msgstr ""
+
+#: ../mail/mail-component.c:788
+msgid "Mail _Folder"
+msgstr ""
+
+#: ../mail/mail-component.c:789
+msgid "Create a new mail folder"
+msgstr ""
+
+#: ../mail/mail-component.c:933
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "Pouezus"
+
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr ""
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr ""
+
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr ""
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
+msgid " Ch_eck for Supported Types "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
+msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sig_natures</b>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:6
+msgid "<b>_Languages</b>"
+msgstr "<b>Yezhoù</b>"
+
+#: ../mail/mail-config.glade.h:7
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr "<span weight=\"bold\">Dilemel ar bostel</span>"
+
+#: ../mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:23
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">Neuziadoù</span>"
+
+#: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Security</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:35
+msgid "Account Management"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:38
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted mail"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:40
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:42
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted mail"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:44
+msgid "Attach original message"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _smiley images"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:47
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:48
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:49
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:50
+msgid "C_haracter set:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:51
+msgid "Ch_eck for Supported Types "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:52
+msgid "Check in_coming mail for junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:53
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:54
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:55
+msgid "Cle_ar"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:56
+msgid "Clea_r"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:57
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:58
+msgid "Colors"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:59
+msgid "Confirm _when expunging a folder"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:60
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:66
+msgid "De_fault"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:67
+msgid "Default character e_ncoding:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:70
+msgid "Digitally _sign outgoing messages (by default)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:71
+msgid "Do not quote original message"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
+msgid "Done"
+msgstr "Graet"
+
+#: ../mail/mail-config.glade.h:73
+msgid "Drafts _Folder:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:75
+msgid "Email Accounts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:76
+msgid "Email _Address:"
+msgstr "Chomlec'h ar bostel :"
+
+#: ../mail/mail-config.glade.h:77
+msgid "Empty trash folders on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:78
+msgid "Encry_ption certificate:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:79
+msgid "Encrypt out_going messages (by default)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:81
+msgid "Fi_xed width Font:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:82
+msgid "Fi_xed-width:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:83
+msgid "Font Properties"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:84
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:85
+msgid "Full Nam_e:"
+msgstr "Anv leun :"
+
+#: ../mail/mail-config.glade.h:87
+msgid "HTML Mail"
+msgstr "Postel HTML"
+
+#: ../mail/mail-config.glade.h:88
+msgid "Headers"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:89
+msgid "Highlight _quotations with"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:90
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:93
+msgid "Inline"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:95
+msgid "Languages Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:97
+msgid "Mail Configuration"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:98
+msgid "Mail Headers Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:100
+msgid "Mailbox location"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:101
+msgid "Message Composer"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:102
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:103
+msgid "Or_ganization:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:104
+msgid "PGP/GPG _Key ID:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
+msgid "Play sound file when new mail arri_ves"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:108
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:110
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:111
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:112
+msgid "Please select among the following options"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:113
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:114
+msgid "Quote original message"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:115
+msgid "Quoted"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:116
+msgid "Re_member password"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:117
+msgid "Re_ply-To:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:119
+msgid "Remember _password"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:120
+msgid "S_elect..."
+msgstr "Diuzit..."
+
+#: ../mail/mail-config.glade.h:121
+msgid "S_tandard Font:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:122
+msgid "Se_lect..."
+msgstr "Diuzit..."
+
+#: ../mail/mail-config.glade.h:124
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:125
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:126
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:127
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:128
+msgid "Select sound file"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:131
+msgid "Sending Mail"
+msgstr "O kas postel"
+
+#: ../mail/mail-config.glade.h:132
+msgid "Sent _Messages Folder:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:133
+msgid "Ser_ver requires authentication"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:134
+msgid "Server _Type: "
+msgstr "Seurt servijer : "
+
+#: ../mail/mail-config.glade.h:135
+msgid "Sig_ning certificate:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:136
+msgid "Signat_ure:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:137
+msgid "Signatures"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:138
+msgid "Signatures Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:139
+msgid "Specify _filename:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:140
+msgid "Spell Checking"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:141
+msgid "T_ype: "
+msgstr "Seurt : "
+
+#: ../mail/mail-config.glade.h:142
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:143
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+msgid "User_name:"
+msgstr "Anv implijer :"
+
+#: ../mail/mail-config.glade.h:150
+msgid "V_ariable-width:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:151
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:155
+msgid "_Add Signature"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:156
+msgid "_Always load images from the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:157
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:158
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:160
+msgid "_Forward style:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:161
+msgid "_Load images in mail from contacts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:162
+msgid "_Make this my default account"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:163
+msgid "_Mark messages as read after"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:165
+msgid "_Never load images from the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:166
+msgid "_Path:"
+msgstr "Hent :"
+
+#: ../mail/mail-config.glade.h:167
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:168
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:169
+msgid "_Reply style:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:170
+msgid "_Script:"
+msgstr ""
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.glade.h:173
+msgid "_Show image animations"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
+msgid "_Use Secure Connection:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:175
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:176
+msgid "color"
+msgstr "liv"
+
+#: ../mail/mail-config.glade.h:177
+msgid "description"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:3
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:4
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:5
+msgid "Case _sensitive"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+msgid "Co_mpleted"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:8
+msgid "F_ind:"
+msgstr "Klask :"
+
+#: ../mail/mail-dialogs.glade.h:9
+msgid "Find in Message"
+msgstr "Klask e-barzh ar gemennadenn"
+
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:11
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:12
+msgid "License Agreement"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:13
+msgid "None Selected"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:14
+msgid "S_erver:"
+msgstr "Servijer :"
+
+#: ../mail/mail-dialogs.glade.h:15
+msgid "Security Information"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:19
+msgid "_Accept License"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Subscribe"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:23
+msgid "_Tick this to accept the license agreement"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:24
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr ""
+
+#: ../mail/mail-folder-cache.c:858
+#, c-format
+msgid "Pinging %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:104
+msgid "Filtering Folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:265
+msgid "Fetching Mail"
+msgstr ""
+
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:565
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: ../mail/mail-ops.c:623
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:735
+#, c-format
+msgid "Sending message %d of %d"
+msgstr ""
+
+#: ../mail/mail-ops.c:760
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
+msgid "Canceled."
+msgstr ""
+
+#: ../mail/mail-ops.c:764
+msgid "Complete."
+msgstr ""
+
+#: ../mail/mail-ops.c:861
+msgid "Saving message to folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:946
+#, c-format
+msgid "Moving messages to %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:946
+#, c-format
+msgid "Copying messages to %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1169
+msgid "Forwarded messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:1212
+#, c-format
+msgid "Opening folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1284
+#, c-format
+msgid "Opening store %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1362
+#, c-format
+msgid "Removing folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1456
+#, c-format
+msgid "Storing folder '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1521
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1522
+#, c-format
+msgid "Storing account '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1577
+msgid "Refreshing folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
+msgid "Expunging folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:1661
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1662
+msgid "Local Folders"
+msgstr ""
+
+#: ../mail/mail-ops.c:1745
+#, c-format
+msgid "Retrieving message %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1855
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-ops.c:1941
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "O warediñ %d kemennadenn"
+msgstr[1] "O warediñ %d kemennadenn"
+
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2019
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2091
+msgid "Saving attachment"
+msgstr ""
+
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2120
+#, c-format
+msgid "Could not write data: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2269
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2269
+#, c-format
+msgid "Reconnecting to %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2385
+msgid "Checking Service"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:158
+msgid "Canceling..."
+msgstr ""
+
+#: ../mail/mail-send-recv.c:329
+msgid "Send & Receive Mail"
+msgstr "Kas hag atoriñ Postel"
+
+#: ../mail/mail-send-recv.c:336
+msgid "Cancel _All"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:425
+msgid "Updating..."
+msgstr ""
+
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
+msgid "Waiting..."
+msgstr "O c'hortoz..."
+
+#: ../mail/mail-send-recv.c:709
+msgid "Checking for new mail"
+msgstr ""
+
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Roit ho ger-kuzh evit %s"
+
+#: ../mail/mail-session.c:206
+msgid "Enter Password"
+msgstr "Roit ho ger-kuzh"
+
+#: ../mail/mail-session.c:241
+msgid "User canceled operation."
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:384
+msgid "Edit signature"
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:431
+msgid "Enter a name for this signature."
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:434
+#: ../plugins/groupwise-features/properties.glade.h:5
+msgid "Name:"
+msgstr "Anv :"
+
+#: ../mail/mail-tools.c:120
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:150
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr ""
+
+#: ../mail/mail-tools.c:256
+#, c-format
+msgid "Forwarded message - %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:258
+msgid "Forwarded message"
+msgstr ""
+
+#: ../mail/mail-tools.c:298
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Renkell siek : `%s'"
+
+#: ../mail/mail-vfolder.c:91
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:240
+#, c-format
+msgid "Updating Search Folders for '%s:%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:247
+#, c-format
+msgid "Updating Search Folders for '%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:1050
+msgid "Edit Search Folder"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:1134
+msgid "New Search Folder"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:1
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:2
+msgid ""
+"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:5
+msgid ""
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:7
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:8
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:9
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:10
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:11
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:12
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:13
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder &quot;{0}&quot;?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:14
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:15
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message without a subject?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:17
+msgid "Because &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:19
+msgid "Because &quot;{2}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:20
+msgid "Blank Signature"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:21
+msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:22
+msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot create folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot create temporary save directory."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot delete folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot delete system folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:30
+msgid "Cannot open source &quot;{1}&quot;"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot open source &quot;{2}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open target &quot;{2}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:33
+msgid ""
+"Cannot read the license file &quot;{0}&quot;, due to an installation "
+"problem. You will not be able to use this provider until you can accept its "
+"license."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:34
+msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:35
+msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot save changes to account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:37
+msgid "Cannot save to directory &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:38
+msgid "Cannot save to file &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:39
+msgid "Cannot set signature script &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:40
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:41
+msgid "Could not save signature file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:42
+msgid "Delete &quot;{0}&quot;?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:43
+msgid "Delete account?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:44
+msgid "Discard changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:45
+msgid "Do not delete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:46
+msgid "Do not disable"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:47
+msgid "Do you want the operation to be performed in the subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:48
+msgid "Do you want to mark all messages as read?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:49
+msgid "Do you wish to save your changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:50
+msgid "Enter password."
+msgstr "Roit ho ger-kuzh"
+
+#: ../mail/mail.error.xml.h:51
+msgid "Error loading filter definitions."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:52
+msgid "Error while performing operation."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
+msgid "Error while {0}."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:54
+msgid "File exists but cannot overwrite it."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but is not a regular file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:56
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:57
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:58
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:59
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:61
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:62
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:63
+msgid "Ignore"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:64
+msgid "Invalid authentication"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:65
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:66
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:67
+msgid "Mark all messages as read"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:68
+msgid "Mark all messages as read in the selected folder"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:69
+msgid "Missing folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:71
+msgid "No sources selected."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:72
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:73
+msgid "Please check your account settings and try again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:74
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:75
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:76
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:79
+msgid "Please provide an unique name to identify this signature."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:80
+msgid "Please wait."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:81
+msgid "Problem migrating old mail folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:82
+msgid "Querying server"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:83
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:84
+msgid "Read receipt requested."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:85
+msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:86
+msgid "Search Folders automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:87
+msgid "Send Receipt"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:88
+msgid "Signature Already Exists"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:89
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:90
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+
+#: ../mail/mail.error.xml.h:93
+msgid ""
+"The following Search Folder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    &quot;{1}&quot;\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    &quot;{1}&quot;\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:103
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:104
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:106
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:108
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:109
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:110
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:111
+msgid "Unable to connect to the GroupWise server."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:112
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:113
+msgid "Unable to read license file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:114
+msgid "Use _Default"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:115
+msgid "Use default drafts folder?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:116
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:117
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:118
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:119
+msgid "You must name this Search Folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:120
+msgid "You must specify a folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:121
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:123
+msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:124
+msgid "_Append"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:125
+msgid "_Discard changes"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:127
+msgid "_Expunge"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:128
+msgid "_Open Messages"
+msgstr "Digeriñ kemennadennoù"
+
+#: ../mail/message-list.c:1000
+msgid "Unseen"
+msgstr ""
+
+#: ../mail/message-list.c:1001
+msgid "Seen"
+msgstr ""
+
+#: ../mail/message-list.c:1002
+msgid "Answered"
+msgstr ""
+
+#: ../mail/message-list.c:1003
+msgid "Multiple Unseen Messages"
+msgstr ""
+
+#: ../mail/message-list.c:1004
+msgid "Multiple Messages"
+msgstr ""
+
+#: ../mail/message-list.c:1008
+msgid "Lowest"
+msgstr ""
+
+#: ../mail/message-list.c:1009
+msgid "Lower"
+msgstr ""
+
+#: ../mail/message-list.c:1013
+msgid "Higher"
+msgstr ""
+
+#: ../mail/message-list.c:1014
+msgid "Highest"
+msgstr ""
+
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
+msgid "?"
+msgstr ""
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
+#: ../widgets/table/e-cell-date.c:72
+msgid "Today %l:%M %p"
+msgstr ""
+
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
+msgid "%b %d %Y"
+msgstr ""
+
+#: ../mail/message-list.c:2063
+msgid "Messages"
+msgstr ""
+
+#: ../mail/message-list.c:3442
+msgid "Generating message list"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:9
+msgid "Received"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+msgid "Size"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:75
+msgid "Call"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:76
+msgid "Do Not Forward"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:77
+msgid "Follow-Up"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:78
+msgid "For Your Information"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+msgid "Forward"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:80
+msgid "No Response Necessary"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+msgid "Reply"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+msgid "Reply to All"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:84
+msgid "Review"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:2
+msgid "Message contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:3
+msgid "Recipients contain"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:4
+msgid "Sender contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:5
+msgid "Subject contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Sender contains"
+msgstr ""
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr ""
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:51
+msgid "Select name of Evolution archive"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:61
+msgid "_Restart Evolution after backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:89
+msgid "Select Evolution archive to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:97
+msgid "_Restart Evolution after restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:109
+msgid "Backup Evolution directory"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:111
+msgid "Restore Evolution directory"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:113
+msgid "Check Evolution archive"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:115
+msgid "Restart Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+msgid "Backup and restore plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup Settings..."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "Backup and restore Evolution data and settings"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "Restore Settings..."
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr ""
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:454
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:475
+msgid "Instant Messaging Contacts"
+msgstr ""
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:490
+msgid ""
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr ""
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:507
+msgid "Synchronize with _buddy list now"
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid ""
+"Automatically fills your addressbook with names and email addresses as you "
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:269
+msgid "Use _SSL"
+msgstr "Implij SSL"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Local Calendars"
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Provides core functionality for local calendars."
+msgstr ""
+
+#: ../plugins/calendar-http/calendar-http.c:339
+msgid "_Secure connection"
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "HTTP Calendars"
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Cloudy"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Fog"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:62
+msgid "Weather: Partly Cloudy"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:63
+msgid "Weather: Rain"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Snow"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Sunny"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Thunderstorms"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:267
+msgid "Select a location"
+msgstr "Diuzit ul lec'hiadur"
+
+#: ../plugins/calendar-weather/calendar-weather.c:654
+msgid "_Units:"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:661
+msgid "Metric (Celsius, cm, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:662
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopiañ ar chomlec'h postel"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+msgid "Copy tool"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+msgid "Checks whether Evolution is the default mail client on startup."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+msgid "Default Mail Client "
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+msgid "Do you want to make Evolution your default e-mail client?"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:109
+msgid "Mark as _default folder"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
+msgid "_Account:"
+msgstr ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
+msgid "_User:"
+msgstr ""
+
+#. i18n: "Secure Password Authentication" is an Outlookism
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
+msgid "Secure Password"
+msgstr ""
+
+#. i18n: "NTLM" probably doesn't translate
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
+msgid "Plaintext Password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
+msgid "Out Of Office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
+msgid ""
+"The message specified below will be automatically sent to \n"
+"each person who sends mail to you while you are out of the office."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
+msgid "I am out of the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
+msgid "I am in the office"
+msgstr ""
+
+#. Change Password
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
+msgid "Change the password for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+msgid "Change Password"
+msgstr ""
+
+#. Delegation Assistant
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
+msgid "Manage the delegate settings for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
+msgid "Delegation Assitant"
+msgstr ""
+
+#. Miscelleneous settings
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
+msgid "Miscelleneous"
+msgstr "A bep seurt"
+
+#. Folder Size
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
+msgid "View the size of all Exchange folders"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
+msgid "Folders Size"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
+msgid "Exchange Settings"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
+msgid "_OWA URL:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
+msgid "A_uthenticate"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
+msgid "Authentication Type"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
+msgid "Ch_eck for Supported Types"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:166
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+
+#. User entered a wrong existing
+#. * password. Prompt him again.
+#.
+#: ../plugins/exchange-operations/exchange-change-password.c:115
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.c:122
+msgid "The two passwords do not match. Please re-enter the passwords."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+msgid "Confirm Password:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+msgid "Current Password:"
+msgstr "Ger-kuzh en implij :"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+msgid "New Password:"
+msgstr "Ger-kuzh nevez :"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+msgid "Your current password has expired. Please change your password now."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+msgid "Custom"
+msgstr "Personelaet"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#, c-format
+msgid "Permissions for %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:421
+msgid "Delegate To"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:562
+#, c-format
+msgid "Remove the delegate %s?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:680
+msgid "Could not access Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:692
+msgid "Could not find self in Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:705
+#, c-format
+msgid "Could not find delegate %s in Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:717
+#, c-format
+msgid "Could not remove delegate %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:777
+msgid "Could not update list of delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:795
+#, c-format
+msgid "Could not add delegate %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:963
+msgid "Error reading delegates list."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+msgid "C_alendar:"
+msgstr "Deiziadur :"
+
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+msgid "Co_ntacts:"
+msgstr "Darempredoù :"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid "Delegates"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "Aozer (lenn, krouiñ, kemmañ)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+msgid "Permissions for"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+msgid ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+msgid "_Delegate can see private items"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
+msgid "_Inbox:"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+msgid "_Tasks:"
+msgstr "Traoù d'ober :"
+
+#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
+msgid "Permissions..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+msgid "Folder Name"
+msgstr "Anv ar renkell"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+msgid "Folder Size"
+msgstr "Ment ar renkell"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+msgid "Exchange Folder Tree"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
+msgid "Unsubscribe Folder..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
+#, c-format
+msgid "Really unsubscribe from folder \"%s\"?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "Kemmañ ar ger-kuzh"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+msgid "(Permission denied.)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+msgid "Add User:"
+msgstr "Ouzhpennañ implijer :"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+msgid "Add User"
+msgstr "Ouzhpennañ implijer :"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+msgid "<b>Permissions</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+msgid "Cannot Delete"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+msgid "Cannot Edit"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+msgid "Create items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+msgid "Create subfolders"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+msgid "Delete Any Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+msgid "Delete Own Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+msgid "Edit Any Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+msgid "Edit Own Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+msgid "Folder contact"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+msgid "Folder owner"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+msgid "Folder visible"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+msgid "Read items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+msgid "Role: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+msgid "Select User"
+msgstr "Diuzit implijer"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+msgid "Address Book..."
+msgstr "Karned chomlec'h..."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+msgid "Subscribe to Other User's Contacts"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+msgid "Subscribe to Other User's Calendar"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot display folders."
+msgstr "N'eus ket tu da ziskouez renkelloù"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+msgid ""
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid "Could not authenticate to server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+msgid "Could not change password."
+msgstr "Ne oa ket tu da gemmañ ar ger-kuzh."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+msgid ""
+"Could not configure Exchange account because \n"
+"an unknown error occurred. Check the URL, \n"
+"username, and password, and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+msgid "Could not connect to Exchange server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+msgid "Could not connect to server {0}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+msgid "Could not determine folder permissions for delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+msgid "Could not find Exchange Web Storage System."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+msgid "Could not locate server {0}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+msgid "Could not make {0} a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+msgid "Could not read folder permissions"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+msgid "Could not read folder permissions."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+msgid "Could not read out-of-office state"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+msgid "Could not update folder permissions."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+msgid "Could not update out-of-office state"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+msgid "Exchange Account is offline."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid ""
+"Exchange Connector requires access to certain\n"
+"functionality on the Exchange Server that appears\n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
+"need to enable this functionality in order for \n"
+"you to be able to use Evolution Exchange Connector.\n"
+"\n"
+"For information to provide to your Exchange \n"
+"administrator, please follow the link below:\n"
+"\n"
+"{0}\n"
+"  "
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+msgid "Failed to update delegates:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+msgid "Folder already exists"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+msgid "Folder does not exist"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+msgid "Folder offline"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
+msgid "Generic error"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+msgid "Mailbox for {0} is not on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+msgid "Make sure the URL is correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid "Make sure the server name is spelled correctly and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "Make sure the username and password are correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+msgid "No Global Catalog server configured for this account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+msgid "No mailbox for user {0} on {1}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+msgid "No such user {0}"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+msgid "Password successfully changed."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "Please select a user."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Server rejected password because it is too weak."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "The Exchange account will be disabled when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "The Exchange account will be removed when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "The Exchange server is not compatible with Exchange Connector."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid ""
+"The server is running Exchange 5.5. Exchange Connector \n"
+"supports Microsoft Exchange 2000 and 2003 only."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+msgid ""
+"This probably means that your server requires \n"
+"you to specify the Windows domain name \n"
+"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Or you might have just typed your password wrong."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+msgid "Try again with a different password."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+msgid "Unable to add user to access control list:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+msgid "Unable to edit delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+msgid "Unknown error looking up {0}"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+msgid "Unknown error."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+msgid "Unknown type"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+msgid "Unsupported operation"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+msgid "You are nearing your quota available for storing mail on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+msgid "You cannot make yourself your own delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+msgid "You have exceeded your quota for storing mail on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+msgid "You may only configure a single Exchange account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+msgid ""
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "Your password has expired."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+msgid "{0} cannot be added to an access control list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+msgid "{0} is already a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid "{0} is already in the list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+msgid "Subscribe to Other User's Tasks"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+msgid "Check folder permissions"
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe Folders"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
+msgid "Checklist"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+msgid "Groupwise Account Setup"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:77
+msgid "Junk Settings"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:90
+msgid "<b>Junk Mail Settings</b>"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:112
+msgid "Junk Mail Settings..."
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:1
+msgid "<b>Junk List:</b>"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:2
+msgid "Email:"
+msgstr "Postel :"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
+msgid "_Disable"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:6
+msgid "_Enable"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:7
+msgid "_Junk List"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+msgid "Add Send Options to groupwise messages"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:17
+msgid "Send Options"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "A plugin for the features in Groupwise accounts."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+msgid "Groupwise Features"
+msgstr ""
+
+#: ../plugins/groupwise-features/process-meeting.c:49
+msgid "Accept Tentatively"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "<b>Users:</b>"
+msgstr "<b>Implijerion :</b>"
+
+#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../widgets/table/e-table-click-to-add.c:509
+msgid "Message"
+msgstr "Kemennadenn"
+
+#: ../plugins/groupwise-features/properties.glade.h:6
+msgid "Shared Folder Notification"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:8
+msgid "The participants will receive the following notification.\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:11
+msgid "_Contacts..."
+msgstr "Darempredoù..."
+
+#: ../plugins/groupwise-features/properties.glade.h:12
+msgid "_Customize notification message"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:13
+msgid "_Not Shared"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:15
+msgid "_Shared With ..."
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:16
+msgid "_Sharing"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
+msgid "<b>Name</b>"
+msgstr "<b>Anv</b>"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+msgid "Access Rights"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+msgid "Add/Edit"
+msgstr "Ouzhpennañ/Kemmañ"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+msgid "Con_tacts"
+msgstr "Darempredoù"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+msgid "Modify _folders/options/rules/"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+msgid "Read items marked _private"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+msgid "Reminder Notes"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+msgid "Subscribe to my _alarms"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+msgid "Subscribe to my _notifications"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Read"
+msgstr "Lenn"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
+msgid "_Write"
+msgstr "Skrivañ"
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+msgid "Proxy"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+msgid "<b>Account Name</b>"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+msgid "Proxy Login"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/send-options.c:83
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-login.c:505
+msgid "_Proxy Login..."
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy.c:697
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy.c:702
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:322
+msgid "Users"
+msgstr "Implijerion"
+
+#: ../plugins/groupwise-features/share-folder-common.c:323
+msgid "Enter the users and set permissions"
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:342
+msgid "New _Shared Folder..."
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:450
+msgid "Sharing"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:242
+msgid "Track Message Status..."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Account Setup"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Calendar"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+msgid "_Import to Tasks"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:198
+msgid "Import ICS"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:226
+msgid "Select Task List"
+msgstr "Diuzit ur roll an traoù d'ober"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:230
+msgid "Select Calendar"
+msgstr "Diuzit un deiziadur"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:261
+#: ../shell/e-shell-importer.c:703
+msgid "_Import"
+msgstr "Enporzhiañ"
+
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:158
+msgid "No output directory!"
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:159
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+#, fuzzy
+msgid "Could not export data!"
+msgstr "Ne oa ket tu da gemmañ ar ger-kuzh."
+
+#: ../plugins/ipod-sync/sync.c:203
+msgid "Exporting data failed."
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:231
+#, fuzzy
+msgid "Could not open addressbook!"
+msgstr "Dic'houest da gargañ ar c'harned-chomlec'h"
+
+#: ../plugins/ipod-sync/sync.c:232
+#, fuzzy
+msgid "Could not open the Evolution addressbook to export data."
+msgstr "Kuitaet en deus karned chomlec'h Evolution hep abeg."
+
+#: ../plugins/ipod-sync/sync.c:291
+#, fuzzy
+msgid "Could not open calendar/todo!"
+msgstr "N'eus ket tu dilemel ar c'harned chomlec'h."
+
+#: ../plugins/ipod-sync/sync.c:292
+msgid "Could not open the Evolution calendar/todo list to export data."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:488
+msgid "Unable to find any calendars"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:495
+msgid "Unable to find this meeting in any calendar"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:499
+msgid "Unable to find this task in any task list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:503
+msgid "Unable to find this journal entry in any journal"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:529
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:726
+msgid "Unable to parse item"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:782
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:793
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:797
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:802
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:807
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:900
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:907
+msgid "Sent a cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:909
+msgid "Could not send the cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:994
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1021
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1025
+msgid "Attendee status updated"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1152
+msgid "The calendar attached is not valid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1153
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
+msgid "The item in the calendar is not valid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1213
+msgid "The calendar attached contains multiple items"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1214
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:1994
+msgid "_Delete message after acting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+msgid "Conflict Search"
+msgstr ""
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:2019
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
+msgid "Today"
+msgstr "Hiziv"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:189
+msgid "Today %H:%M"
+msgstr "Hiziv %H:%M"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:193
+msgid "Today %H:%M:%S"
+msgstr "Hiziv %H:%M:%S"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:202
+msgid "Today %l:%M:%S %p"
+msgstr "Hiziv %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:212
+msgid "Tomorrow"
+msgstr "Warc'hoazh"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:217
+msgid "Tomorrow %H:%M"
+msgstr "Warc'hoazh %H:%M"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:221
+msgid "Tomorrow %H:%M:%S"
+msgstr "Warc'hoazh %H:%M:%S"
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:226
+msgid "Tomorrow %l:%M %p"
+msgstr "Warc'hoazh %l:%M %p"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:230
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Warc'hoazh %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:249
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:254
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:258
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:263
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:267
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. without a year.
+#: ../plugins/itip-formatter/itip-view.c:276
+msgid "%A, %B %e"
+msgstr "%A, %B %e"
+
+#. strftime format of a weekday, a date
+#. without a year and a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:282
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %B %e %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:286
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %B %e %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:291
+msgid "%A, %B %e %l:%M %p"
+msgstr ""
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:295
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %B %e %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:301
+msgid "%A, %B %e, %Y"
+msgstr "%A, %B %e, %Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:306
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %B %e, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:310
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %B %e, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:315
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %B %e, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:319
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
+
+#: ../plugins/itip-formatter/itip-view.c:344
+#, c-format
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:346
+#, c-format
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:351
+#, c-format
+msgid "<b>%s</b> has delegated the following meeting to you:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:354
+#, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:356
+#, c-format
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:362
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:364
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:367
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:370
+#, c-format
+msgid "<b>%s</b> has sent back the following meeting response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:374
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
+msgid "<b>%s</b> has canceled the following meeting."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:379
+#, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:385
+#, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:412
+#, c-format
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:414
+#, c-format
+msgid "<b>%s</b> has published the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:419
+#, c-format
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:422
+#, c-format
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:424
+#, c-format
+msgid "<b>%s</b> has assigned you a task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:430
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:432
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:435
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:438
+#, c-format
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:442
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:444
+#, c-format
+msgid "<b>%s</b> has canceled the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:447
+#, c-format
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:451
+#, c-format
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:453
+#, c-format
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr ""
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:705
+msgid "_Open Calendar"
+msgstr "Digeriñ an deiziadur"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
+msgid "_Accept"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Decline all"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:714
+msgid "_Tentative all"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+msgid "_Tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:715
+msgid "_Accept all"
+msgstr ""
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:724
+msgid "_Send Information"
+msgstr "Kas titouroù"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:728
+msgid "_Update Attendee Status"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:731
+msgid "_Update"
+msgstr ""
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:888
+msgid "Start time:"
+msgstr ""
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:897
+msgid "End time:"
+msgstr ""
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
+msgid "Comment:"
+msgstr "Addispleg :"
+
+#: ../plugins/itip-formatter/itip-view.c:977
+msgid "Send u_pdates to attendees"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:986
+msgid "A_pply to all instances"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Displays text/calendar parts in messages."
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot; ?"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "This meeting has been delegated"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+
+#: ../plugins/mail-account-disable/mail-account-disable.c:47
+msgid "Proxy _Logout"
+msgstr ""
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+msgid "Allows disabling of accounts."
+msgstr ""
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable Account"
+msgstr ""
+
+#: ../plugins/mail-remote/client.c:30
+#, c-format
+msgid "System error: %s"
+msgstr ""
+
+#: ../plugins/mail-remote/client.c:32
+#, c-format
+msgid "Camel error: %s"
+msgstr ""
+
+#: ../plugins/mail-remote/evolution-mail-store.c:476
+msgid "Account cannot send e-mail"
+msgstr ""
+
+#: ../plugins/mail-remote/evolution-mail-store.c:605
+msgid "No store available"
+msgstr ""
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr ""
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+msgid "Mail Remote"
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Con_vert to Task"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact list _owner"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get list _archive"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+msgid "Get list _usage information"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+msgid "Mailing List Actions"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+msgid "Mailing _List"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post message to list"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to list"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Un-subscribe to list"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "Send e-mail message to mailing list?"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+msgid "_Edit message"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr ""
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark me_ssages as read"
+msgstr ""
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
+msgid "Mark calendar offline"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
+msgid "Marks the selected calendar for offline viewing."
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+msgid "_Do not make this available offline"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+msgid "_Mark Calendar for offline use"
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+msgid "A plugin which implements mono plugins."
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Mono Loader"
+msgstr ""
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
+msgid "Generates a D-BUS message when new mail arrives."
+msgstr ""
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
+msgid "New Mail Notification"
+msgstr ""
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
+msgid "New mail notify"
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+msgid "A plugin for managing which plugins are enabled or disabled."
+msgstr ""
+
+#. Setup the ui
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
+#: ../plugins/plugin-manager/plugin-manager.c:180
+msgid "Plugin Manager"
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "_Plugins"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:43
+msgid "Author(s)"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../widgets/table/e-table-config-no-group.glade.h:6
+#: ../widgets/table/e-table-config.glade.h:5
+msgid "Description"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:193
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML messages.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
+msgstr ""
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+msgid "Plain Text Mode"
+msgstr ""
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:105
+msgid "Show HTML if present"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:106
+msgid "Prefer PLAIN"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:107
+msgid "Only ever show PLAIN"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:150
+msgid "HTML Mode"
+msgstr ""
+
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
+msgid "Gives an option to print mail from composer"
+msgstr ""
+
+#: ../plugins/print-message/org-gnome-print-message.xml.h:1
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr ""
+
+#: ../plugins/print-message/org-gnome-print-message.xml.h:2
+msgid "Prints the message"
+msgstr ""
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr ""
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:399
+msgid "Are you sure you want to remove this URL?"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "Porzh"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid "Publishing _Frequency:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+msgid "Service _type:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+msgid "_File:"
+msgstr "Restr :"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+msgid "Spamassassin junk plugin"
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+msgid "Save attachments"
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+msgid "Save Attachments ..."
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+msgid "Save all attachments"
+msgstr ""
+
+#: ../plugins/save-attachments/save-attachments.c:338
+msgid "Select save base name"
+msgstr ""
+
+#: ../plugins/save-attachments/save-attachments.c:358
+msgid "MIME Type"
+msgstr ""
+
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
+msgid "Save"
+msgstr "Gwarediñ"
+
+#.
+#. * Translator: the %F %T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the csv-file.
+#. *
+#: ../plugins/save-calendar/csv-format.c:171
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "UID"
+msgstr "UID"
+
+#: ../plugins/save-calendar/csv-format.c:387
+msgid "Description List"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "Categories List"
+msgstr "Roll ar rummadoù"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Comment List"
+msgstr "Roll an addisplegoù"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "Created"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Contact List"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:393
+msgid "Start"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "End"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "percent Done"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "URL"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:399
+msgid "Attendees List"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:401
+msgid "Modified"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:552
+msgid "Advanced options for the CSV format"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:559
+msgid "Prepend a header"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:568
+msgid "Value delimiter:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:574
+msgid "Record delimiter:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:580
+msgid "Encapsulate values with:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:602
+msgid "Comma separated value format (.csv)"
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Saves selected calendar or tasks list to disk."
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr ""
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:158
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:396
+msgid "RDF format (.rdf)"
+msgstr "Furmad RDF (.rdf)"
+
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:179
+msgid "Select destination file"
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+msgid "Select one source"
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+msgid "Selects a single calendar or task source for viewing."
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+msgid "Show _only this Calendar"
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Task List"
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+msgid "Startup wizard"
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:85
+msgid "Evolution Setup Assistant"
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:88
+msgid "Welcome"
+msgstr "Donedigezh vat"
+
+#: ../plugins/startup-wizard/startup-wizard.c:89
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
+msgid "Please select the information that you would like to import:"
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
+#, c-format
+msgid "From %s:"
+msgstr "Eus %s :"
+
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
+msgid "Importing data."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+msgid "Subject Threading"
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+msgid "Thread messages by subject"
+msgstr ""
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: ../plugins/subject-thread/subject-thread.c:54
+msgid "Fall back to threading messages by sub_ject"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "A GNOME Print description of the current printer settings"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Configuration version"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default sidebar width"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+msgid "Default window height"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+msgid "Default window width"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "Last upgraded configuration version"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Printer settings"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Sidebar is visible"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Skip development warning dialog"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
+msgid "Start in offline mode"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+msgid "The default height for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "The default width for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "The default width for the sidebar, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Toolbar is visible"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether the sidebar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+msgid "Whether the window buttons should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+msgid "Window button style"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+msgid "Window buttons are visible"
+msgstr ""
+
+#: ../shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr ""
+
+#: ../shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr ""
+
+#: ../shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
+msgid "(Untitled)"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:135
+msgid "Choose the type of importer to run:"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:138
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: ../shell/e-shell-importer.c:144
+msgid "Choose the destination for this import"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:150
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:285
+msgid "F_ilename:"
+msgstr "Anv ar restr :"
+
+#: ../shell/e-shell-importer.c:290
+msgid "Select a file"
+msgstr "Diuzit ur restr"
+
+#: ../shell/e-shell-importer.c:302
+msgid "File _type:"
+msgstr "Seurt ar restr :"
+
+#: ../shell/e-shell-importer.c:338
+msgid "Import data and settings from _older programs"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:341
+msgid "Import a _single file"
+msgstr ""
+
+#: ../shell/e-shell-settings-dialog.c:318
+msgid "Evolution Preferences"
+msgstr ""
+
+#: ../shell/e-shell-utils.c:118
+msgid "No folder name specified."
+msgstr ""
+
+#: ../shell/e-shell-utils.c:125
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: ../shell/e-shell-utils.c:131
+msgid "Folder name cannot contain the character \"/\"."
+msgstr ""
+
+#: ../shell/e-shell-utils.c:137
+msgid "Folder name cannot contain the character \"#\"."
+msgstr ""
+
+#: ../shell/e-shell-utils.c:143
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:71
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:79
+#, c-format
+msgid "Error executing %s."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:128
+msgid "Bug buddy is not installed."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:136
+msgid "Bug buddy could not be run."
+msgstr ""
+
+#. The translator-credits string is for translators to list
+#. * per language credits for translation, displayed in the
+#. * about box
+#: ../shell/e-shell-window-commands.c:561
+msgid "translator-credits"
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:806
+msgid "_Work Online"
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
+msgid "_Work Offline"
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:832
+msgid "Work Offline"
+msgstr ""
+
+#: ../shell/e-shell-window.c:371
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:379
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:386
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr ""
+
+#: ../shell/e-shell-window.c:786
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: ../shell/e-shell.c:633
+msgid "Uknown system error."
+msgstr ""
+
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
+msgid "OK"
+msgstr "Mat eo"
+
+#: ../shell/e-shell.c:1263
+msgid "Invalid arguments"
+msgstr ""
+
+#: ../shell/e-shell.c:1265
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: ../shell/e-shell.c:1267
+msgid "Configuration Database not found"
+msgstr ""
+
+#: ../shell/e-user-creatable-items-handler.c:685
+msgid "New"
+msgstr "Nevez"
+
+#: ../shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr ""
+
+#: ../shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr ""
+
+#: ../shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr ""
+
+#: ../shell/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: ../shell/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr ""
+
+#: ../shell/import.glade.h:3
+msgid "Import File"
+msgstr ""
+
+#: ../shell/import.glade.h:4
+msgid "Import Location"
+msgstr ""
+
+#: ../shell/import.glade.h:5
+msgid "Importer Type"
+msgstr ""
+
+#: ../shell/import.glade.h:6
+msgid "Select Importers"
+msgstr ""
+
+#: ../shell/import.glade.h:7
+msgid "Select a File"
+msgstr "Diuzit ur restr"
+
+#: ../shell/import.glade.h:8
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:231
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: ../shell/main.c:255
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+
+#: ../shell/main.c:262
+msgid "Do not tell me again"
+msgstr ""
+
+#: ../shell/main.c:472
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: ../shell/main.c:476
+msgid "Start in online mode"
+msgstr ""
+
+#: ../shell/main.c:479
+msgid "Forcibly shut down all Evolution components"
+msgstr ""
+
+#: ../shell/main.c:483
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr ""
+
+#: ../shell/main.c:486
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: ../shell/main.c:488
+msgid "Disable loading of any plugins."
+msgstr ""
+
+#: ../shell/main.c:519
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:2
+msgid "Continue"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:3
+msgid "Delete old data from version {0}?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:4
+msgid "Evolution can not start."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:7
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:8
+msgid "Really delete old data?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:9
+msgid ""
+"The entire contents of the &quot;evolution&quot; directory are about to be "
+"permanently removed.\n"
+"\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
+"\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:15
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:19
+msgid "Upgrade from previous version failed: {0}"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:20
+msgid ""
+"Upgrading your data and settings will require up to {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:23
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:26
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:31
+msgid "_Forget"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:32
+msgid "_Keep Data"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:33
+msgid "_Remind Me Later"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:34
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: ../smime/gui/ca-trust-dialog.c:104
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: ../smime/gui/cert-trust-dialog.c:154
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: ../smime/gui/cert-trust-dialog.c:158
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
+msgid "Select a certificate to import..."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
+msgid "Certificate Name"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
+msgid "Purposes"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
+msgid "Serial Number"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:293
+msgid "Expires"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:481
+msgid "E-Mail Address"
+msgstr ""
+
+#: ../smime/gui/certificate-viewer.c:341
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr ""
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:70
+msgid "Enter new password for certificate database"
+msgstr ""
+
+#: ../smime/gui/component.c:72
+msgid "Enter new password"
+msgstr ""
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:121
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:122
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:174
+msgid "Select certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:2
+msgid "<b>Certificate Fields</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:4
+msgid "<b>Field Value</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:6
+msgid "<b>Issued By</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:7
+msgid "<b>Issued To</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:9
+msgid "<b>Validity</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:10
+msgid "Authorities"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:11
+msgid "Backup"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:12
+msgid "Backup All"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+msgid "Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:16
+msgid "Certificate details"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:17
+msgid "Certificates Table"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:18
+msgid "Common Name (CN)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:19
+msgid "Contact Certificates"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:21
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:23
+msgid "Edit"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:24
+msgid "Email Certificate Trust Settings"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:25
+msgid "Email Recipient Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:26
+msgid "Email Signer Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:27
+msgid "Expires On"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:29
+msgid "Import"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:30
+msgid "Issued On"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:31
+msgid "MD5 Fingerprint"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:32
+msgid "Organization (O)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:33
+msgid "Organizational Unit (OU)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:34
+msgid "SHA1 Fingerprint"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+msgid "SSL Client Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+msgid "SSL Server Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:38
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:41
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:42
+msgid "View"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:43
+msgid "You have certificates from these organizations that identify you:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:44
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:45
+msgid "You have certificates on file that identify these people:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:46
+msgid "Your Certificates"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:47
+msgid "_Edit CA Trust"
+msgstr ""
+
+#. XXX we shouldn't be popping up dialogs in this code.
+#: ../smime/lib/e-cert-db.c:664
+msgid "Certificate already exists"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+msgid "%d/%m/%Y"
+msgstr ""
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:425
+msgid "Sign"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:426
+msgid "Encrypt"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:531
+msgid "Version"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:546
+msgid "Version 1"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:549
+msgid "Version 2"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:552
+msgid "Version 3"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:634
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:637
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:640
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:667
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:670
+msgid "Certificate Key Usage"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:673
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:676
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:688
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:739
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:747
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:769
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:774
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:789
+msgid "Subject's Public Key"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+msgid "Object Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:835
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:839
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:867
+msgid "Signing"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:871
+msgid "Non-repudiation"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:875
+msgid "Key Encipherment"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:879
+msgid "Data Encipherment"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:883
+msgid "Key Agreement"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:887
+msgid "Certificate Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:891
+msgid "CRL Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:939
+msgid "Critical"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+msgid "Not Critical"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:965
+msgid "Extensions"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1036
+#, c-format
+msgid "%s = %s"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+msgid "Certificate Signature Algorithm"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1101
+msgid "Issuer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1155
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1174
+msgid "Subject Unique ID"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1217
+msgid "Certificate Signature Value"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:266
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:266
+msgid "Enter password for PKCS12 file:"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:365
+msgid "Imported Certificate"
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:321
+msgid "An attachment to add."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:322
+msgid "Content type of the attachment."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:323
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:324
+msgid "Description of the attachment."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:325
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:326
+msgid "Default subject for the message."
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: ../tools/killev.c:61
+#, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr ""
+
+#: ../tools/killev.c:76
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:7
+msgid "Copy Selected Contacts to Another Folder..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Copy to Folder..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Create a new addressbook folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+msgid "Cut the selection"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:16
+msgid "Delete selected contacts"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:20
+msgid "Move Selected Contacts to Another Folder..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:22
+msgid "Move to Folder..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:25
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:28
+msgid "Print selected contacts"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:32
+msgid "Save selected contacts as a VCard."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
+msgid "Select All"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:36
+msgid "Select all contacts"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:37
+msgid "Send a message to the selected contacts."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:38
+msgid "Send message to contact"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "Send selected contacts to another person."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:40
+msgid "Show contact preview window"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:42
+msgid "Stop"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:43
+msgid "Stop Loading"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:44
+msgid "View the current contact"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
+msgid "_Actions"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:52
+msgid "_Forward Contact..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
+msgid "_New"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:63
+msgid "_Send Message to Contact..."
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:4
+msgid "Day"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:6
+msgid "Delete _all Occurrences"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:7
+msgid "Delete all occurrences"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:8
+msgid "Delete the appointment"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:10
+msgid "Delete this occurrence"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:11
+msgid "Go To"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:12
+msgid "Go back"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:13
+msgid "Go forward"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:14
+msgid "List"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:15
+msgid "Month"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+msgid "Next"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
+msgid "Previous"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:22
+msgid "Print this calendar"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+msgid "Purg_e"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:25
+msgid "Select _Date"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:27
+msgid "Select a specific date"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:28
+msgid "Select today"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:29
+msgid "Show as list"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:30
+msgid "Show one day"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:31
+msgid "Show one month"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:32
+msgid "Show one week"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:35
+msgid "View the current appointment"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:36
+msgid "Week"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:42
+msgid "_Open Appointment"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
+msgid "Copy selected text to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:3
+msgid "Copy selection to clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
+msgid "Cut selected text to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:7
+msgid "Cut selection to clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:9
+msgid "Paste from clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
+msgid "Paste text from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
+msgid "Select all text"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:2
+msgid "Click here to attach a file"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:3
+msgid "Click here to close the current window"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:4
+msgid "Click here to save the current window"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:5
+msgid "Click here to view help available"
+msgstr ""
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
+msgid "_Attachment..."
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
+msgid "_File"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
+msgid "_Help"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:21
+msgid "_Options"
+msgstr "Neuziadoù"
+
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All Day Event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:3
+msgid "All _Day Event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
+msgid "Classify as Confidential"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
+msgid "Classify as Private"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
+msgid "Classify as public"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:7
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
+msgid "Insert advanced send options"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:10
+msgid "Make this a recurring event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
+msgid "Pu_blic"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:12
+msgid "Query free / busy information for the attendees"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+msgid "R_ole Field"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:16
+msgid "Show time as _busy"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+msgid "Time _Zone"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+msgid "Toggles whether the Attendee Type field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
+msgid "Toggles whether to display categories"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:24
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:25
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:26
+msgid "_Alarms"
+msgstr "Alarmoù"
+
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
+msgid "_Classification"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
+msgid "_Confidential"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:30
+msgid "_Free/Busy"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
+msgid "_Private"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+msgid "_RSVP"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:33
+msgid "_Recurrence"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+msgid "_Status Field"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+msgid "_Type Field"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:3
+msgid "Copy the selected folder into another folder"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:4
+msgid "Create a new folder for storing mail"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:5
+msgid "Create or edit Search Folder definitions"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:7
+msgid "Empty _Trash"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "Renkell"
+
+#: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:10
+msgid "Move the selected folder into another folder"
+msgstr ""
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-global.xml.h:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Search F_olders"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show message preview window"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:16
+msgid "_Copy Folder To..."
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "_Message Filters"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "_Move Folder To..."
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "_New..."
+msgstr "Nevez..."
+
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Subscriptions"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:1
+msgid "Change the name of this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:2
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:5
+msgid "Copy selected message(s) to the clipboard"
+msgstr ""
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Cut selected message(s) to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:9
+msgid "E_xpunge"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:12
+msgid "Hide S_elected Messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:13
+msgid "Hide _Deleted Messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:14
+msgid "Hide _Read Messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:15
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:17
+msgid "Paste message(s) from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:18
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:19
+msgid "Permanently remove this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:20
+msgid "Select Message _Thread"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Select _All Messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:24
+msgid "Select all visible messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:25
+msgid "Sh_ow Hidden Messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:26
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:27
+msgid "Temporarily hide all messages that have already been read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Temporarily hide the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "Threaded Message list"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "_Group By Threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+msgid "_Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Address Book"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr ""
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
+msgid "Add Sender to Address Book"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:5
+msgid "All Message _Headers"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:6
+msgid "Apply filter rules to the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Check for _Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:8
+msgid "Compose _New Message"
+msgstr "Skrivañ ur gemennadenn nevez"
+
+#: ../ui/evolution-mail-message.xml.h:9
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:10
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:11
+msgid "Compose a reply to the sender of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to another folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:14
+msgid "Create R_ule"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:15
+msgid "Create a Search Folder for these recipients"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:16
+msgid "Create a Search Folder for this mailing list"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:17
+msgid "Create a Search Folder for this sender"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:18
+msgid "Create a Search Folder for this subject"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:19
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:20
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:21
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:22
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:24
+msgid "Decrease the text size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:26
+msgid "Display the next important message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:27
+msgid "Display the next message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:29
+msgid "Display the next unread message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:30
+msgid "Display the previous important message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:31
+msgid "Display the previous message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:32
+msgid "Display the previous unread message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:34
+msgid "Filter on Mailing _List..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:35
+msgid "Filter on Se_nder..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Recipients..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:37
+msgid "Filter on _Subject..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:39
+msgid "Flag selected messages for follow-up"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:43
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:44
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:45
+msgid "Forward the selected message to someone"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:46
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:47
+msgid "Increase the text size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:49
+msgid "Mar_k as"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:50
+msgid "Mark the selected messages as having been read"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:51
+msgid "Mark the selected messages as important"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:52
+msgid "Mark the selected messages as junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:53
+msgid "Mark the selected messages as not being junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:54
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:55
+msgid "Mark the selected messages as unimportant"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected messages for deletion"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:57
+msgid "Move selected messages to another folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:59
+msgid "Next _Important Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:60
+msgid "Next _Thread"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:61
+msgid "Next _Unread Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:62
+msgid "Not Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:63
+msgid "Open a window for composing a mail message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "P_revious Unread Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:68
+msgid "Pos_t New Message to Folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:69
+msgid "Post a Repl_y"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:70
+msgid "Post a message to a Public folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:71
+msgid "Post a reply to a message in a Public folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:72
+msgid "Pr_evious Important Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:73
+msgid "Preview the message to be printed"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:77
+msgid "Print this message"
+msgstr "Moulañ ar gemennadenn-mañ"
+
+#: ../ui/evolution-mail-message.xml.h:78
+msgid "Re_direct"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:79
+msgid "Redirect (bounce) the selected message to someone"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:84
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search Folder from Mailing _List..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Search Folder from Recipients..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:88
+msgid "Search Folder from S_ubject..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:89
+msgid "Search Folder from Sen_der..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:90
+msgid "Search for text in the body of the displayed message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:91
+msgid "Select _All Text"
+msgstr "Diuz pep tra"
+
+#: ../ui/evolution-mail-message.xml.h:92
+msgid "Select all the text in a message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:93
+msgid "Set up the page settings for your current printer"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:94
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Show messages in the normal style"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:96
+msgid "Show messages with all email headers"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "Show the raw email source of the message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Undelete the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:99
+msgid "Uni_mportant"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:100
+msgid "Zoom _Out"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:101
+msgid "_Attached"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:102
+msgid "_Caret Mode"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:103
+msgid "_Clear Flag"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:106
+msgid "_Delete Message"
+msgstr "Dilemel ar gemennadenn"
+
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Find in Message..."
+msgstr "Klask e-barzh ar gemennadenn..."
+
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Flag Completed"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:111
+msgid "_Go To"
+msgstr "Mont da"
+
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Important"
+msgstr "Pouezus"
+
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Inline"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:114
+msgid "_Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:115
+msgid "_Load Images"
+msgstr "Kargañ skeudennoù"
+
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Message Source"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:119
+msgid "_Next Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:120
+msgid "_Normal Size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:121
+msgid "_Not Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Open in New Window"
+msgstr "Digeriñ e-barzh ur prenestr nevez"
+
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Previous Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:125
+msgid "_Quoted"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:128
+msgid "_Save Message..."
+msgstr "Gwarediñ ar gemennadenn..."
+
+#: ../ui/evolution-mail-message.xml.h:129
+msgid "_Undelete Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:130
+msgid "_Unread"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:131
+msgid "_Zoom In"
+msgstr ""
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Serriñ ar prenestr-mañ"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+msgid "Main toolbar"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:13
+msgid "Close the current file"
+msgstr "Serriñ ar restr en implij"
+
+#: ../ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with PGP"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:14
+msgid "For_mat"
+msgstr "Furmad"
+
+#: ../ui/evolution-message-composer.xml.h:9
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:10
+msgid "HT_ML"
+msgstr "HTML"
+
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:13
+msgid "Open a file"
+msgstr "Digeriñ ur restr"
+
+#: ../ui/evolution-message-composer.xml.h:14
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:15
+msgid "PGP Sign"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:16
+msgid "R_equest Read Receipt"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:17
+msgid "S/MIME Encrypt"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:18
+msgid "S/MIME Sign"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Gwarediñ dindan"
+
+#: ../ui/evolution-message-composer.xml.h:21
+msgid "Save Draft"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:22
+msgid "Save _As..."
+msgstr "Gwarediñ dindan..."
+
+#: ../ui/evolution-message-composer.xml.h:23
+msgid "Save _Draft"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:24
+msgid "Save as draft"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:25
+msgid "Save in folder..."
+msgstr "Gwarediñ dindan ar renkell..."
+
+#: ../ui/evolution-message-composer.xml.h:26
+msgid "Save the current file"
+msgstr "Gwarediñ ar restr en implij"
+
+#: ../ui/evolution-message-composer.xml.h:27
+msgid "Save the current file with a different name"
+msgstr "Gwarediñ ar restr en implij dindan un anv disheñvel"
+
+#: ../ui/evolution-message-composer.xml.h:28
+msgid "Save the message in a specified folder"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:29
+msgid "Send"
+msgstr "Kas"
+
+#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-signature-editor.xml.h:23
+msgid "Send the mail in HTML format"
+msgstr "Kas ar bostel e furmad HTML"
+
+#: ../ui/evolution-message-composer.xml.h:31
+msgid "Send this message"
+msgstr "Kas ar gemennadenn-mañ"
+
+#: ../ui/evolution-message-composer.xml.h:32
+msgid "Set the message priority to high"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:33
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:34
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:38
+msgid "Toggles whether the Post-To field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:39
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:40
+msgid "Toggles whether the To field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:42
+msgid "_Bcc Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:43
+msgid "_Cc Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:45
+msgid "_Delete all"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:48
+msgid "_From Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:49
+msgid "_Open..."
+msgstr "Digeriñ..."
+
+#: ../ui/evolution-message-composer.xml.h:50
+msgid "_Post-To Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:51
+msgid "_Prioritize Message"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:52
+msgid "_Reply-To Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:55
+msgid "_To Field"
+msgstr ""
+
+#: ../ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "Serriñ"
+
+#: ../ui/evolution-signature-editor.xml.h:15
+msgid "H_TML"
+msgstr "HTML"
+
+#: ../ui/evolution-signature-editor.xml.h:17
+msgid "Save and Close"
+msgstr "Gwarediñ ha serriñ"
+
+#.
+#. <menuitem name="FileSave" verb="" _label="_Save"/>
+#.
+#: ../ui/evolution-signature-editor.xml.h:21
+msgid "Save and _Close"
+msgstr "Gwarediñ ha serriñ"
+
+#: ../ui/evolution-signature-editor.xml.h:22
+msgid "Save the current file and close the window"
+msgstr "Gwarediñ ar restr en implij ha serriñ ar prenestr"
+
+#: ../ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "Adkargañ ar roll"
+
+#: ../ui/evolution-subscribe.xml.h:4
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:5
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:7
+msgid "Subscribe"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:8
+msgid "Unsubscribe"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:9
+msgid "Status Details"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:10
+msgid "Time Zone"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:24
+msgid "_Status Details"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:3
+msgid "Copy selected tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:5
+msgid "Cut selected tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:7
+msgid "Delete completed tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:8
+msgid "Delete selected tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:9
+msgid "Mar_k as Complete"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:10
+msgid "Mark selected tasks as complete"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:12
+msgid "Paste tasks from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:13
+msgid "Previews the list of tasks to be printed"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:16
+msgid "Print the list of tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:20
+msgid "View the selected task"
+msgstr "Gwelout an dra d'ober diuzet"
+
+#: ../ui/evolution-tasks.xml.h:27
+msgid "_Open Task"
+msgstr "Digeriñ un dra d'ober"
+
+#: ../ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr "A-zivout Evolution..."
+
+#: ../ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr ""
+
+#: ../ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ../ui/evolution.xml.h:5
+msgid "Create a new window displaying this folder"
+msgstr ""
+
+#: ../ui/evolution.xml.h:6
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr ""
+
+#: ../ui/evolution.xml.h:7
+msgid "Display window buttons with icons and text"
+msgstr ""
+
+#: ../ui/evolution.xml.h:8
+msgid "Display window buttons with icons only"
+msgstr ""
+
+#: ../ui/evolution.xml.h:9
+msgid "Display window buttons with text only"
+msgstr ""
+
+#: ../ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
+
+#: ../ui/evolution.xml.h:11
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+
+#: ../ui/evolution.xml.h:12
+msgid "Hide window buttons"
+msgstr ""
+
+#: ../ui/evolution.xml.h:13
+msgid "I_mport..."
+msgstr "Enporzhiañ..."
+
+#: ../ui/evolution.xml.h:14
+msgid "Icons _and text"
+msgstr "Arlun ha testenn"
+
+#: ../ui/evolution.xml.h:15
+msgid "Import data from other programs"
+msgstr ""
+
+#: ../ui/evolution.xml.h:17
+msgid "New _Window"
+msgstr "Prenestr nevez"
+
+#: ../ui/evolution.xml.h:18
+msgid "Prefere_nces"
+msgstr "Dibaboù gwellañ"
+
+#: ../ui/evolution.xml.h:19
+msgid "Send / Receive"
+msgstr "Kas / Atoriñ"
+
+#: ../ui/evolution.xml.h:20
+msgid "Send / _Receive"
+msgstr "Kas / Atoriñ"
+
+#: ../ui/evolution.xml.h:21
+msgid "Send queued items and retrieve new items"
+msgstr ""
+
+#: ../ui/evolution.xml.h:22
+msgid "Set up Pilot configuration"
+msgstr ""
+
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Diskouez titouroù diwar-benn Evolution"
+
+#: ../ui/evolution.xml.h:24
+msgid "Side _Bar"
+msgstr "Barrenn gostez"
+
+#: ../ui/evolution.xml.h:25
+msgid "Status _Bar"
+msgstr "Barrenn stad"
+
+#: ../ui/evolution.xml.h:26
+msgid "Submit Bug Report"
+msgstr ""
+
+#. <menuitem name="HelpFAQ" verb=""
+#. _label="Evolution _FAQ"/>
+#.
+#. <separator/>
+#: ../ui/evolution.xml.h:31
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ../ui/evolution.xml.h:32
+msgid "Submit a bug report using Bug Buddy"
+msgstr ""
+
+#: ../ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Barrenn ostilhoù"
+
+#: ../ui/evolution.xml.h:35
+msgid "Tool_bar style"
+msgstr ""
+
+#: ../ui/evolution.xml.h:36
+msgid "View/Hide the Side Bar"
+msgstr "Diskouez/Kuzhad ar varrenn gostez"
+
+#: ../ui/evolution.xml.h:37
+msgid "View/Hide the Status Bar"
+msgstr "Diskouez/Kuzhat ar varrenn stad"
+
+#: ../ui/evolution.xml.h:38
+msgid "_About"
+msgstr "A-zivout"
+
+#: ../ui/evolution.xml.h:39
+msgid "_Close Window"
+msgstr "Serriñ ar prenestr"
+
+#: ../ui/evolution.xml.h:42
+msgid "_Forget Passwords"
+msgstr ""
+
+#: ../ui/evolution.xml.h:44
+msgid "_Hide buttons"
+msgstr ""
+
+#: ../ui/evolution.xml.h:45
+msgid "_Icons only"
+msgstr "Arlunoù hepken"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Quick Reference"
+msgstr ""
+
+#: ../ui/evolution.xml.h:48
+msgid "_Quit"
+msgstr "Mont kuit"
+
+#: ../ui/evolution.xml.h:49
+msgid "_Switcher Appearance"
+msgstr ""
+
+#: ../ui/evolution.xml.h:50
+msgid "_Synchronization Options..."
+msgstr ""
+
+#: ../ui/evolution.xml.h:51
+msgid "_Text only"
+msgstr ""
+
+#: ../ui/evolution.xml.h:53
+msgid "_Window"
+msgstr "Prenestr"
+
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr ""
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr ""
+
+#: ../views/addressbook/galview.xml.h:3
+msgid "_Phone List"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:1
+msgid "As _Sent Folder"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:2
+msgid "By S_tatus"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:3
+msgid "By Se_nder"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Su_bject"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:5
+msgid "By _Follow Up Flag"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:6
+msgid "_Messages"
+msgstr "Kemennadennoù"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr ""
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr ""
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
+msgid "UTC"
+msgstr "UTC"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "<b>Time Zones</b>"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "<b>_Selection</b>"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+msgid "Select a Time Zone"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid "TimeZone Combobox"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:188
+msgid "Collection"
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views.glade.h:4
+#, no-c-format
+msgid "Define Views for %s"
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:333
+#: ../widgets/menus/gal-define-views-dialog.c:335
+msgid "Define Views"
+msgstr ""
+
+#: ../widgets/menus/gal-define-views.glade.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr ""
+
+#: ../widgets/menus/gal-define-views.glade.h:5
+msgid "_Edit..."
+msgstr "Aozañ..."
+
+#: ../widgets/menus/gal-view-factory-etable.c:39
+#: ../widgets/table/e-table-header-item.c:1840
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
+msgid "Table"
+msgstr ""
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+msgid "Instance"
+msgstr ""
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+msgid "Save Current View"
+msgstr "Gwarediñ ar sell en implij"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+msgid "_Create new view"
+msgstr "Krouiñ ur sell nevez"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+msgid "_Replace existing view"
+msgstr ""
+
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Sell personelaet"
+
+#: ../widgets/menus/gal-view-instance.c:588
+msgid "Save Custom View"
+msgstr "Gwarediñ ar sell personelaet"
+
+#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr ""
+
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "C_urrent View"
+msgstr "Sell en implij"
+
+#: ../widgets/menus/gal-view-menus.c:359
+msgid "Save Custom View..."
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.c:80
+msgid "Factory"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.c:115
+msgid "Define New View"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+msgid "Name of new view:"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+msgid "Type of View"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+msgid "Type of view:"
+msgstr ""
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: ../widgets/misc/e-calendar-item.c:416
+msgid "MTWTFSS"
+msgstr "LMMYGSS"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1093
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
+msgid "Fill color"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:464
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
+#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
+msgid "GDK fill color"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
+msgid "Fill stipple"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
+msgid "X1"
+msgstr "X1"
+
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
+msgid "X2"
+msgstr "X2"
+
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
+msgid "Y1"
+msgstr "Y1"
+
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
+msgid "Y2"
+msgstr "Y2"
+
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3015
+msgid "Minimum width"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/table/e-table-group-container.c:975
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-item.c:3016
+msgid "Minimum Width"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-expander.c:205
+msgid "Spacing"
+msgstr ""
+
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
+msgid "Now"
+msgstr "Bremañ"
+
+#: ../widgets/misc/e-cell-date-edit.c:793
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+
+#: ../widgets/misc/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:64
+msgid "Baltic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Central European"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:66
+msgid "Chinese"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:67
+msgid "Cyrillic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:68
+msgid "Greek"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:69
+msgid "Hebrew"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:70
+msgid "Japanese"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:71
+msgid "Korean"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:72
+msgid "Thai"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:73
+msgid "Turkish"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:74
+msgid "Unicode"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:75
+msgid "Western European"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:76
+msgid "Western European, New"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
+msgid "Traditional"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
+msgid "Simplified"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:102
+msgid "Ukrainian"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:105
+msgid "Visual"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:174
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:219
+msgid "Character Encoding"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:234
+msgid "Enter the character set to use"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:341
+msgid "Other..."
+msgstr "All..."
+
+#: ../widgets/misc/e-charset-picker.c:482
+msgid "Ch_aracter Encoding"
+msgstr ""
+
+#: ../widgets/misc/e-clipped-label.c:111
+msgid "..."
+msgstr "..."
+
+#: ../widgets/misc/e-dateedit.c:321
+msgid "Date and Time"
+msgstr "Deiziad hag an eur"
+
+#: ../widgets/misc/e-dateedit.c:340
+msgid "Text entry to input date"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:362
+msgid "Click this button to show a calendar"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:384
+msgid "Combo box to select time"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:385
+msgid "Time"
+msgstr ""
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
+msgid "%I:%M %p"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:181
+msgid "Expanded"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:182
+msgid "Whether or not the expander is expanded"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:197
+msgid "Use underline"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:198
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:206
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
+msgid "Expander Size"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:231
+msgid "Indicator Spacing"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:232
+msgid "Spacing around expander arrow"
+msgstr ""
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.c:202
+msgid "_Searches"
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.c:204
+msgid "Searches"
+msgstr ""
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+msgid "_Save Search..."
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+msgid "_Edit Saved Searches..."
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
+msgid "_Advanced Search..."
+msgstr ""
+
+#: ../widgets/misc/e-image-chooser.c:172
+msgid "Choose Image"
+msgstr ""
+
+#: ../widgets/misc/e-map.c:627
+msgid "World Map"
+msgstr ""
+
+#: ../widgets/misc/e-map.c:629
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:103
+msgid "Sync with:"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:111
+msgid "Sync Private Records:"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:120
+msgid "Sync Categories:"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+msgid "Empty message"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+msgid "Reflow model"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+msgid "Column width"
+msgstr ""
+
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Klask"
+
+#: ../widgets/misc/e-search-bar.c:588
+msgid "_Search"
+msgstr "Klask"
+
+#: ../widgets/misc/e-search-bar.c:594
+msgid "_Find Now"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
+msgid "_Clear"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:890
+msgid "Item ID"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
+msgid "Text"
+msgstr "Testenn"
+
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model-array.c:547
+#: ../widgets/table/e-tree-selection-model.c:811
+msgid "Cursor Row"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model-array.c:554
+#: ../widgets/table/e-tree-selection-model.c:818
+msgid "Cursor Column"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model.c:214
+msgid "Sorter"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model.c:221
+msgid "Selection Mode"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model.c:229
+msgid "Cursor Mode"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.c:522
+msgid "When de_leted:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:1
+msgid "<b>Delivery Options</b>"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:3
+msgid "<b>Return Notification</b>"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:4
+msgid "<b>Status Tracking</b>"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:5
+msgid "A_uto-delete sent item"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "C_lassification"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:7
+msgid "Creat_e a sent item to track information"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:8
+msgid "Deli_vered and opened"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:9
+msgid "Gene_ral Options"
+msgstr "Neuziadoù dre vras"
+
+#: ../widgets/misc/e-send-options.glade.h:10
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:12
+msgid ""
+"Public\n"
+"Private\n"
+"Confidential\n"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:16
+msgid "R_eply requested"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:18
+msgid "Sta_tus Tracking"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:23
+msgid "When acce_pted:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:24
+msgid "When co_mpleted:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:25
+msgid "When decli_ned:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "Wi_thin"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:27
+msgid "_After:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "_All information"
+msgstr "Titour all"
+
+#: ../widgets/misc/e-send-options.glade.h:29
+msgid "_Delay message delivery"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Delivered"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:32
+msgid "_Set expiration date"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:33
+msgid "_Until:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:34
+msgid "_When convenient"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_When opened:"
+msgstr ""
+
+#: ../widgets/misc/e-task-widget.c:208
+#, c-format
+msgid "%s (...)"
+msgstr "%s (...)"
+
+#: ../widgets/misc/e-task-widget.c:213
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: ../widgets/misc/e-url-entry.c:107
+msgid "Click here to go to URL"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:2
+msgid "Edit Master Category List..."
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:3
+msgid "Item(s) belong to these _categories:"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:4
+msgid "_Available Categories:"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:5
+msgid "categories"
+msgstr "rummadoù"
+
+#: ../widgets/table/e-cell-combo.c:177
+msgid "popup list"
+msgstr ""
+
+#: ../widgets/table/e-cell-date.c:64
+msgid "%l:%M %p"
+msgstr "%l:%M %p"
+
+#: ../widgets/table/e-cell-pixbuf.c:397
+msgid "Selected Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-pixbuf.c:404
+msgid "Focused Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-pixbuf.c:411
+msgid "Unselected Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1749
+msgid "Strikeout Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1756
+msgid "Underline Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1763
+msgid "Bold Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1770
+msgid "Color Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1784
+msgid "BG Color Column"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:1
+msgid "<- _Remove"
+msgstr "<- Dilemel"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:2
+#: ../widgets/table/e-table-config.glade.h:1
+msgid "A_vailable Fields:"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:3
+#: ../widgets/table/e-table-config.glade.h:2
+msgid "Ascending"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:4
+#: ../widgets/table/e-table-config.glade.h:3
+msgid "Clear All"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:5
+#: ../widgets/table/e-table-config.glade.h:4
+msgid "Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:7
+msgid "Group Items By"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:8
+msgid "Move _Down"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:9
+msgid "Move _Up"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:11
+msgid "Sh_ow these fields in order:"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:563
+#: ../widgets/table/e-table-config.glade.h:10
+msgid "Show Fields"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show field in View"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Sort"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:15
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Sort Items By"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Then By"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:17
+msgid "_Add ->"
+msgstr "Ouzhpennañ ->"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:16
+msgid "_Fields Shown..."
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:20
+msgid "_Sort..."
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:150
+msgid "State"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+msgid "(Ascending)"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+msgid "(Descending)"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:314
+msgid "Not sorted"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:355
+msgid "No grouping"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:584
+msgid "Available Fields"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:17
+msgid "_Group By..."
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:19
+msgid "_Show these fields in order:"
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:77
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1805
+msgid "DnD code"
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:84
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1819
+msgid "Full Header"
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:126
+msgid "Add a column..."
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser.glade.h:1
+msgid "Field Chooser"
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser.glade.h:2
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:346
+#, c-format
+msgid "%s : %s (%d item)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:352
+#, c-format
+msgid "%s (%d item)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:573
+#: ../widgets/table/e-table-group-leaf.c:574
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
+msgid "Alternating Row Colors"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:580
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
+msgid "Horizontal Draw Grid"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+msgid "Vertical Draw Grid"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+msgid "Draw focus"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
+msgid "Cursor mode"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+msgid "Selection model"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
+msgid "Length Threshold"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
+msgid "Uniform row height"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-leaf.c:644
+msgid "Frozen"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1466
+msgid "Customize Current View"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1486
+msgid "Sort Ascending"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1487
+msgid "Sort Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1488
+msgid "Unsort"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1490
+msgid "Group By This Field"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1491
+msgid "Group By Box"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1493
+msgid "Remove This Column"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1494
+msgid "Add a Column..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1496
+msgid "Alignment"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1497
+msgid "Best Fit"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1498
+msgid "Format Columns..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1500
+msgid "Customize Current View..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
+#: ../widgets/text/e-entry.c:1264
+msgid "Fontset"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1833
+#: ../widgets/table/e-table-sorter.c:175
+msgid "Sort Info"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1847
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
+msgid "Tree"
+msgstr ""
+
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+msgid "Table header"
+msgstr ""
+
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+msgid "Table model"
+msgstr ""
+
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+msgid "Cursor row"
+msgstr ""
+
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
+msgid "Always search"
+msgstr ""
+
+#: ../widgets/table/e-table.c:3322
+msgid "Use click to add"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+msgid "ETree table adapter"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3305
+msgid "Retro Look"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3306
+msgid "Draw lines and +/- expanders."
+msgstr ""
+
+#: ../widgets/text/e-entry-test.c:49
+msgid "Minicard Test"
+msgstr ""
+
+#: ../widgets/text/e-entry-test.c:50
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright (C) 2000, Ximian, Inc."
+
+#: ../widgets/text/e-entry-test.c:52
+msgid "This should test the minicard canvas item"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
+msgid "Event Processor"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
+msgid "Font"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
+msgid "GDKFont"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
+msgid "Justification"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+msgid "Use ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+msgid "Ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+msgid "Line wrap"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+msgid "Break characters"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
+msgid "Max lines"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+msgid "Allow newlines"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+msgid "Draw borders"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+msgid "Draw background"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
+msgid "Draw button"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+msgid "Cursor position"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+msgid "Emulate label resize"
+msgstr ""
+
+#: ../widgets/text/e-text.c:2721
+msgid "Input Methods"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
+msgid "Bold"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
+msgid "Strikeout"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
+msgid "Anchor"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
+msgid "Clip Width"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
+msgid "Clip Height"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
+msgid "Clip"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
+msgid "Fill clip rectangle"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
+msgid "X Offset"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+msgid "Y Offset"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+msgid "Text width"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+msgid "Text height"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+msgid "IM Context"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+msgid "Handle Popup"
+msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 47c8240f30..52920cf1b4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-20 07:13+0200\n"
-"PO-Revision-Date: 2006-04-24 07:14+0200\n"
-"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
+"POT-Creation-Date: 2006-04-29 10:50+0200\n"
+"PO-Revision-Date: 2006-04-29 10:51+0200\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 # fitxer: addressbook.gui.component.ca.po
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "llibreta d'adreces de l'Evolution"
 
@@ -43,10 +43,10 @@ msgid "New Contact List"
 msgstr "Nova llista de contactes"
 
 # fitxer: addressbook.tools.ca.po
-#: ../a11y/addressbook/ea-minicard-view.c:163
-#, fuzzy, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
+#: ../a11y/addressbook/ea-minicard-view.c:152
+#, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "la llibreta d'adreces té %d targeta"
 msgstr[1] "la llibreta d'adreces té %d targetes"
 
@@ -71,37 +71,37 @@ msgstr "Contacte: "
 msgid "evolution minicard"
 msgstr "minitargeta de l'evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Té alarmes."
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Té recurrències."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "És una reunió."
 
 # fitxer: calendar.ca.po.2
-#: ../a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Esdeveniment del calendari: el resum és %s."
 
 # fitxer: calendar.ca.po.2
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Esdeveniment de calendari: no té resum."
 
 # fitxer: calendar.ca.po.2
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "Esdeveniments de la visualització del calendari"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Captura el focus"
 
@@ -136,14 +136,14 @@ msgstr "Vés a una data"
 msgid "a table to view and select the current time range"
 msgstr "una taula per a visualitzar i seleccionar el rang de temps actual"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Té %d esdeveniment."
 msgstr[1] "Té %d esdeveniments."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "No té esdeveniments."
 
@@ -250,23 +250,23 @@ msgid "Click here, you can find more events."
 msgstr "Cliqueu aquí per a veure més esdeveniments."
 
 # fitxer: calendar.ca.po.5
-#: ../a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Visualització mensual: %s. %s"
 
 # fitxer: calendar.ca.po.5
-#: ../a11y/calendar/ea-week-view.c:162
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Visualització setmanal: %s. %s"
 
 # fitxer: data.ca.po
-#: ../a11y/calendar/ea-week-view.c:193
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "visualització del calendari per a un mes"
 
-#: ../a11y/calendar/ea-week-view.c:195
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "visualització del calendari per a una o més setmanes"
 
@@ -932,10 +932,10 @@ msgstr "_Nova llibreta d'adreces"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
@@ -967,7 +967,7 @@ msgstr "S'està accedint anònimament al servidor d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "S'ha produït un error en l'autenticació.\n"
 
@@ -1418,6 +1418,7 @@ msgstr "minuts"
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
@@ -3041,17 +3042,17 @@ msgstr "Modificat"
 msgid "Contact Editor - %s"
 msgstr "Editor de contactes - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Seleccioneu una imatge per a aquest contacte"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Cap imatge"
 
 # fitxer: calendar.ca.po.4
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -3060,7 +3061,7 @@ msgstr ""
 "\n"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contacte invàlid."
 
@@ -3095,10 +3096,10 @@ msgstr "_Seleccioneu la llibreta d'adreces"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Esteu segur de voler\n"
 "suprimir aquests contactes (%s)?"
@@ -3117,7 +3118,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Esteu segur de voler\n"
 "suprimir el contacte (%s)?"
@@ -3477,8 +3478,8 @@ msgstr "Desa com a VCard..."
 # fitxer: calendar.ca.po.5
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Obre"
@@ -3558,13 +3559,13 @@ msgstr "Re_talla"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copia"
@@ -4924,19 +4925,16 @@ msgstr "Esteu segur de voler suprimir aquesta cita?"
 
 # fitxer: mail.ca.po.3
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Esteu segur que voleu esborrar aquesta entrada al diari?"
 
 # fitxer: mail.ca.po.3
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Esteu segur de voler suprimir aquesta reunió?"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Esteu segur de voler suprimir aquesta tasca?"
 
@@ -5463,7 +5461,7 @@ msgstr "_Temps de migdiada:"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
@@ -6437,11 +6435,11 @@ msgstr "Alarmes"
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-#, fuzzy
-msgid "_Suggest automatic display of attachment"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
 msgstr "Demana si s'ha de visualitzar el fitxer adjunt automàticament"
 
 # fitxer: composer.ca.po
@@ -6451,7 +6449,7 @@ msgstr "Adjunta fitxers"
 
 # fitxer: composer.ca.po
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Propietats del fitxer adjunt"
@@ -6461,21 +6459,21 @@ msgstr "Propietats del fitxer adjunt"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descripció:"
 
 # fitxer: composer.ca.po
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Nom del fitxer:"
 
 # fitxer: composer.ca.po
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Tipus MIME:"
@@ -6975,7 +6973,7 @@ msgstr[1] "%d missatges adjunts"
 # fitxer: mail.ca.po.3
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1725
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mou"
 
@@ -7132,10 +7130,6 @@ msgstr "No s'ha pogut obrir el destí"
 msgid "Destination is read only"
 msgstr "El destí només es pot llegir"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
@@ -7870,7 +7864,7 @@ msgstr "<span weight=\"bold\">Estat</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Completada"
@@ -8140,7 +8134,7 @@ msgstr "%s per a un tipus d'activador desconegut"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2828
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliqueu per obrir %s"
@@ -8238,7 +8232,7 @@ msgstr "Lliure"
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupat"
 
@@ -8256,8 +8250,8 @@ msgstr ""
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sí"
@@ -8265,7 +8259,7 @@ msgstr "Sí"
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
@@ -8277,8 +8271,8 @@ msgstr "No"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1309
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -8313,9 +8307,9 @@ msgid "untitled_image.%s"
 msgstr "imatge_sense_nom.%s"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Anomena i de_sa..."
 
@@ -8399,28 +8393,28 @@ msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Obre una pàgina _web"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -8429,17 +8423,17 @@ msgid "_Print..."
 msgstr "Im_primeix..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Re_talla"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
@@ -8447,33 +8441,33 @@ msgid "_Paste"
 msgstr "E_nganxa"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Assigna una tasca"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "R_eenvia com a iCalendar"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marca com a acabada"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca les tasques seleccionades com a acabades"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix les tasques selecciona_des"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliqueu per afegir una tasca"
@@ -8516,131 +8510,131 @@ msgid "Task sort"
 msgstr "Ordre de les tasques"
 
 # fitxer: camel.ca.po.4
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Moure elements"
 
 # fitxer: camel.ca.po.4
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copiar elements"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Nova cit_a..."
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Nou _esdeveniment de tot el dia"
 
 # fitxer: calendar.ca.po.4
 #
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Re_unió nova"
 
 # fitxer: calendar.ca.po.4
 #
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "_Tasca nova"
 
 # fitxer: widgets.ca.po
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Visualització a_ctual"
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
 #
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Selecciona av_ui"
 
 # fitxer: mail.ca.po.1
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Selecciona data..."
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendari..."
 
 # fitxer: mail.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_u al calendari..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delega la reunió..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Planifica la _reunió..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "R_eenvia com a iCalendar..."
 
 # fitxer: mail.ca.po.1
 #
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Respon"
 
 # fitxer: mail.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Per_met moure aquest element"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix aquesta a_parició"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix totes les _aparicions"
 
 # fitxer: calendar.ca.po.4
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2141
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organitzador: %s <%s>"
 
 # fitxer: calendar.ca.po.4
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organitzador: %s"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2161 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Ubicació: %s"
 
 # fitxer: calendar.ca.po.3
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2192
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -8828,7 +8822,7 @@ msgstr ""
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -8843,7 +8837,7 @@ msgstr "Provisionalment acceptat"
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -9249,14 +9243,14 @@ msgstr "Recursos"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individual"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
@@ -9264,58 +9258,58 @@ msgstr "Grup"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Recurs"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Habitació"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Cadira"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Participació necessària"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Participació opcional"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "No es participa"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Precisa d'una acció"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Provisionalment"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -9327,15 +9321,15 @@ msgid "Attendee                          "
 msgstr "Assistent"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "En procés"
 
 # fitxer: calendar.ca.po.3
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -9344,97 +9338,97 @@ msgstr "%A, %d de %B de %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 # fitxer: calendar.ca.po.3
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Cap informació"
 
 # fitxer: calendar.ca.po.4
 #
 #
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Ass_istents..."
 
 # fitxer: addressbook.printing.ca.po
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pcions"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "M_ostra només les hores de treball"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliació"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "Tria _automàtica"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "Tot_es les persones i recursos"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Pe_rsones necessàries"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Pers_ones necessàries i un recurs"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Hora d_e finalització:"
 
@@ -12591,12 +12585,12 @@ msgstr "De_sa el missatge"
 # fitxer: shell.ca.po
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:520
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
 # fitxer: calendar.ca.po.3
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Aplicacions de treball en grup"
 
@@ -13176,7 +13170,7 @@ msgid "Evolution Mail preferences control"
 msgstr "Control de preferències de correu de l'Evolution"
 
 # fitxer: mail.ca.po.3
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -13853,14 +13847,14 @@ msgid "Copying `%s' to `%s'"
 msgstr "S'està copiant '%s' a '%s'"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opia"
 
@@ -13886,175 +13880,175 @@ msgid "Specify where to create the folder:"
 msgstr "Especifiqueu on s'ha de crear la carpeta:"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Respon al remitent"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Reenvia"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Edita com a missatge nou..."
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "Desfés la su_pressió"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta..."
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta..."
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marca com a _no llegit"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marca'l com a _important"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "No el _marquis com a important"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marca'l com a bro_ssa"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "_No el marquis com a brossa"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marca per al se_guiment..."
 
 # fitxer: filter.ca.po
 #
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Etiqueta"
 
 # fitxer: calendar.ca.po.4
 #
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Cap"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "S'ha completat el sen_yalador"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "N_eteja el senyalador"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "C_rea una regla del missatge"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Cerca una carpeta per l'a_ssumpte"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Cerca una carpeta pel remite_nt"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Cerca una carpeta pels destinata_ris"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Cerca una carpeta per la _llista de correu"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtra per l'a_ssumpte"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtra pel remi_tent"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtra pels _destinataris"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Fil_tra per la llista de correu"
 
 # fitxer: camel.ca.po.3
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1973 ../mail/em-folder-view.c:2017
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Predeterminat"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:2116
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
 # fitxer: composer.ca.po
-#: ../mail/em-folder-view.c:2272
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "No s'ha pogut recuperar el missatge"
 
-#: ../mail/em-folder-view.c:2465
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Crea una carpeta de _cerca"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "D'a_questa adreça"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "A aques_ta adreça"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:2823
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliqueu per enviar un correu a en/na %s"
@@ -14399,7 +14393,7 @@ msgid "%s attachment"
 msgstr "fitxer adjunt %s"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S'ha produït un error desconegut en analitzar el missatge S/MIME"
 
@@ -14418,12 +14412,12 @@ msgid "Unsupported signature format"
 msgstr "No se suporta el format de la signatura"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "S'ha produït un error en verificar la contrasenya"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "S'ha produït un error desconegut en verificar la contrasenya"
 
@@ -16641,7 +16635,8 @@ msgid ""
 msgstr ""
 "Ja existeix una carpeta que no és buida a &quot;{1}&quot;.\n"
 "\n"
-"Podeu escollir ignorar aquesta carpeta, sobreescriure o afegir el seu contingut, o sortir."
+"Podeu escollir ignorar aquesta carpeta, sobreescriure o afegir el seu "
+"contingut, o sortir."
 
 #: ../mail/mail.error.xml.h:5
 msgid ""
@@ -19598,10 +19593,9 @@ msgid "Itip Formatter"
 msgstr "Formatador d'itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#, fuzzy
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; ha delegat la reunió. Voleu afegir el delegat &quot;{1}"
 "&quot;?"
@@ -19694,7 +19688,7 @@ msgstr ""
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
 msgid "Con_vert to Task"
-msgstr "Con_verteix a tasca"
+msgstr "Con_verteix a taska"
 
 # fitxer: mail.ca.po.2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
@@ -20194,7 +20188,7 @@ msgstr "Tipus MIME"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Desa"
 
@@ -20454,23 +20448,28 @@ msgstr "Alçada predeterminada de la finestra"
 
 # fitxer: shell.ca.po
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Estat per defecte de la finestra"
+
+# fitxer: shell.ca.po
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Amplada predeterminada de la finestra"
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "ID o àlies del component a mostrar per defecte a l'inici de manera "
 "predeterminada."
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Última versió de la configuració actualitzada"
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
@@ -20478,26 +20477,26 @@ msgstr ""
 "desconnectada."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Configuració de la impressora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "La barra lateral és visible"
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr ""
 "Si s'ha d'ometre el diàleg d'avís de que és una versió de desenvolupament"
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Inicia desconnectat"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20506,21 +20505,21 @@ msgstr ""
 "configuració (per exemple \"2.6.0\")."
 
 # fitxer: tools.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Alçada predeterminada de la finestra principal, en píxels."
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Amplada predeterminada de la finestra principal, en píxels."
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "L'amplada predeterminada de la barra lateral, en píxels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20528,7 +20527,7 @@ msgstr ""
 "La darrera versió actualitzada de l'Evolution, amb nivell major/menor/"
 "configuració (per exemple \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20538,40 +20537,44 @@ msgstr ""
 "\"toolbar\". Si s'habilita \"toolbar\", l'estil dels botons es determina "
 "mitjançant la configuració de la barra d'eines del GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "La barra d'eines és visible"
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Si l'Evolution s'inicia en mode desconnectat en comptes de connectat."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Si la finestra s'ha de maximitzar."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Si s'ha de veure la barra lateral."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Si s'ha de veure la barra d'eines."
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Si les versions de desenvolupament de l'Evolution no mostren el diàleg "
 "d'avís."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Si s'ha de veure els botons de la finestra."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Estil del botó de la finestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Els botons de la finestra són visibles"
 
@@ -20714,7 +20717,7 @@ msgstr "No es pot executar el Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Víctor Nieto <vnie2025@alu-etsetb.upc.es>\n"
@@ -20726,41 +20729,41 @@ msgstr ""
 "Gil Forcada <gilforcada@guifi.net>"
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "_Treballa connectat"
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Treballa desconnectat"
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Treballa desconnectat"
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "L'Evolution està actualment connectat. Cliqueu aquest botó per treballar "
 "desconnectat."
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "L'Evolution està procedint per treballar desconnectat."
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "L'Evolution està actualment desconnectat. Cliqueu aquest botó per treballar "
 "connectat."
 
 # fitxer: mail.ca.po.2
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Commuta a %s"
@@ -20917,41 +20920,35 @@ msgid "Do not tell me again"
 msgstr "No ho tornis a mostrar"
 
 # fitxer: shell.ca.po
-#: ../shell/main.c:466
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia l'Evolution activant el component especificat"
 
 # fitxer: shell.ca.po
-#: ../shell/main.c:470
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Inicia connectat"
 
 # fitxer: shell.ca.po
-#: ../shell/main.c:473
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Força l'aturada de tots els components de l'Evolution"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Força tornar a migrar des de l'Evolution 1.4"
 
 # fitxer: shell.ca.po
-#: ../shell/main.c:480
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia la sortida de la depuració de tots els components a un fitxer."
 
-#: ../shell/main.c:482
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Inhabilita la càrrega de connectors."
 
-# fitxer: mail.ca.po.3
-#: ../shell/main.c:513
-#
-msgid "- The Evolution PIM and Email Client"
-msgstr "EL gestor d'informació personal i client de correu de l'Evolution"
-
 # fitxer: shell.ca.po
-#: ../shell/main.c:524
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21872,7 +21869,7 @@ msgstr "Selecciona-ho tot"
 
 # fitxer: ui.evolution-composer-entries.xml.h.ca.po
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccion_a-ho tot"
@@ -22160,12 +22157,12 @@ msgid "Paste from clipboard"
 msgstr "Enganxa el porta-retalls"
 
 # fitxer: ui.evolution-composer-entries.xml.h.ca.po
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Enganxa el text del porta-retalls"
 
 # fitxer: ui.evolution-composer-entries.xml.h.ca.po
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Selecciona tot el text"
 
@@ -22207,24 +22204,18 @@ msgid "Close"
 msgstr "Tanca"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nsereix"
-
-# fitxer: ui.evolution-message-composer.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "Fitxer _adjunt..."
 
 # fitxer: ui.evolution-mail-messagedisplay.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Tan_ca"
 
 # fitxer: ui.evolution-comp-editor.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
@@ -22232,10 +22223,15 @@ msgid "_File"
 msgstr "_Fitxer"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "A_juda"
 
+# fitxer: ui.evolution-message-composer.xml.h.ca.po
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Insereix"
+
 # fitxer: addressbook.printing.ca.po
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
@@ -22485,7 +22481,7 @@ msgstr "_Mou la carpeta a..."
 # fitxer: ui.evolution.xml.h.ca.po
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
-msgstr "_Nova..."
+msgstr "_Nou..."
 
 # fitxer: mail.ca.po.1
 #.
@@ -23295,6 +23291,12 @@ msgid "HT_ML"
 msgstr "HT_ML"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nsereix"
+
+# fitxer: ui.evolution-message-composer.xml.h.ca.po
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Obre un fitxer"
@@ -24068,11 +24070,6 @@ msgstr "Tipus de visualització"
 msgid "Type of view:"
 msgstr "Tipus de visualització:"
 
-# fitxer: composer.ca.po
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Demana si s'ha de visualitzar el fitxer adjunt automàticament"
-
 # fitxer: widgets.ca.po
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
@@ -25319,10 +25316,6 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "No s'ha entregat el missatge amb assumpte &quot;{0}&quot;."
 
-# fitxer: ui.evolution-message-composer.xml.h.ca.po
-#~ msgid "_Insert"
-#~ msgstr "_Insereix"
-
 # fitxer: calendar.ca.po.4
 #~ msgid "(%ld seconds)"
 #~ msgstr "(%ld segons)"
diff --git a/po/cy.po b/po/cy.po
index 59550e7ecf..2855b41f71 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -25,13 +25,12 @@
 # instant messenger: negesydd sydyn
 # thread: trywydd (nid 'edefyn')
 #
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-30 08:34+0100\n"
-"PO-Revision-Date: 2006-07-29 12:33-0000\n"
+"POT-Creation-Date: 2006-05-19 21:58+0100\n"
+"PO-Revision-Date: 2006-05-19 21:46-0000\n"
 "Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
 "MIME-Version: 1.0\n"
@@ -41,9 +40,9 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
-msgstr "llyfr cyfeiriadau evolution"
+msgstr "llyfr cyfeiriadau Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:226
@@ -55,13 +54,13 @@ msgstr "Cyswllt Newydd"
 msgid "New Contact List"
 msgstr "Rhestr Gysylltiadau Newydd"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "mae gan %s, y blygell llyfr cyfeiriadau cyfredol, %d cerdyn"
-msgstr[1] "mae gan %s, y blygell llyfr cyfeiriadau cyfredol, %d gerdyn"
-msgstr[2] "mae gan %s, y blygell llyfr cyfeiriadau cyfredol, %d cerdyn"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "%d cerdyn yn y blygell llyfr cyfeiriadau cyfredol"
+msgstr[1] "%d cerdyn yn y blygell llyfr cyfeiriadau cyfredol"
+msgstr[2] "%d cerdyn yn y blygell llyfr cyfeiriadau cyfredol"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -80,32 +79,32 @@ msgstr "Cyswllt:"
 msgid "evolution minicard"
 msgstr "cerdyn bychan Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Mae ganddo larymau."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Mae'n ail-ddigwydd."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Mae'n gyfarfod."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Digwyddiad Calendr: Crynodeb yw %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Digwyddiad Calendr: Does ganddo ddim crynodeb."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "gweld digwyddiad calendr"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Cipio Ffocws"
 
@@ -134,9 +133,7 @@ msgstr "Ewch i'r Dyddiad"
 msgid "a table to view and select the current time range"
 msgstr "Tabl i weld ac i ddewis yr amrediad amser presennol"
 
-#. 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -144,38 +141,30 @@ msgstr[0] "Mae ganddo %d digwyddiad."
 msgstr[1] "Mae ganddo %d ddigwyddiad."
 msgstr[2] "Mae ganddo %d digwyddiad."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Does ganddo ddim digwyddiad."
 
-#. 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Golwg Wythnos Gweithio: %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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Golwg Dydd: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "gwybodaeth galendr am wythnos waith"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "golwg galendr am un diwrnod neu fwy"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -186,20 +175,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:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../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
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -207,10 +194,10 @@ msgstr "%a %d %b %Y"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -220,11 +207,9 @@ 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:220
-#: ../calendar/gui/calendar-component.c:732
-#: ../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
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -354,14 +339,6 @@ msgstr "Defnyddio'r Rhagosodiad"
 msgid "Popup Menu"
 msgstr "Naidlen"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Toglu'r Bar Atodiadau"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "gweithredu"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -538,9 +515,9 @@ msgstr ""
 "Ni fydd eich cysylltiadau ar gyfer {0} ar gael tan y caiff Evolution ei "
 "ailgychwyn."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Ychwanegu"
@@ -550,7 +527,7 @@ msgid "_Discard"
 msgstr "_Gwaredu"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -590,9 +567,9 @@ msgstr "Cyfluniwch awto-gwblhau yma"
 
 #. 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:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Cysylltiadau"
 
@@ -632,8 +609,8 @@ msgstr "Trefnwch dystysgrifau S/MIME yma"
 #. 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:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -648,13 +625,12 @@ msgstr "Ar y Cyfeiriadur Hwn"
 #. 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:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Personol"
 
@@ -681,7 +657,7 @@ msgid "Create a new contact list"
 msgstr "Creu rhestr gysylltiadau newydd"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Llyfr Cyfeiriadau Newydd"
 
@@ -697,73 +673,72 @@ msgstr "Creu llyfr cyfeiriadau newydd"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Methu wrth uwchraddio plygellau neu osodiadau'r Llyfr Cyfeiriadau."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Sail"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Math:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Copïwch gynnwys y llyfr yn lleol er mwyn ei ddefnyddio all-lein"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Cyffredinol"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Gwybodaeth Gweinydd"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Dilysiant"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Manylion"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Chwilio"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Yn Llwytho i Lawr"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Priodweddau Llyfr Cyfeiriadau"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Trosi..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Yn trosi `%s':"
@@ -838,35 +813,34 @@ msgstr "Ni all enwau plygellau gynnwys '/'"
 msgid "A Folder with this name already exists"
 msgstr "Plygell â'r un enw yn bodoli'n barod"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "Llyfr Cyfeiriadau _Newydd"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Cadw fel VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Priodweddau..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Dewisydd Ffynhonnell Gyswllt"
 
@@ -875,12 +849,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Yn cyrchu'r gweinydd LDAP yn ddienw"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Methwyd dilysu.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Rhowch gyfrinair ar gyfer %s (defnyddiwr %s)"
@@ -924,7 +898,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI y blygell a ddefnyddiwyd diwethaf yn y ddeialog dewis enwau."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Lleoliad cwarel fertigol"
 
@@ -953,7 +927,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Dilysiad</b>"
 
@@ -1204,9 +1178,9 @@ msgstr "Dull _mewngofnodi:"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Enw:"
 
@@ -1219,7 +1193,7 @@ msgid "_Search scope:"
 msgstr "Cwmpas _chwilio:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Gwasanaethwr:"
@@ -1239,250 +1213,270 @@ msgstr "cardiau"
 #: ../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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "munudau"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-bost</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Cartref</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Negesu Sydyn</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Swydd</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Amrywiol</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Eraill</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Ffôn</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Cyfeiriadau Gwe</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Gwaith</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../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-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Cyswllt"
 
-#: ../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/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Golygydd Cysylltiadau"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "_Enw Llawn..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Delwedd"
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "Negeseuwr MSN"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Cyfeiriad Post"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Llysenw:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Gwybodaeth Bersonol"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Ffôn"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
-#: ../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/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Gwaith"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Cyfeiriad:"
 
 # EFALLAI
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Cylchwyl:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Cynorthwyydd:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Pen-blwydd:"
 
-#: ../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:1707
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Calendr:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Categorïau..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Categorïau"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Dinas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Cwmni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Gwlad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Adran:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Ffeilio islaw:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Rhydd/Prysur:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Tudalen Cartref:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Rheolwr:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Nodiadau:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Swyddfa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Blwch PO:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Proffesiwn:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Priod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Talaith:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Teitl"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Sgwrsio Fideo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Eisiau derbyn e-bost HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Gwelog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Ble:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "Cod _Post/Zip:"
 
 #: ../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/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Cyfeiriad"
 
 #: ../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-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../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:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Golygadwy"
 
@@ -2458,7 +2452,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Enw"
@@ -2469,7 +2463,7 @@ msgstr "Negesydd Sydyn 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/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2477,102 +2471,91 @@ msgstr "Jabber"
 msgid "Yahoo Messenger"
 msgstr "Negesydd Sydyn Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Negesydd 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:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
 msgstr "Gwasanaeth"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Lleoliad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "Enw Defnyddiwr"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "Cartref"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "Arall"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../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:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Llyfr Tardd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Llyfr Targed"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Cyswllt Newydd Ydyw"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Meysydd Ysgrifenadwy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Meysydd Angenrheidiol"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Newidiwyd"
 
-#: ../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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Golygydd Cysylltiadau - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Dewiswch ddelwedd ar gyfer y cyswllt hwn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
-msgid "_No image"
-msgstr "_Dim delwedd"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "Dim delwedd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2580,31 +2563,31 @@ msgstr ""
 "Mae'r data cyswllt yn annilys:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Mae gan '%s' ffurf annilys"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "Mae gan %s'%s' ffurf annilys"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "Mae %s'%s' yn wag"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Cyswllt annilys."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Brys-Ychwanegu Cyswllt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "_Golygu Llawn"
 
@@ -2612,11 +2595,11 @@ msgstr "_Golygu Llawn"
 msgid "_Full name"
 msgstr "_Enw llawn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
-msgstr "E_bost"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "E-_bost"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Dewis Llyfr Cyfeiriadau"
 
@@ -2624,7 +2607,7 @@ msgstr "_Dewis Llyfr Cyfeiriadau"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r rhestr gysylltiadau (%s) ?"
@@ -2641,7 +2624,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r cyswllt (%s) ?"
@@ -2654,105 +2637,104 @@ msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r cysylltiadau hyn?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Cyfeiriad _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Dinas:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Gwlad:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Cyfeiriad Llawn"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "Cod Post/_ZIP:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Ysw."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Enw Llawn"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Miss"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Mr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Mrs."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Ms."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Cyntaf:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Olaf:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "C_anol:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "Ô_l-ddodiad:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Ychwanegu Cyfrif Negeseuo Cyflym"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Enw cyfrif:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "Gwasanaeth _Negeseuo Cyflym:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2763,61 +2745,61 @@ msgstr "_Lleoliad:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Ychwanegu e-bost at y Rhestr"
 
-#: ../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:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Golygydd Rhestr Gysylltiadau"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "Mewnosod cyfeiriadau e-bost o'r Llyfr Cyfeiriadau"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Aelodau"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Tynnu cyfeiriad e-bost o'r Rhestr"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Cuddio cyfeiriadau wrth anfon e-bost at y rhestr"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Enw _rhestr:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "_Dewis"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../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 "_Teipiwch gyfeiriad e-bost neu llusgwch gyswllt i'r rhestr isod:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Llyfr"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Yn Rhestr Newydd"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Aelodau"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Aelodau Rhestr Gyswllt"
 
@@ -2858,18 +2840,25 @@ msgstr ""
 "Mae enw neu gyfeiriad e-bost y cyswllt hwn yn bodoli eisoes\n"
 "o fewn y blygell. Ydych chi am ei ychwanegu beth bynnag?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Unrhyw faes yn cynnwys"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Categori yw"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-bost yn dechrau gyda"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Enw yn dechrau gyda"
@@ -2888,9 +2877,9 @@ msgstr[2] "%d cyswllt"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Ymholiad"
 
@@ -2904,7 +2893,7 @@ msgstr "Gwall estyn golwg llyfr"
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Model:"
 
@@ -2912,114 +2901,112 @@ msgstr "Model:"
 msgid "Error modifying card"
 msgstr "Gwall newid carden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Tardd"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Math"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Cadw fel VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Agor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "Cyswllt _Newydd..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "_Rhestr Gyswllt Newydd..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Cadw fel VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "Gyrru Cyswllt _ymlaen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "Gyrru _Cysylltiadau ymlaen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Anfon _Neges I'r Cyswllt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Anfon Neges at _Restr"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Anfon Neges at _Gysylltiadau"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Argraffu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Copïo i'r Llyfr Cyfeiriadau..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "_Symud i'r Llyfr Cyfeiriadau..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Torri"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copïo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "_Gludo"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Unrhyw Gategori"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "Argraffu cardiau"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "Cynorthwywr"
 
@@ -3048,7 +3035,7 @@ msgid "Car Phone"
 msgstr "Ffôn Car"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3060,7 +3047,7 @@ msgid "Company Phone"
 msgstr "Ffôn Cwmni"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-bost"
@@ -3106,22 +3093,20 @@ msgid "Journal"
 msgstr "Dyddlyfr"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "Rheolwr"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Ffôn Symudol"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "Llysenw"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Nodyn"
 
@@ -3130,7 +3115,7 @@ msgid "Office"
 msgstr "Swyddfa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Sefydliad"
 
@@ -3163,7 +3148,6 @@ msgid "Role"
 msgstr "Rôl"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "Priod"
 
@@ -3194,7 +3178,7 @@ msgid "Web Site"
 msgstr "Safle Gwe"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3205,12 +3189,12 @@ msgstr "Safle Gwe"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Lled"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3220,12 +3204,12 @@ msgstr "Lled"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Uchder"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "Â Ffocws"
 
@@ -3249,7 +3233,7 @@ msgstr "Uchafswm hyd enw'r maes"
 msgid "Column Width"
 msgstr "Lled Colofn"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3263,7 +3247,7 @@ msgstr ""
 "\n"
 "neu rhowch glic-ddwbl fan hyn i greu Cyswllt newydd."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3277,7 +3261,7 @@ msgstr ""
 "\n"
 "Rhowch glic-ddwbl fan hyn i greu Cyswllt newydd."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3287,7 +3271,7 @@ msgstr ""
 "\n"
 "Chwilio am y Cyswllt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3297,144 +3281,80 @@ msgstr ""
 "\n"
 "Does dim eitemau i'w dangos yn yr olwg hon."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Addasydd"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "E-bost Gwaith"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "Ebost Cartref"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "Ebost Arall"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "Dewisedig"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "Â Chyrchwr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Agor y Cyswllt Mewn Porwr"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Copïo Lleoliad y Cyswllt"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "_Danfon Neges Newydd At..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "_Copïo Cyfeiriad Ebost"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(map)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "map"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Aelodau Rhestr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-bost"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Department"
-msgstr "Adran"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-msgid "Profession"
-msgstr "Proffesiwn"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Safle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-msgid "Video Chat"
-msgstr "Sgwrs Fideo"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Calendr"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "Rhydd/Prysur"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Cynadledda Fideo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Ffôn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Ffacs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Home Page"
-msgstr "Tudalen Cartref"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "gwaith"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Web Log"
-msgstr "Gweflog"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "Pen-blwydd"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Gwelog"
 
-# EFALLAI
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "Cylchwyl"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "personol"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Teitl Swydd"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Tudalen cartref"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3465,7 +3385,7 @@ msgstr "Dim Hunan-Gyswllt wedi ei ddiffinio"
 #. 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Gwrthodwyd caniatâd"
 
@@ -3490,7 +3410,7 @@ msgstr "Protocol ni chynhelir"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Diddymwyd"
 
@@ -3624,7 +3544,7 @@ msgid "Error adding list"
 msgstr "Gwall wrth ychwanegu rhestr"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Gwall wrth ychwanegu cyswllt"
 
@@ -3641,7 +3561,7 @@ msgid "Error removing list"
 msgstr "Gwall wrth dynnu rhestr"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Gwall wrth dynnu cyswllt"
 
@@ -3663,7 +3583,7 @@ msgstr[2] ""
 "Bydd agor %d cyswllt yn agor %d ffenest newydd hefyd.\n"
 "Ydych chi wir am ddangos yr holl gysylltiadau?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3672,15 +3592,15 @@ msgstr ""
 "%s yn bodoli eisoes\n"
 "Ydych chi wir am ei ddisodli?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
 #. 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "cyswllt"
@@ -3688,54 +3608,54 @@ msgstr[1] "cysylltiadau"
 msgstr[2] "cysylltiadau"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Dewis Llyfr Cyfeiriadau Newydd"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Symud y cyswllt i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Copïo'r cyswllt i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Symud y cysylltiadau i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Copïo'r cysylltiadau i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Mwy nag un vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard ar gyfer %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Gwybodaeth gyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Gwybodaeth gyswllt ar gyfer %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Ymholi Llyfr Cyfeiriadau..."
 
@@ -3826,12 +3746,12 @@ msgstr "Mewnforiwr VCard Evolution"
 msgid "Print envelope"
 msgstr "Argraffu amlen"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Argraffu cysylltiadau"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Argraffu cyswllt"
 
@@ -3880,7 +3800,7 @@ msgstr "Fformat"
 #: ../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-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Pennawd"
@@ -3989,7 +3909,7 @@ msgstr "Graddliwio"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4224,17 +4144,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r apwyntiad hwn?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r cofnod dyddlyfr hwn?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfarfod?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r dasg?"
 
@@ -4372,17 +4289,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Mae'r calendr Evolution wedi terfynu'n annisgwyl"
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Mae memo Evolution wedi terfynu'n annisgwyl."
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Mae'r tasgau Evolution wedi terfynu'n annisgwyl"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "Calendr heb ei farcio ar gyfer defnydd all-lein."
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "Calendr darllen-yn-unig yw'r un rydych chi wedi ei ddewis"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "Rhestr femos heb ei marcio ar gyfer defnydd all-lein."
@@ -4454,61 +4371,49 @@ msgstr ""
 "wedi ei gynnal, i gael y canlyniadau gorau."
 
 #: ../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 ""
-"Ffynhonnell calendr darllen-yn-unig sydd wedi'i dewis gennych. Ewch i'r Olwg "
-"Galendr a dewiswch galendr fedr dderbyn apwyntiadau."
-
-#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Rydych chi wedi gwneud newidiadau i'r apwyntiad hwn, ond heb eu cadw."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr "Rydych chi wedi gwneud newidiadau i'r dasg hon, ond heb eu cadw."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Rydych chi wedi gwneud newidiadau i'r memo hwn, ond heb eu cadw."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Ni fydd eich calendrau ar gael tan mae Evolution wedi ei ailgychwyn."
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "Ni fydd eich memos ar gael tan i chi ail-gychwyn Evolution."
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Ni fydd eich tasgau ar gael tan mae Evolution wedi ei ailgychwyn."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "_Hepgor Newidiadau"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "_Cadw Newidiadau"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Anfon"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "Danfon _Hysbys"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
@@ -4525,8 +4430,8 @@ msgstr "Hollti Digwyddiadau Aml-Ddiwrnod:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Methwyd cychwyn gweinydd evolution-data-server"
 
@@ -4560,12 +4465,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Methu ysgrifennu bloc rhaglen ToDo y peilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Calendr a Thasgau"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendrau"
 
@@ -4606,21 +4511,21 @@ msgid "Memo_s"
 msgstr "_Memos"
 
 #: ../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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Memos"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tasgau"
@@ -4638,17 +4543,17 @@ msgstr "_Tasgau"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Gwasanaeth hysbysu larymau Calendr Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "funud"
 msgstr[1] "funud"
 msgstr[2] "munud"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4658,7 +4563,7 @@ msgstr[0] "awr"
 msgstr[1] "oriau"
 msgstr[2] "oriau"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Amser cychwyn"
 
@@ -4669,10 +4574,10 @@ msgstr "Apwyntiadau"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Lleoliad:"
 
@@ -4682,16 +4587,16 @@ msgstr "Amser _hepian:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Golygu"
 
@@ -4703,31 +4608,32 @@ msgstr "_Hepian"
 msgid "location of appointment"
 msgstr "lleoliad yr apwyntiad"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Dim crynodeb ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Dim disgrifiad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Dim gwybodaeth lleoliad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Mae gennych %d larwm."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4739,7 +4645,7 @@ msgstr ""
 "hwn ei gyflunio i anfon e-bost.  Bydd Evolution yn dangos\n"
 "blwch deialog atgoffa arferol yn lle hynny."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4756,7 +4662,7 @@ msgstr ""
 "\n"
 "Ydych chi'n siŵr eich bod am redeg y rhaglen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Peidiwch â gofyn ynghylch y rhaglen hon eto."
 
@@ -4861,103 +4767,91 @@ msgid "Default reminder value"
 msgstr "Gwerth atgoffad rhagosodedig"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Graddiant Digwyddiad"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Tryloywder Digwyddiadau"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "LAU gweinyddion statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "LAU templed statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Graddiant y digwyddiadau yn yr olwg galendr."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Cuddio tasgau sydd wedi gorffen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Cuddio unedau tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Cuddio gwerth tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Awr diwedd dydd gwaith, ar ffurf cloc bedair awr ar hugain, 0 i 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Awr cychwyn dydd gwaith, ar ffurf cloc bedair awr ar hugain, 0 i 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Yr ysbeidiau a ddangosir yng ngolygon Dydd ac Wythnos Waith, mewn munudau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Amser larwm diweddaraf"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Rhestr LAU gweinyddion i gyhoeddi gwybodaeth statws rhydd/prysur."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Llinell Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Lliw Llinell Marcus Bains - Golwg Dydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Lliw Llinell Marcus Bains - Bar amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Munud diwedd dydd gwaith, 0 i 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Munud cychwyn dydd gwaith, 0 i 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Lleoliad cwarel fertigol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Nifer o unedau i'w pennu ar gyfer nodyn atgoffa rhagosodedig."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Nifer o unedau i benderfynu pryd i guddio tasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Lliw tasgau hwyr"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4965,7 +4859,7 @@ msgstr ""
 "Lleoliad y cwarel llorweddol, rhwng y calendr llywio dyddiadau a'r rhestr "
 "dasgau pan ddim yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4973,15 +4867,7 @@ msgstr ""
 "Lleoliad y cwarel llorweddol, rhwng yr olwg a'r calendr llywio dyddiadau a'r "
 "rhestr dasgau pan yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Lleoliad y cwarel fertigol, rhwng y rhestrau calendr a'r calendr llywio "
-"dyddiadau."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4989,7 +4875,7 @@ msgstr ""
 "Lleoliad y cwarel fertigol, rhwng yr olwg tasgau a'r cwarel rhagolwg tasgau, "
 "mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4997,7 +4883,7 @@ msgstr ""
 "Lleoliad y cwarel fertigol, rhwng yr olwg a'r calendr llywio dyddiadau a'r "
 "rhestr dasgau pan yn yr olwg mis, mewn picseli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5005,66 +4891,66 @@ msgstr ""
 "Lleoliad y cwarel fertigol, rhwng y calendr llywio dyddiadau a'r rhestr "
 "dasgau pan ddim yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Rhaglenni y caniateir eu rhedeg gan larymau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Dangos y maes RSVP yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Dangos y maes Rôl yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Dangos amserau gorffen apwyntiad yn y golygon wythnos a mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Dangos y maes categorïau yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Gweld larymau dangos yn y gilfach hysbysu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Dangos y maes statws yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Dangos y cwarel \"Rhagolwg\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Dangos y cwarel \"Rhagolwg\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 "Dangos y maes cylchfa amser yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Dangos y maes math yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Dangos rhifau wythnos yn y llywiwr dyddiadau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Lliw tasgau i fod i ddod i ben heddiw"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Lleoliad fertigol cwarel Tasgau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5074,7 +4960,7 @@ msgstr ""
 "Rhoddir rhan defnyddiwr y cyfeiriad e-bost yn lle %u, a'r enw parth yn lle %"
 "d."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5083,63 +4969,55 @@ msgstr ""
 "calendr, ar ffurf lleoliad cylchfa amser Olsen heb ei gyfieithu, fel "
 "\"Europe/London\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Rhaniadau amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Yr amser ganodd y larwm diwethaf, ar ffurf time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr ""
-"Tryloywder y digwyddiadau yn yr olwg galendr, gwerth rhwng 0 (tryloyw) ac 1 "
-"(hollol anhryloyw)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Ffurf cloc bedair awr ar hugain"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unedau nodyn atgoffa rhagosodedig, \"munudau\", \"oriau\" neu \"dyddiau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unedau er mwyn penderfynu p'un ai i guddio tasgau, \"munudau\", \"oriau\" "
 "neu \"dyddiau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Dechrau wythnos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Y dydd mae'r wythnos yn cychwyn, o Ddydd Sul (0) i Ddydd Sadwrn (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "P'un ai i ddefnyddio'r hambwrdd hysbysu ar gyfer larymau gweledol."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "P'un ai i ofyn am gadarnhad cyn dileu apwyntiad neu dasg."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "P'un ai i ofyn am gadarnhad cyn gwaredu apwyntiadau a thasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5147,91 +5025,83 @@ msgstr ""
 "P'un ai i gywasgu penwythnosau yn yr olwg mis, fydd yn rhoi Dydd Sadwrn a "
 "Dydd Sul yng ngofod un diwrnod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "P'un ai i ddangos amser gorffen digwyddiadau yng ngolygon wythnos a mis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "P'un ai i dynnu Llinell Marcus Bains (llinell yr amser presennol) ar y "
 "calendr."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "A ddylid cuddio tasgau gorffenedig yn y golwg tasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "P'un ai i osod nodyn atgoffa rhagosodedig ar gyfer apwyntiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes RSVP yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "P'un ai i ddangos maes categorïau yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes rôl yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes statws yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "P'un ai i ddangos amserau ar ffurf bedair awr ar hugain yn lle defnyddio am/"
 "pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "P'un ai i ddangos maes cylchfa amser yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes math yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "P'un ai i ddangos rhifau wythnos yn y llywiwr dyddiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "A ddylid defnyddio amser arbed golau dydd wrth ddangos digwyddiadau."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Dyddiau gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Awr gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Munud gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Awr dechrau dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Munud cychwyn dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "amser arbed golau dydd"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Crynodeb yn cynnwys"
@@ -5240,25 +5110,39 @@ msgstr "Crynodeb yn cynnwys"
 msgid "Description contains"
 msgstr "Disgrifiad yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Sylw yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Lleoliad yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Heb gydweddu"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Argraffu"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Calendr"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5274,10 +5158,10 @@ msgstr "Gwaredu digwyddiadau sy'n hŷn na"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "dyddiau"
 
@@ -5285,89 +5169,89 @@ msgstr "dyddiau"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Ar y We"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Penblwyddi"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Tywydd"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "_Calendr Newydd"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Methwyd uwchraddio calendrau."
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Methu agor y calendr '%s' er mwyn creu digwyddiadau a chyfarfodydd"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Does dim calendr ar gael er mwyn creu digwyddiadau a chyfarfodydd"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Dewisydd Ffynhonnell Galendr"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Apwyntiad newydd"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Apwyntiad"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Creu apwyntiad newydd"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Cyfarfod Newydd"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Cyfarfod"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Creu cais newydd am gyfarfod"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Apwyntiad drwy'r diwrnod newydd"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Apwyntiad Drwy'r Diwrnod"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Creu apwyntiad gydol-y-dydd newydd"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Calendr newydd"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_Calendr"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Creu calendr newydd"
 
@@ -5399,11 +5283,11 @@ msgstr "Dull heb ei gynnal wrth agor y calendr"
 msgid "Permission denied to open the calendar"
 msgstr "Gwrthodwyd caniatâd i agor y calendr"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Gwall anhysbys"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "Golygu Larwm"
 
@@ -5519,25 +5403,54 @@ msgid "A_dd"
 msgstr "_Ychwanegu"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Larymau"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Awgrymu dangos atodiadau'n awtomatig"
+#: ../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 "Awgrymu dangos atodiadau'n awtomatig"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Atodi ffeil(iau)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../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 "Priodweddau atodiad"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Disgrifiad:"
+
+#: ../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 "Enw'r ffeil:"
+
+#: ../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 "Math MIME:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Calendrau a ddewiswyd ar gyfer Larymau"
 
@@ -5564,7 +5477,7 @@ msgstr ""
 "bost.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
@@ -5573,7 +5486,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Gweinydd Statws Rhydd/Prysur Rhagosodedig</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Cyffredinol</span>"
@@ -5590,25 +5503,27 @@ msgstr "<span weight=\"bold\">Amser</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Wythnos Waith</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Addasu ar gyfer amser _arbed golau dydd"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Dydd yn _gorffen:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Dangos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Rhydd/Prysur"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Dydd Gwener"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5618,13 +5533,13 @@ msgstr ""
 "Oriau\n"
 "Diwrnodau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Dydd Llun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5642,225 +5557,219 @@ msgstr ""
 "Sadwrn\n"
 "Sul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Dewiswch liw"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "S_ul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Dydd Sadwrn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Dewis y calendrau ar gyfer hysbysiad larwm"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "Dangos _Atgof"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Dangos rhifau _wythnos yn y llywiwr dyddiadau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Dydd Sul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "_Tasgau i fod i ddod i ben heddiw:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "_Iau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Templed:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Dydd Iau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "_Cylchfa amser:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Fformat amser:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Dydd Mawrth"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Dydd Mercher"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "_Wythnos yn cychwyn:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Dyddiau gwaith:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 awr (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 awr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Gofyn am gadarnhad wrth ddileu eitemau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Cywasgu wythnosau yn yr olwg mis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Dydd yn cychwyn:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_Gwe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "_Cuddio tasgau gorffenedig ar ôl"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Llu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "_Tasgau sy'n hwyr:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "_Sad"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Dangos amserau diwedd apwyntiad yn y golygon wythnos a mis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "_Rhaniadau amser:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_Maw"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Mer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "cyn bob apwyntiad"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Copïo cynnwys y calendr yn _lleol er mwyn ei ddefnyddio all-lein"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Copïo cynnwys y calendr yn lleol er mwyn ei ddefnyddio all-lein"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Copïo _cynnwys y rhestr dasgau'n lleol er mwyn ei defnyddio all-lein"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Copïo cynnwys y rhestr dasgau'n lleol er mwyn ei defnyddio all-lein"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Copïo cynnwys y _rhestr femo'n lleol er mwyn ei defnyddio all-lein"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Copïo cynnwys y rhestr dasgau'n lleol er mwyn ei defnyddio all-lein"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Lliw:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
 msgstr "Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memo List"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
 msgstr "Rhestr Femos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Priodweddau Calendr"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Calendr Newydd"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Enw Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Rhestr Femo Newydd"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Ychwanegu Calendr"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Ychwanegu Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Ychwanegu Calendr"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Ychwanegu Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "_Adnewyddu:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_LAU:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5921,36 +5830,36 @@ msgid "Validation error: %s"
 msgstr "Gwall dilysu: %s"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " i"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Cyflawnwyd "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Cyflawnwyd"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Amser Disgwyl "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Amser Disgwyl "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Neges wedi'i hatodi - %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:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5958,14 +5867,14 @@ msgstr[0] "Neges wedi'i hatodi"
 msgstr[1] "%d neges wedi'u hatodi"
 msgstr[2] "%d neges wedi'u hatodi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Symud"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Diddymu _Llusgo"
 
@@ -5973,7 +5882,7 @@ msgstr "Diddymu _Llusgo"
 msgid "Could not update object"
 msgstr "Methwyd diweddaru'r gwrthrych"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5986,98 +5895,99 @@ msgid "Hide Attachment _Bar"
 msgstr "_Cuddio'r Bar Atodiadau"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "_Dangos y Bar Atodiadau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Priodweddau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "Ychwanegu _atodiad..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Dangos Atodiadau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Gwasgwch y bylchwr i doglu'r bar atodiadau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Golygu Apwyntiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cyfarfod - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Apwyntiad - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tasg wedi Neilltuo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tasg - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Cofnod dyddlyfr - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Dim crynodeb"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "atodiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Efallai bydd y newidiadau wnaed i'r eitem yn cael eu tynnu os wnaiff "
 "diweddariad gyrraedd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Ni ellir defnyddio'r fersiwn cyfredol!"
 
@@ -6093,10 +6003,6 @@ msgstr "Methwyd agor y cyrchfan"
 msgid "Destination is read only"
 msgstr "Cyrchfan darllen-yn-unig"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Dileu'r eitem hon o flychau e-bost bob derbyniwr arall?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Methwyd dileu'r digwyddiad oherwydd gwall corba"
@@ -6158,90 +6064,95 @@ msgstr "Dirprwyo at:"
 msgid "Enter Delegate"
 msgstr "Rhowch ddirprwy"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_Apwyntiad"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Ail-ddigwyddiad"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Mae gan yr apwyntiad larymau"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "_Calendr:"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "_Trefnydd:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Cynrychiolwyr"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "_Mynychwyr"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Digwyddiad heb amser cychwyn"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Digwyddiad heb amser gorffen"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Dyddiad cychwyn yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Dyddiad gorffen yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Amser cychwyn yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Amser gorffen yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Does gan y trefnydd a ddewiswyd ddim cyfrif bellach."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Mae gofyn am drefnydd."
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Mae eisiau un neu fwy o'r mynychwyr."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Ychwanegu"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ni ellir agor y calendr '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6249,7 +6160,7 @@ msgstr[0] "%d dydd cyn yr apwyntiad"
 msgstr[1] "%d ddydd cyn yr apwyntiad"
 msgstr[2] "%d dydd cyn yr apwyntiad"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6257,7 +6168,7 @@ msgstr[0] "%d awr cyn yr apwyntiad"
 msgstr[1] "%d awr cyn yr apwyntiad"
 msgstr[2] "%d awr cyn yr apwyntiad"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6265,24 +6176,30 @@ msgstr[0] "%d funud cyn yr apwyntiad"
 msgstr[1] "%d funud cyn yr apwyntiad"
 msgstr[2] "%d munud cyn yr apwyntiad"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Addasu"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "Dim"
 
@@ -6299,7 +6216,8 @@ msgid "15 minutes before appointment"
 msgstr "15 munud cyn apwyntiad"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "_Mynychwyr..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6307,25 +6225,29 @@ msgstr "_Mynychwyr..."
 msgid "Ca_tegories..."
 msgstr "_Categorïau..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Larwm Addasedig:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_Disgrifiad:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Disgrifiad Digwyddiad"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Lleoliad:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Crynodeb:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Larwm"
 
@@ -6347,6 +6269,14 @@ msgstr "ar gyfer"
 msgid "until"
 msgstr "hyd"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "_Cynrychiolwyr"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Oddi wrth:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6393,7 +6323,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Statws"
 
@@ -6414,81 +6344,62 @@ msgid "Organizer"
 msgstr "Trefnydd"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Trefnydd:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Methu agor memos o fewn '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "I"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "Dyddiad c_ychwyn:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "_Crynodeb"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-msgid "T_o:"
-msgstr "_At:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grŵp"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "Cynnwys _Memos:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opsiynau calendr</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Ychwanegu Calendr Newydd"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Grŵp Calendr"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Lleoliad Calendr"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Enw Calendr"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Opsiynau Rhestr Dasgau</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Ychwanegu Rhestr Dasgau Newydd"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Grŵp Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Enw Rhestr Dasgau"
 
@@ -6639,7 +6550,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Eithriadau</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>Rhagolwg</b>"
 
@@ -6704,15 +6615,15 @@ msgstr "<span weight=\"bold\">Statws</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Cyflawnwyd"
 
 #: ../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-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Uchel"
 
@@ -6721,20 +6632,20 @@ msgstr "Uchel"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Ar Waith"
 
 #: ../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-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Isel"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Arferol"
 
@@ -6742,7 +6653,7 @@ msgstr "Arferol"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Heb Gychwyn"
 
@@ -6755,7 +6666,7 @@ msgid "Stat_us:"
 msgstr "_Statws:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Anniffiniedig"
 
@@ -6764,7 +6675,7 @@ msgid "_Date completed:"
 msgstr "_Dyddiad gorffen:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Blaenoriaeth:"
 
@@ -6772,12 +6683,12 @@ msgstr "_Blaenoriaeth:"
 msgid "_Web Page:"
 msgstr "_Tudalen Gwe:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Tasg"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Manylion Tasg"
 
@@ -6790,10 +6701,6 @@ msgstr "Dyddiad disgwyliedig yn anghywir"
 msgid "Unable to open tasks in '%s'."
 msgstr "Methu agor tasgau o fewn '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Mynychwyr..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "_Categorïau..."
@@ -6802,6 +6709,10 @@ msgstr "_Categorïau..."
 msgid "Or_ganiser:"
 msgstr "_Trefnydd:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "Dyddiad c_ychwyn:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Cylchfa amser:"
@@ -6810,46 +6721,46 @@ msgstr "Cylchfa amser:"
 msgid "_Due date:"
 msgstr "_Dyddiad disgwyl:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Calendrau Rhydd/Prysur</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Amlder Cyhoeddi</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>_Lleoliad Cyhoeddi</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Gosodiadau Cyhoeddi Statws Rhydd/Prysur"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Dyddiol"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Â llaw"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_Cyfrinair:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "_Cofio'r cyfrinair"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_Enw Defnyddiwr:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Wythnosol"
 
@@ -6934,42 +6845,35 @@ msgid "%s for an unknown trigger type"
 msgstr "%s am fath sbardun anhysbys"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliciwch i agor %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
-msgid "Untitled"
-msgstr "Di-deitl"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "Memo:"
 
-#: ../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
-msgid "Start Date:"
-msgstr "Dyddiad Cychwyn:"
-
-#: ../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
-msgid "Description:"
-msgstr "Disgrifiad:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Tudalen Gwe:"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Di-deitl"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Crynodeb:"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "Dyddiad Cychwyn:"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Dyddiad Disgwyl:"
@@ -6979,7 +6883,7 @@ msgstr "Dyddiad Disgwyl:"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Statws:"
 
@@ -6988,17 +6892,17 @@ msgid "Priority:"
 msgstr "Blaenoriaeth:"
 
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Cyhoeddus"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Preifat"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Cyfrinachol"
 
@@ -7007,25 +6911,24 @@ msgid "End Date"
 msgstr "Dyddiad Gorffen"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "Dyddiad Dechrau"
 
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Crynodeb"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Yn Rhydd"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Prysur"
 
@@ -7039,17 +6942,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ie"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nage"
@@ -7060,21 +6963,21 @@ msgstr "Nage"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Ail-ddigwydd"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Wedi Neilltuo"
 
@@ -7082,7 +6985,7 @@ msgstr "Wedi Neilltuo"
 msgid "Save As..."
 msgstr "Cadw Fel..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Dewiswch blygell i gadw'r atodiadau sydd wedi'u dewis..."
 
@@ -7091,9 +6994,9 @@ msgstr "Dewiswch blygell i gadw'r atodiadau sydd wedi'u dewis..."
 msgid "untitled_image.%s"
 msgstr "delwedd_dideitl.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Cadw Fel..."
 
@@ -7111,79 +7014,74 @@ msgstr "_Cadw'r Rhai wedi'u Dewis"
 msgid "Open in %s..."
 msgstr "Agor yn %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Dileu gwrthrych dewisedig"
 
-#: ../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:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Diweddaru gwrthrychau"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Cadw fel..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "_Tasg Newydd"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Agor Tudalen _Gwe"
 
-#: ../calendar/gui/e-calendar-table.c: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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7191,52 +7089,44 @@ msgstr "Agor Tudalen _Gwe"
 msgid "_Print..."
 msgstr "_Argraffu..."
 
-#: ../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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Torri"
 
-#: ../calendar/gui/e-calendar-table.c: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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Neilltuo Tasg"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Gyrru ymlaen fel iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcio yn gyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai cyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Marcio heb eu gorffen"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Marcio'r tasgau a ddewiswyd yn rai heb eu gorffen"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Dileu'r tasgau a ddewiswyd"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliciwch i ychwanegu tasg"
@@ -7246,7 +7136,7 @@ msgstr "Cliciwch i ychwanegu tasg"
 msgid "% Complete"
 msgstr "% Cyflawn"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Cwblhau"
 
@@ -7271,101 +7161,105 @@ msgstr "Dyddiad cychwyn"
 msgid "Task sort"
 msgstr "Trefnu Tasg"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Symud eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copïo eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "_Apwyntiad Newydd..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "_Digwyddiad Newydd Drwy'r Dydd"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "_Cyfarfod Newydd"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "_Tasg Newydd"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Golwg _Cyfredol"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Dewis _Heddiw"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Dewis Dyddiad..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_Copïo i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_Symud i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Dirprwyo Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Trefnu Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Gyrru Ymlaen fel iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Ateb"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Ateb i _Bawb"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Galluogi _symud y digwyddiad hwn"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Dileu _digwyddiad hyn"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Dileu _Pob digwyddiadau"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Trefnydd: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Trefnydd: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Lleoliad: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Amser: %s %s"
@@ -7395,7 +7289,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Rhaniadau amser %02i munud"
@@ -7406,22 +7300,20 @@ msgstr "Rhaniadau amser %02i munud"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c: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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c: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:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c: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:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -7519,12 +7411,10 @@ msgstr "Gwall iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Person anhysbys"
 
@@ -7539,22 +7429,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Derbyniwyd"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Wedi derbyn yn betrus"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Gwrthododd"
 
@@ -7773,7 +7663,7 @@ msgid "Attendee status updated\n"
 msgstr "Cyflwr mynychwr wedi diweddaru\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Methu"
 
@@ -7820,35 +7710,48 @@ msgid "Send Latest Information"
 msgstr "Anfon Gwybodaeth Ddiweddar"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "-i-"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Neges Calendr"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Dyddiad:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Yn Llwytho Calendr"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Yn Llwytho calendr..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Neges Gweinydd:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "dyddiad-diwedd"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "dyddiad-dechrau"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Cadeiryddion"
@@ -7867,65 +7770,65 @@ msgid "Resources"
 msgstr "Adnoddau"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Unigol"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grŵp"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Adnodd"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Ystafell"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Cadeirydd"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Cyfranogwyr Angenrheidiol"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Cyfranwyr Dewisol"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ddim yn Cyfrannu"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Angen Gweithred"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "I'w gadarnhau"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Dirprwywyd"
 
@@ -7934,14 +7837,14 @@ msgstr "Dirprwywyd"
 msgid "Attendee                          "
 msgstr "Mynychwr                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Mewn Proses"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B, %d, %Y"
 
@@ -7949,86 +7852,86 @@ msgstr "%A, %B, %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Allan o'r Swyddfa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Dim Gwybodaeth"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Mynychwyr..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Opsiynau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Dangos oriau gweithio yn _unig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Dangos wedi _crebachu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Diweddaru rhydd/prysur"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Awtoddewis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Pob person ac adnodd"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Pob _person ac un adnodd"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Pobl _angenrheidiol"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Pob person sydd _angen ac un atodiad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Amser _dechrau:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Amser diwedd:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Dileu'r Memos a Ddewiswyd"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Cliciwch i ychwanegu memo"
 
@@ -8036,8 +7939,8 @@ msgstr "Cliciwch i ychwanegu memo"
 msgid "Memo sort"
 msgstr "Trefnu memos"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8055,7 +7958,7 @@ msgstr "Llwytho memos"
 msgid "Opening memos at %s"
 msgstr "Agor memos am %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Dileu gwrthrychau dewisedig..."
 
@@ -8064,72 +7967,66 @@ msgstr "Dileu gwrthrychau dewisedig..."
 msgid "Enter the password for %s"
 msgstr "Rhowch y cyfrinair ar gyfer %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Llwytho tasgau"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Agor tasgau am %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Cwblhau'r tasgau..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Yn dileu"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "Dewiswch Gylchfa Amser"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Diweddaru ymholiad"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "Golwg _Addasedig"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_Cadw Golwg Addasedig"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Diffinio Golygon..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Yn llwytho tasgau am %s"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Yn llwytho tasgau at %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, c-format
-msgid "Loading memos at %s"
-msgstr "Llwytho memos yn %s"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Puro"
 
@@ -8243,11 +8140,24 @@ msgstr "Gwybodaeth iCalendr"
 msgid "You must be an attendee of the event."
 msgstr "Rhaid i chi fod yn mynychu'r digwyddiad."
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "_Rhestr Femo Newydd"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copïo"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Dileu"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Priodweddau..."
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8255,7 +8165,7 @@ msgstr[0] "%d memo"
 msgstr[1] "%d memo"
 msgstr[2] "%d memo"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8264,57 +8174,45 @@ msgstr[0] ", %d wedi dewis"
 msgstr[1] ", %d wedi dewis"
 msgstr[2] ", %d wedi dewis"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "Methwyd uwchraddio memos."
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "Does dim calendr ar gael er mwyn creu tasgau"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Dewisydd Ffynhonnell Memo"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Memo Newydd"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
-msgstr "Mem_o"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr "_Memo"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Creu memo newydd"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "Memo newydd wedi'i rannu"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "_Memo wedi rhannu"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "Creu memo newydd wedi'i rannu"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Rhestr femo newydd"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
 msgstr "_Rhestr femos"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Creu rhestr femos newydd"
 
@@ -8363,240 +8261,240 @@ msgstr "Methu mudo'r calendr `%s'"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Methu mudo'r tasgau `%s'"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1af"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2il"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3ydd"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4ydd"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5ed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6ed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7fed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8fed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9fed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10fed"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11eg"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12fed"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13eg"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14eg"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15fed"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16eg"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17eg"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18fed"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19eg"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20fed"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21ain"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22ain"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23ain"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24ain"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30ain"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31ain"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Sul"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Llu"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Maw"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Mer"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Iau"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Gwe"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Sad"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Dydd dewisedig (%a %b %d %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Wythnos ddewisedig (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Mis dewisedig (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Blwyddyn ddewisedig (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Apwyntiad"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Tasg"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Crynodeb: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Statws: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Blaenoriaeth: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Canran wedi'i Gwblhau: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "LAU: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorïau: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Cysylltiadau: "
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Rhagolwg Argraffu"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Argraffu Eitem"
 
@@ -8657,14 +8555,14 @@ msgid "New task list"
 msgstr "Rhestr dasgau newydd"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "Rhestr _dasgau"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Creu rhestr dasgau newydd"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8676,11 +8574,11 @@ msgstr ""
 "\n"
 "Dileu'r tasgau yma go iawn?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Peidiwch â gofyn eto"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Argraffu Tasgau"
 
@@ -9256,7 +9154,7 @@ msgid "America/Nassau"
 msgstr "America/Nassau"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "America/New_York"
 
@@ -10275,7 +10173,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Bar Atodiadau"
 
@@ -10283,43 +10181,28 @@ msgstr "Bar Atodiadau"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Methu atodi ffeil %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Methu atodi'r ffeil %s: nid yw'n ffeil arferol"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Priodweddau atodiad"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Enw'r ffeil:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "Math MIME:"
-
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Cyrchfan postio "
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Dewiswch blygellau i bostio'r neges ati."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Cliciwch yma ar gyfer y llyfr cyfeiriadau"
 
@@ -10330,45 +10213,45 @@ msgstr "Cliciwch yma ar gyfer y llyfr cyfeiriadau"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Ateb at:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Oddi wrth:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "P_wnc:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_At:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Rhowch dderbynwyr y neges"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Copi i:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Rhowch y cyfeiriadau fydd yn derbyn copi carbon o'r neges"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "Copi _dall i:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10379,15 +10262,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Postio at:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Cliciwch yma i ddewis plygellau i bostio atynt"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Postio At:"
 
@@ -10395,18 +10278,18 @@ msgstr "Postio At:"
 msgid "A_ttach"
 msgstr "_Atodi"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Mewnosod Atodiad"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Methu llofnodi neges i'w hanfon: Dim tystysgrif llofnodi wedi'i phenodi ar "
 "gyfer y cyfrif"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10414,52 +10297,52 @@ msgstr ""
 "Methu amgryptio neges i'w hanfon: Dim tystysgrif amgryptio wedi'i phenodi ar "
 "gyfer y cyfrif"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Cuddio'r Bar _Atodiadau"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Dangos y Bar _Atodiadau"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Rheswm anhysbys"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Methwyd agor ffeil"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Methu cyrchu neges o'r golygydd"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Neges Di-deitl"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Agor Ffeil"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Awtogynhyrchwyd"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "_Llofnod:"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Cyfansoddi'r Neges"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10611,7 +10494,7 @@ msgstr "C_adw'r Neges"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10621,7 +10504,7 @@ msgstr "Cyfres Meddalwedd Grŵp"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "The Evolution PIM and Email Client"
-msgstr "Evolution, Cleient Ebost a Threfnydd Gwybodaeth Bersonol"
+msgstr "Evolution, Cleient Ebost a Threfnydd Gwybodaeth Personol"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10632,7 +10515,6 @@ msgid "calendar information"
 msgstr "gwybodaeth calendr"
 
 #: ../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"
@@ -10643,17 +10525,14 @@ msgstr ""
 "Hoffech chi newid eich statws i \"Yn y Swyddfa\"?"
 
 #: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Neges Allan o'r Swyddfa</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Statws:</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"
@@ -10664,12 +10543,10 @@ msgstr ""
 "e-bost atoch chi tra byddwch chi allan o'r swyddfa.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr "Rydw i yn y swyddfa ar hyn o bryd"
 
 #: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Rydw i allan o'r swyddfa ar hyn o bryd"
 
@@ -10678,26 +10555,28 @@ msgid "No, Do not Change Status"
 msgstr "Na, Peidio â Newid Statws"
 
 #: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
 msgstr "Cynorthwyydd Allan o'r Swyddfa"
 
 #: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
 msgstr "Ie, Newidiwch Gyflwr"
 
+#: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
 # msgid ""
 # msgstr ""
-#: ../designs/read_receipts/read.glade.h:1
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Derbyn E-bost</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Anfon E-bost</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10709,32 +10588,32 @@ msgstr ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Anfon hysbysiad darllen yn ôl bob tro"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Gofyn i fi a ydw i am anfon hysbysiad darllen yn ôl"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Peidio byth ag anfon hysbysiad darllen yn ôl"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Darllen Dychwelyd"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Anfon cais am hysbysiad darllen ar gyfer bob neges rwy'n eu hanfon"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "Oni bai fod y neges wedi'i hanfon at restr e-bostio, ac nid ata i'n bersonol"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10742,7 +10621,7 @@ msgstr ""
 "Wrth i chi dderbyn e-bost gyda chais am hysbysiad eich bod wedi ei darllen, "
 "beth ddylai Evolution ei wneud?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10750,28 +10629,28 @@ msgstr ""
 "Mae ffeil gyda'r enw hynny'n bodoli eisoes.\n"
 "Ydych chi am ei throsysgrifo?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Trosysgrifo ffeil?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Gwall Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Rhybudd Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Gwybodaeth Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Ymholiad Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Gwall mewnol: gwall anhysbys '%s' wedi ei geisio"
@@ -10792,7 +10671,7 @@ msgstr "A hoffech ei drosysgrifo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Ffeil &quot;{0}&quot; yn bodoli."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Trosysgrifo"
 
@@ -10873,24 +10752,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Dewiswch amser i'w gymharu ag ef"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Dewiswch ffeil"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Pwysig"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "I'w wneud"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Hwyrach"
 
@@ -10939,11 +10818,11 @@ msgid "Include threads"
 msgstr "Cynnwys edeifion"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Dod I Mewn"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Mynd Allan"
 
@@ -10967,7 +10846,7 @@ msgstr "Dyddiad ar goll."
 msgid "Missing file name."
 msgstr "Enw ffeil ar goll."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Enw ar goll."
 
@@ -11039,7 +10918,7 @@ msgstr "yn ôl"
 msgid "months"
 msgstr "misoedd"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "eiliadau"
 
@@ -11069,7 +10948,7 @@ msgstr "Enw Rheol"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
-msgstr "Hoffterau Cyfansoddwr"
+msgstr "Hoffiannau Cyfansoddwr"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
@@ -11112,24 +10991,24 @@ msgid "Evolution Mail preferences control"
 msgstr "Rheolaeth dewisiadau Ebost Evolution"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Ebost"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Cyfrifon Ebost"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
-msgstr "Hoffterau Ebost"
+msgstr "Hoffiannau Ebost"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
@@ -11154,7 +11033,7 @@ msgstr ""
 "a thicio'r blwch i'w dderbyn\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Dewiswch Blygell"
 
@@ -11162,46 +11041,46 @@ msgstr "Dewiswch Blygell"
 msgid "Ask for each message"
 msgstr "Gofyn am bob neges"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Hunaniaeth"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Derbyn Ebost"
 
-#: ../mail/em-account-editor.c:2014
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "Gwirio'n awtomatig am _e-bost newydd bob"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Anfon E-bost"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Rhagosodiadau"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Diogelwch"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Gosodiadau Derbyn"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Chwilio am Ebost Newydd"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Golygydd Cyfrifon"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Cynorthwyydd Cyfrifon Evolution"
 
@@ -11221,22 +11100,22 @@ msgid "[Default]"
 msgstr "[Rhagosodedig]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Galluogwyd"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Enw'r cyfrif"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protocol"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Dienw"
 
@@ -11312,12 +11191,6 @@ msgstr "Dyddiad derbyniwyd"
 msgid "Date sent"
 msgstr "Dyddiad anfon"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Dileu"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Wedi dileu"
@@ -11406,7 +11279,7 @@ msgstr "ddim yn"
 msgid "is not Flagged"
 msgstr "ddim yn Fanerog"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Sothach"
@@ -11415,7 +11288,7 @@ msgstr "Sothach"
 msgid "Junk Test"
 msgstr "Prawf Sothach"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
 
@@ -11459,7 +11332,7 @@ msgstr "Chwarae Sain"
 msgid "Read"
 msgstr "Darllen"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Derbynwyr"
 
@@ -11487,11 +11360,11 @@ msgstr "yn dychwelyd 'yn llai na'"
 msgid "Run Program"
 msgstr "Gweithredu Rhaglen"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Sgôr"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Danfonwr"
 
@@ -11523,11 +11396,11 @@ msgstr "Dechrau gyda"
 msgid "Stop Processing"
 msgstr "Atal Prosesu"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Pwnc"
@@ -11541,42 +11414,10 @@ msgstr "Dadosod Cyflwr"
 msgid "<b>Then</b>"
 msgstr "<b>Yna</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Creu _Plygell Chwilio o'r Chwiliad..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Pob Neges"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Negeseuon heb eu Darllen"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Dim Label"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Negeseuon wedi'u Darllen"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Negeseuon Diweddar"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days' Messages"
-msgstr "Negeseuon y 5 diwrnod olaf"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Negeseuon ag Atodiadau"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Negeseuon Ddim yn Sothach"
-
 #. 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
@@ -11595,7 +11436,7 @@ msgstr[1] "Negeseuon heb eu darllen:"
 msgstr[2] "Negeseuon heb eu darllen:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Priodweddau Plygell"
 
@@ -11612,7 +11453,7 @@ msgid "Folder _name:"
 msgstr "Enw'r _plygell:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Plygellau Chwilio"
 
@@ -11627,7 +11468,7 @@ msgstr "Drafftiau"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Blwch Derbyn"
 
@@ -11643,77 +11484,77 @@ msgstr "Wedi Anfon"
 msgid "Loading..."
 msgstr "Yn Llwytho..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Coeden Plygell Ebost"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Symud plygell %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copïo plygell %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Symud ffeiliau i mewn i'r blygell %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copïo ffeiliau i mewn i'r blygell %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Methu gollwng neges(euon) i'r storfa level uchaf"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copïo i Blygell"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Symud i Blygell"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Sganio plygellau o fewn \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Golwg"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Agor mewn Ffenestr _Newydd"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Copïo..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Symud..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Plygell Newydd..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Ailenwi..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Taflu'r Sbwriel"
 
@@ -11722,14 +11563,13 @@ msgstr "_Taflu'r Sbwriel"
 msgid "Copying `%s' to `%s'"
 msgstr "Copïo `%s' i `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Dewis plygell"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opïo"
 
@@ -11751,180 +11591,170 @@ msgstr "Creu plygell"
 msgid "Specify where to create the folder:"
 msgstr "Penodwch ble i greu'r blygell:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Ateb i'r Danfonwr"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Ymlaen"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Golygu fel Neges Newydd..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Dad-ddileu"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Symud i Blygell..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copïo i Blygell..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "_Marcio Wedi Darllen"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marcio _heb ei ddarllen"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marcio'n _Bwysig"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "Marcio _Ddim yn Bwysig"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marcio'n _Sothach"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marcio _Ddim yn Sothach"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marcio ar gyfer _Dilyniant..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Dim"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Gosod _Baner 'Wedi Cwblhau'"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Clirio Baner"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Creu _Rheol o'r Neges"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Plygell Chwilio ar y _Pwnc"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Plygell Chwilio ar y _Danfonwr"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Plygell Chwilio ar y _Derbynwyr"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Plygell Chwilio ar y _Rhestr E-bostio"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Hidlo ar _Bwnc"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Hidlo ar _Ddanfonwr"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Hidlo ar _Dderbynyddion"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Hidlydd ar y _Rhestr E-bostio"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Argraffu'r Neges"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Methu nôl y neges"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Copïo Lleoliad y Cyswllt"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Creu _Plygell Chwilio"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_O'r cyfeiriad hwn"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_I'r cyfeiriad hwn"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliciwch i e-bostio %s"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Cliciwch i ddangos/cuddio cyfeiriadau"
-
 # TRWSIO: dylai ddefnyddio ngettext?
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:503
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Cydweddiadau: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "Canfod:"
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "_Cydweddu llythrennau bach/mawr"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Di-lofnod"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Nid yw'r neges wedi ei llofnodi. Does dim gwarant fod y neges hon yn ddilys."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Llofnod dilys"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11932,11 +11762,11 @@ msgstr ""
 "Mae'r neges hon wedi ei llofnodi ac yn ddilys, sy'n golygu ei bod hi'n "
 "ddigon tebyg fod y neges yn un dilys."
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Llofnod annilys"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11944,11 +11774,11 @@ msgstr ""
 "Methu dilysu llofnod y neges hon: fe all fod wedi ei newid yn ystod ei "
 "thaith."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Llofnod dilys, methu dilysu'r anfonwr"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11956,11 +11786,11 @@ msgstr ""
 "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y "
 "neges."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Heb amgryptio"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11968,11 +11798,11 @@ msgstr ""
 "Nid yw'r neges hon wedi ei hamgryptio. Gellir darllen ei chynnwys wrth iddi "
 "deithio ar draws y Rhyngrwyd."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Wedi amgryptio, yn wan"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11982,11 +11812,11 @@ msgstr ""
 "fyddai hi'n anodd, ond nid yn amhosib, i rywun o'r tu allan weld cynnwys y "
 "neges hon ymhen cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Wedi amgryptio"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11994,11 +11824,11 @@ msgstr ""
 "Mae'r neges hon wedi ei hamgryptio.  Fe fyddai hi'n anodd i rywun o'r tu "
 "allan weld cynnwys y neges hon."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Wedi amgryptio, yn gryf"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12008,73 +11838,73 @@ msgstr ""
 "fyddai hi'n anodd iawn i rywun o'r tu allan weld cynnwys y neges hon mewn "
 "cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Gweld Tystysgrif"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Ni ellir gweld y dystysgrif"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Wedi cwblhau ar %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Hwyr:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "gan %B %d, %Y %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Gweld yn Fewnol"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Cuddio"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Ffitio i'r Lled"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Dangos y _Maint Gwreiddiol"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Atodiad"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Dewis plygell i gadw pob atodiad..."
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Cadw'r rhai wedi dewis..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
 msgstr[0] "%d at_odiad"
 msgstr[1] "%d at_odiad"
 msgstr[2] "%d at_odiad"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Cadw"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Cadw _Pob Un"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Dim Atodiad"
 
@@ -12088,89 +11918,95 @@ msgstr "Tudalen %d o %d"
 msgid "Retrieving `%s'"
 msgstr "Yn nôl `%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Llofnod dilys ond yn methu dilysu'r anfonwr"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Rhan corff allanol wedi ei gam-ffurfio."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pwyntydd at safle FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pwyntydd at ffeil leol (%s) sy'n ddilys ar y safle \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pwyntydd at ffeil leol (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pwyntydd at wybodaeth bell (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pwyntydd at ddata allanol anhysbys (math \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Fformatio neges"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Oddi wrth"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Ateb-I"
 
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "I"
+
 # Why are these two msgstr's in caps? Should they be?
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Ebostiwr"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Dyddiad"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Grwpiau Newyddion"
@@ -12220,7 +12056,7 @@ msgstr "Unwaith bob wythnos"
 msgid "Once per month"
 msgstr "Unwaith bob mis"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12232,47 +12068,47 @@ msgstr ""
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Methu creu plygell newydd `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Methu copïo plygell `%s' i `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Methu sganio am flychau e-bost ar `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Methu agor hen ddata POP cadw-ar-y-gweinydd `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Methu creu plygell data `%s' POP3 i'w gadw ar y gweinydd: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Methu copïo data POP3 `%s' i'w gadw ar y gweinydd: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Methu creu storfa e-bost lleol `%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Methu creu plygellau e-bost lleol yn `%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12289,6 +12125,10 @@ msgstr "_Ateb i'r danfonwr"
 msgid "Reply to _List"
 msgstr "Ateb i'r _Rhestr"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Agor y Cyswllt Mewn Porwr"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Danfon Neges Newydd i..."
@@ -12297,50 +12137,50 @@ msgstr "_Danfon Neges Newydd i..."
 msgid "_Add to Address Book"
 msgstr "_Ychwanegu i'r Llyfr Cyfeiriadau"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Nid yw'r storfa yn cynnal tanysgrifiadau, neu nid ydynt wedi eu gweithredoli."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Wedi Tanysgrifio"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Plygell"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Dewiswch weinydd."
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Does dim gweinydd wedi ei ddewis"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Peidiwch â dangos y neges hon eto."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Hidlyddion Negeseuon"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "neges"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Cadw'r Neges..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Ychwanegu cyfeiriad"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Negeseuon o %s"
@@ -12349,7 +12189,7 @@ msgstr "Negeseuon o %s"
 msgid "Search _Folders"
 msgstr "_Plygellau Chwilio"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Ffynhonnell Plygell Chwilio"
 
@@ -12382,112 +12222,84 @@ msgid "Composer Window default width"
 msgstr "Lled rhagosodedig Ffenest Gyfansoddi"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Cywasgu dangosiad cyfeiriadau yn yr olwg AT/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Cywasgu dangosiad cyfeiriadau yn yr olwg AT/CC/BCC i'r nifer a benodir yn "
-"address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Set nodau ragosodedig er mwyn cyfansoddi negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Set nodau ragosodedig er mwyn cyfansoddi negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Set nodau ragosodedig er mwyn dangos negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Set nodau ragosodedig er mwyn dangos negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Arddull ragosodedig gyrru ymlaen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Uchder rhagosodedig y Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Uchder rhagosodedig y Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Uchder rhagosodedig y ddeialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Arddull ateb rhagosod"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Lled rhagosodedig y Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Lled rhagosodedig y Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Lled rhagosodedig y ddeialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Dangos marciau gwallau sillafu ar eiriau wrth i chi deipio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Gwacáu plygellau Sbwriel wrth adael"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Gwagio bob plygell Sbwriel wrth adael Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Galluogi modd caret, fel eich bod yn medru gweld cyrchwr wrth ddarllen e-"
 "bost."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Galluogi neu analluogi'r nodwedd chwilio wrth deipio ymlaen"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Galluogi nodwedd chwilio o fewn y bar ochr fel y gallwch chi ddechrau "
-"chwilio'n rhyngweithiol wrth deipio'r testun. Mae hyn yn gadael i chi ganfod "
-"plygell o fewn y bar ochr hwnnw yn hawdd wrth deipio enw'r blygell, ac fe "
-"fydd y dewis yn neidio'n awtomatig at y blygell honno."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Galluogi/analluogi'r modd caret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Uchder y cwarel rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Uchder y cwarel rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12495,15 +12307,7 @@ msgstr ""
 "Os ydy'r defnyddiwr yn ceisio agor 10 neges neu fwy ar yr un pryd, gofyn "
 "iddyn nhw a ydyn nhw wir am wneud hynny."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Os yw'r panel \"Rhagolwg\" ar waith, ei ddangos ochr-yn-ochr yn hytrach na'n "
-"fertigol."
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12513,27 +12317,23 @@ msgstr ""
 "gellir defnyddio unrhyw fath mime o fewn y rhestr hon sy'n mapio i welydd "
 "cydran bonobo yng nghronfa data mathau mime GNOME er mwyn dangos y cynnwys."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Mae'n galluogi/analluogi'r prompt wrth farcio mwy nag un neges."
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Y tro diwethaf rhedwyd y broses o wagio'r sbwriel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Rhestr o Labeli a'r lliwiau sy'n gysylltiedig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Rhestr trwyddedau wedi'u derbyn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Rhestr cyfrifon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12542,11 +12342,11 @@ msgstr ""
 "cynnwys llinynnau sy'n enwi is-blygellau perthynol i /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Rhestr o benawdau addasedig ac a ydynt wedi eu galluogi."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12555,19 +12355,19 @@ msgstr ""
 "cynnwys llinynnau sy'n cynnwys enw:lliw lle mae lliw yn defnyddio'r amgodiad "
 "hecs HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Rhestr o fathau mime i'w gwirio ar gyfer gwelyddion cydrannau bonobo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Rhestr o enwau protocol y mae eu trwyddedau wedi eu derbyn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Llwytho delweddau ar gyfer negeseuon HTML dros http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12577,98 +12377,94 @@ msgstr ""
 "0 - Peidio byth â llwytho delweddau o'r rhwyd 1 - Llwytho delweddau os yw'r "
 "anfonwr yn y llyfr cyfeiriadau 2 - Llwytho delweddau o'r rhwyd bob amser"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Cofnodi gweithredoedd hidlo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Logio gweithredoedd hidlo yn y ffeil benodol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Ffeil i logio gweithredoedd hidlo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Ffeil i logio gweithredoedd hidlo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcio wedi'u Gweld ar ôl amser penodol"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcio wedi'u Gweld ar ôl amser penodol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcio dyfyniadau yn y neges \"Rhagolwg\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcio dyfyniadau yn y neges \"Rhagolwg\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Uchder rhagosodedig Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Lled rhagosodedig Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Arddull dangos-neges (\"arferol\", \"penawdau llawn\", \"ffynhonnell\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Nifer lleiaf o ddyddiau rhwng gwagio'r sbwriel wrth adael"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Lleiafswm amser rhwng gwagio'r sbwriel wrth adael, mewn diwrnodau."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Ffeil sain hysbysu am e-bost newydd"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Math Hysbysu am Ebost Newydd"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Y nifer o gyfeiriadau i'w dangos yn yr olwg AT/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Rhybuddio am bwnc gwag"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Promptio'r defnyddiwr pan mae'n ceisio chwynnu plygell."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Promptio'r defnyddiwr pan mae'n ceisio anfon neges heb bwnc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Promptio pan mae'r defnyddiwr yn chwynnu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Promptio pan mae'r defnyddiwr yn llenwi Bcc yn unig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Promptio pan mae'r defnyddiwr yn ceisio agor 10 neges neu fwy ar unwaith"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12676,111 +12472,93 @@ msgstr ""
 "Promptio pan mae'r defnyddiwr yn ceisio anfon e-bost HTML at dderbynwyr nad "
 "ydynt o reidrwydd am dderbyn e-bost HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
-"Promptio pan mae'r defnyddiwr yn ceisio anfon neges heb dderbynwyr At: na Cc:"
+"Promptio pan mae'r defnyddiwr yn ceisio anfon neges heb dderbynwyr I: na Cc:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Promptio pan mae'r defnyddiwr yn ceisio anfon HTML diofyn amdano"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "Promptio wrth farcio mwy nag un neges"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Adnabod cysylltion o fewn y testun a'u hamnewid."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Adnabod gwenogluniau o fewn y testun a'u hamnewid."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Rhedeg prawf sothach ar yr e-bost sy'n dod i mewn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Anfon e-bost HTML yn rhagosod"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Anfon e-bost HTML yn rhagosod."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Dangos Animeiddio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Dangos delweddau animeiddiedig fel animeiddiadau."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Dangos negeseuon sydd wedi eu dileu (gyda llinell drwyddynt) yn y rhestr "
 "negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Dangos negeseuon sydd wedi eu dileu o fewn y rhestr negeseuon."
 
-#: ../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 ""
-"Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y "
-"rhestr negeseuon"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr ""
-"Dangos cyfeiriad e-bost yr anfonwr o fewn y golofn negeseuon yn y rhestr "
-"negeseuon"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Ffeil sain i'w chwarae pan fo e-bost newydd yn cyrraedd."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Penodi'r math o nodyn Hysbysu am Ebost Newydd mae'r defnyddiwr am weld."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Gwirio sillafu'n fewnol"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Uchder rhagosodedig deialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Lled rhagosodedig deialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Ffont terfynell"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr "
 "epoc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Y ffont terfynell er mwyn dangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Y ffont lled newidiol er mwyn dangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12792,111 +12570,99 @@ msgstr ""
 "pennawd galluogwyd&gt; - gosodwch 'galluogwyd' os yw'r pennawd am gael ei "
 "ddangos yn yr olwg e-bost."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Gosod y nifer o gyfeiriadau i'w dangos yng ngolwg rhagosodedig y rhestr "
-"negeseuon. Ar ôl y nifer a benodir, fe ddangosir '...'"
-
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Edafu'r rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Edafu'r rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Creu edafedd o'r rhestr negeseuon, yn seiliedig ar y pynciau"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Terfyn amser cyn marcio neges fel un wedi ei Gweld"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Terfyn amser cyn marcio neges fel un wedi ei Gweld."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Llinyn UID y cyfrif rhagosodedig."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Defnyddio ellyll a chleient Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Defnyddio ellyll a chleient Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Defnyddio ffontiau addasedig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Defnyddio ffontiau addasedig i ddangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Defnyddio dim ond y profion sothach lleol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Defnyddio dim ond y profion sothach lleol (dim DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Defnyddio cynllun ochr-yn-ochr neu gynllun llydan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Ffont lled amrywiol"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Eitem ddewislen Gweld/Bcc wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Eitem ddewislen Gweld/Bcc wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Eitem ddewislen Gweld/Cc wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Eitem ddewislen Gweld/Cc wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Eitem ddewislen Gweld/I wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Eitem ddewislen Gweld/I wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Eitem ddewislen Gweld/Postio I wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Eitem ddewislen Gweld/Postio I wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Eitem ddewislen Gweld/Ateb I wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Eitem ddewislen Gweld/Ateb I wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12904,14 +12670,6 @@ msgstr ""
 "P'un ai i gwympo'n ôl ar greu edafedd o'r pynciau ai peidio, pan nad yw'r "
 "negeseuon yn cynnwys penawdau Mewn-Ateb-I neu Gyfeirnodau."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Lled y cwarel rhestr negeseuon"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Lled y cwarel rhestr negeseuon."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Mewnforio data Elm"
@@ -12943,15 +12701,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Mewnforio plygellau ffurf E-bost Berkeley (mbox)"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Mewnforio `%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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Arhoswch os gwelwch yn dda"
 
@@ -13140,31 +12898,31 @@ msgstr[0] ", %d heb ei ddarllen"
 msgstr[1] ", %d heb eu darllen"
 msgstr[2] ", %d heb eu darllen"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Neges Ebost Newydd"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "Neges _Ebost"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Cyfansoddi neges e-bost newydd"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Plygell Ebost Newydd"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "_Plygell Ebost"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Creu plygell e-bost newydd"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Methu wrth uwchraddio plygellau neu osodiadau e-bost."
 
@@ -13192,221 +12950,227 @@ msgstr "_I'w wneud"
 msgid "_Later"
 msgstr "_Hwyrach"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Gwirio am Fathau Cynaledig"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Ni chynhelir SSL yn yr adeiledd hwn o Evolution</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>_Llofnodion</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Ieithoedd</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 "<small>Bydd hyn yn gwneud yr hidlydd yn fwy dibynnol, ond yn arafach</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Cyfrif</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Math Dilysiant</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Dilysiant</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Cyfansoddi Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Ymddygiad Rhagosodedig</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Dileu Ebost</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Penawdau Ebost _Wedi'u Dangos </span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Dewisiadau Hidlo</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Labeli a Lliwiau</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Llwytho Delweddau</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Dangos Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Derbynwyr Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Hysbysiad Ebost Newydd</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Ddewisol</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Dewisiadau</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Printio</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Angenrheidiol</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME Diogel (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Diogelwch</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Negeseuon Wedi'u Hanfon a rhai Drafft</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad Gweinydd</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Rheolaeth Cyfrifon"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "_Ychwanegu Llofnod Newydd..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Ychwanegu _Sgript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Llofnodi negeseuon cyn eu hanfon o hyd wrth ddefnyddio'r cyfrif hwn"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Amgryptio'ch copi eich _hun hefyd wrth anfon e-bost wedi'i amgryptio"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Anfon copi-carbon (cc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "_Anfon copi-carbon dall (bcc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Ymddiried yn yr allweddi yn fy nghylch allweddi o hyd wrth amgryptio"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Amgryptio fy nghopi fy _hun hefyd wrth anfon e-bost wedi'i amgryptio"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Atodi'r neges wreiddiol"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Rhoi delweddau _gwenoglun i mewn yn awtomatig"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltig (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltig (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "Rhoi bîp pan fo _e-bost newydd yn cyrraedd"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "_Set nodau:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Gwirio am Fathau Wedi'u Cynnal"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "_Gwirio'r e-bost sy'n dod i mewn ar gyfer sothach"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Gwirio sillafu wrth i mi _deipio"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Yn gwirio'r e-bost sy'n dod i mewn i weld a yw'n Sothach"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "C_lirio"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Cl_irio"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Lliw'r geiriau _heb eu sillafu'n gywir:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Cadarnhau wrth chwynnu plygell"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13422,135 +13186,135 @@ msgstr ""
 "\n"
 "Cliciwch \"Cymhwyso\" i gadw'ch gosodiadau."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Rhagosodiad"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "_Amgodiad nodau rhagosod:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Arwyddo'n ddigidol y negeseuon sy'n cael eu hanfon (fel rhagosodiad)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Peidio â dyfynnu'r neges wreiddiol"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Wedi gorffen"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "_Plygell Drafftiau:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "_Galluogi"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Cyfrifon Ebost"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "_Cyfeiriad Ebost:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Gwagu plygellau sbwriel wrth _adael"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Tystysgrif _amgryptio:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Amgryptio'r negeseuon sy'n cael eu hanfon (fel rhagosodiad)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Ffont lled _Penodol:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Lled _penodol:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Priodweddau Ffont"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Fformatio negeseuon mewn _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "_Enw Llawn:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Ebost HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Penawdau"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Amlygu _dyfyniadau gyda"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "Cynnwys profion pell"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Yn fewnol"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Tabl Ieithoedd"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Cyfluniad Ebost"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Tabl Penawdau E-bost"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Lleoliad bocs e-bost"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Cyfansoddwr Negeseuon"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Sylwer: bydd dim gofyn i chi roi cyfrinair nes i chi gysylltu am y tro cyntaf"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "_Corff:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Allwedd PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Chwarae ffeil sain pan fo e-bost newydd yn _cyrraedd"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13558,7 +13322,7 @@ msgstr ""
 "Rhowch enw disgrifiadol ar gyfer y cyfrif yn y man isod.\n"
 "Bydd yr enw yn cael ei ddefnyddio at bwrpas dangos yn unig."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13567,7 +13331,7 @@ msgstr ""
 "chi'n siŵr, gofynnwch i'ch gweinyddwr system neu'ch darparwr gwasanaeth "
 "Rhyngrwyd."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13577,43 +13341,39 @@ msgstr ""
 "sy'n \"ddewisol\", oni bai eich bod am gynnwys y wybodaeth hynny yn yr e-"
 "bost fyddwch chi'n ei anfon."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Dewiswch ymhlith yr opsiynau yma"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "_Promptio wrth anfon negeseuon gyda dim ond derbynwyr Bcc wedi eu diffinio"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Dyfynnu'r neges wreiddiol"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Dyfynnwyd"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Cofio'r cyfrinair"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Ateb-At:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Cofio'r _cyfrinair"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "D_ewis..."
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_end message receipts:"
-msgstr "_Anfon negeseuon derbyn e-bost:"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "Ffont _Safonol:"
@@ -13642,51 +13402,55 @@ msgstr "Dewis ffont lled amrywiol HTML er mwyn argraffu"
 msgid "Select sound file"
 msgstr "Dewis ffeil sain"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "Anfon negeseuon derbyn e-bost:"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Yn Derbyn Post"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Plygell _Negeseuon Wedi'u Hanfon:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Angen _dilysiant ar y gweinydd"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "_Math o Wasanaethwr:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Tystysgrif _Llofnodi:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_Llofnod:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Llofnodion"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Tabl Llofnodion"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Penodwch enw _ffeil"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Gwirio Sillafu"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "_Math: "
 
-#: ../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."
@@ -13694,7 +13458,7 @@ msgstr ""
 "Mae'r rhestr hon o ieithoedd yn adlewyrchu'r rhai yr ydych wedi gosod "
 "geiriadur ar eu cyfer yn unig"
 
-#: ../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"
@@ -13704,7 +13468,7 @@ msgstr ""
 "dangos yn unig y defnyddir yr enw fyddwch chi'n\n"
 "ei benodi."
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13712,15 +13476,15 @@ msgstr ""
 "Rhowch yr enw yr hoffech ei ddefnyddio i gyfeirio at y cyfrif hwn.\n"
 "Er enghraifft: \"Gwaith\" neu \"Personol\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "_Enw Defnyddiwr:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Lled _amrywiol:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13730,73 +13494,69 @@ msgstr ""
 "\n"
 "Cliciwch \"Ymlaen\" i ddechrau."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Ychwanegu Llofnod"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Llwytho delweddau o'r Rhyngrwyd bob tro"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Peidio â'm hysbysu pan fo e-bost newydd yn cyrraedd"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "_Peidio ag arwyddo ceisiadau am gyfarfodydd (er mwyn cydweddu ag Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "Arddull yrru _ymlaen:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Llwytho delweddau mewn negeseuon e-bost o gysylltiadau"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "Gwneud hon yn gyfrif rhagosodedig"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Marcio negeseuon fel rhai wedi eu darllen ar ôl"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Peidio byth a llwytho delweddau o'r Rhyngrwyd"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Llwybr:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Rhybuddio cyn anfon negeseuon HTML at gysylltiadau nad ydynt eu heisiau"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Rhybuddio cyn anfon negeseuon gyda _llinell bwnc wag"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Arddull ateb:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Sgript:"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "_Dangos delweddau wedi'u hanimeiddio"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Crebachu penawdau I / Cc / Bcc yn"
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Defnyddio cysylltiad diogel:"
@@ -13806,21 +13566,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "_Defnyddio'r un ffontiau â rhaglenni eraill"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "cyfeiriadau"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "lliw"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "disgrifiad"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 # TRWSIO: VFolder vs. vFolder
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
@@ -13835,63 +13587,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Amgryptio</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Pob plygell bell sy'n weithredol"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Pob plygell lleol a phell sy'n weithredol"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Pob plygell leol"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "_Cyfateb llythrennau bach/mawr"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Cyflawnwyd"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "_Canfod:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Canfod mewn Neges"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Baner i Ddilyn Lan"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Tanysgrifiadau Plygellau"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Cytundeb Trwydded"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Dim Dewisedig"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "G_weinydd:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Gwybodaeth Diogelwch"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Plygellau penodol"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13900,43 +13636,68 @@ msgstr ""
 "isod.\n"
 "Dewiswch weithred ddilyn i fyny o'r ddewislen \"Baner\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Derbyn Trwydded"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Angen Erbyn:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Baner"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Subscribe"
+msgstr "_Tanysgrifio"
+
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_Ticiwch hwn i dderbyn y cytundeb trwydded"
 
+#: ../mail/mail-dialogs.glade.h:24
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "_Dad-danysgrifio"
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "plygellau penodol yn unig"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "gyda phob plygell bell sy'n weithredol"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "gyda phob plygell lleol a phell sy'n weithredol"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "gyda phob plygell leol"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Yn pingio %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Hidlo Plygell"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Gafael Ebost"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 "Methu rhoi'r hidlyddion ar waith ar gyfer e-bost sy'n cael ei anfon allan: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13945,100 +13706,100 @@ msgstr ""
 "Wedi methu atodi at %s: %s\n"
 "Yn atodi at y blygell `Anfonwyd' lleol yn lle hynny."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Methu atodi at y blygell `Anfonwyd' lleol: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Anfon neges %d o %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Methwyd anfon %d o %d neges."
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Diddymwyd."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Cyflawn."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Cadw'r neges i'r plygell"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Symud negeseuon i %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copïo negeseuon i %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Negeseuon a yrrwyd ymlaen"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Yn agor plygell %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Yn agor storfa %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Yn tynnu plygell %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Yn storio plygell '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Chwynnu a storio cyfrif '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Yn storio cyfrif '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Adnewyddu plygell"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Dileu plygell"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Gwagio sbwriel yn '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Plygellau Lleol"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Yn nôl neges %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14046,7 +13807,7 @@ msgstr[0] "Yn nôl %d neges"
 msgstr[1] "Yn nôl %d neges"
 msgstr[2] "Yn nôl %d neges"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -14054,7 +13815,16 @@ msgstr[0] "Yn cadw %d neges"
 msgstr[1] "Yn cadw %d neges"
 msgstr[2] "Yn cadw %d neges"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Methu creu ffeil allbwn: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14063,11 +13833,11 @@ msgstr ""
 "Gwall wrth gadw'r negeseuon i: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Cadw'r atodiad"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14076,69 +13846,60 @@ msgstr ""
 "Methu creu ffeil allbwn: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Methu ysgrifennu data: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Datgysylltu o %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ail-gysylltu â %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Gwirio Gwasanaeth"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Diddymu..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Anfon a Derbyn Ebost"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "Diddymu _Popeth"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Diweddaru..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Aros..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Chwilio am Ebost Newydd"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Rhowch Gymal Cyfrin ar gyfer %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Rhowch Gymal Cyfrin"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Rhowch Gyfrinair am %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Rhowch Gyfrinair"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Defnyddiwr wedi canslo'r weithred."
 
@@ -14151,7 +13912,7 @@ msgid "Enter a name for this signature."
 msgstr "Rhowch enw ar gyfer y llofnod."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Enw:"
 
@@ -14195,11 +13956,11 @@ msgstr "Diweddaru Plygellau Chwilio ar gyfer '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Diweddaru Plygellau Chwilio ar gyfer '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Golygu Plygell Chwilio"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Plygell Chwilio Newydd"
 
@@ -14518,34 +14279,30 @@ msgid "Mark all messages as read"
 msgstr "Marcio bob neges fel rhai wedi'u darllen"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Mark all messages in subfolders as read?"
-msgstr "Marcio bob neges yn yr isblygellau fel rhai wedi'u darllen?"
+msgid "Mark all messages as read in the selected folder"
+msgstr "_Marcio bob neges yn y blygell a ddewiswyd fel rhai wedi eu darllen"
 
 #: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "_Marcio Wedi'u Darllen"
-
-#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Plygell coll."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Dim ffynonellau wedi'u dewis."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Gall agor gormod o negeseuon ar yr un pryd gymryd cryn amser."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Gwiriwch osodiadau eich cyfrif cyn ail-geisio."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Galluogwch y cyfrif neu defnyddiwch gyfrif arall ar gyfer anfon."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14553,7 +14310,7 @@ msgstr ""
 "Rhowch gyfeiriad e-bost dilys yn y maes At:. Gallwch chwilio am gyfeiriadau "
 "e-bost wrth glicio ar y botwm At: sydd nesaf at y blwch cofnod."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14565,55 +14322,55 @@ msgstr ""
 "{0}\n"
 "Anfon beth bynnag?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Rhowch enw unigryw er mwyn adnabod ar gyfer y llofnod."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Arhoswch os gwelwch yn dda."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem wrth fudo'r hen blygell e-bost &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Ymholi'r gweinydd"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Yn holi'r gweinydd am restr o'r dulliau dilysiant sydd wedi'u cynnal."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Mae cais am anfon hysbys eich bod wedi darllen hwn."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Dileu go iawn blygell &quot;{0}&quot; a'i holl is-blygellau?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Plygellau Chwilio wedi'u diweddaru'n awtomatig."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Anfon Derbynneb"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Llofnod yn bodoli'n barod"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Mae Evolution angen plygellau'r system er mwyn gweithio'n gywir, ac ni ellir "
-"eu hail-enwi, eu symud na'u dileu."
+"Mae Ximian Evolution angen plygellau'r system er mwyn gweithio'n gywir, ac "
+"ni ellir eu hail-enwi, eu symud na'u dileu."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14630,7 +14387,7 @@ msgstr ""
 "dderbynwyr o fewn eich neges. I osgoi hyn, dylech ychwanegu o leiaf un "
 "derbyniwr At: neu CC:."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14644,7 +14401,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Diweddarwyd y Plygell(au) Chwilio."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14658,11 +14415,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Diweddarwyd y rheol(au)."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Rhaid i'r ffeil sgript fodoli, a bod yn weithredadwy."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14670,7 +14427,7 @@ msgstr ""
 "Gall fod y blygell wedi ei hychwanegu ymhlyg ag eraill.\n"
 "Ewch i'r golygydd Plygell Chwilio i'w hychwanegu'n benodol, os oes angen."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14678,12 +14435,12 @@ msgstr ""
 "Methu anfon y neges am nad yw'r cyfrif yr ydych am anfon drwyddo wedi ei "
 "alluogi"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Methu anfon y neges am nad ydych wedi penodi unrhyw un i'w dderbyn"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14691,11 +14448,11 @@ msgstr ""
 "Nid yw'r gweinydd yn cynnal y math hwn o ddilysiant ac mae'n bosib nad yw'n "
 "cynnal dilysiant o gwbl."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Mae'r llofnod wedi cael ei newid, ond mae heb gael ei arbed."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14703,11 +14460,11 @@ msgstr ""
 "Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u "
 "darllen."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Methwyd cysylltu â'r gweinydd GroupWise."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14715,41 +14472,41 @@ msgstr ""
 "Methu agor y blygell ddrafftiau ar gyfer y cyfrif. Defnyddio plygell "
 "ddrafftiau'r system yn lle hynny?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Methu darllen y ffeil drwydded."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Defnyddio'r _Rhagosodiad"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Defnyddio plygell ddrafftiau rhagosodedig?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Dydych chi ddim wedi rhoi'r holl wybodaeth angenrheidiol."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Mae gennych negeseuon heb eu hanfon, ydych chi am adael y rhaglen beth "
 "bynnag?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Fedrwch chi ddim creu dau gyfrif â'r un enw."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Rhaid i chi enwi'r Blygell Chwilio."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Rhaid i chi benodi plygell."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14759,98 +14516,94 @@ msgstr ""
 "naill ai wrth ddewis y plygellau'n unigol, ac/neu wrth ddewis bob plygell "
 "lleol, bob plygell pell, neu'r ddau."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Methodd y mewngofnodi i weinydd &quot;{0}&quot; fel &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Atodi"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Hepgor newidiadau"
 
 #: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "Peidio â Marcio Wedi'u Darllen"
-
-#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "_Chwynnu"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Agor Negeseuon"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Heb eu Gweld"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Wedi'u Gweld"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Atebwyd"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Amryw Negeseuon Heb eu Gweld"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Amryw Negeseuon"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Isaf"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Gostwng"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Uwch"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Uchaf"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Heddiw %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Ddoe %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:$M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Negeseuon"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Creu rhestr negeseuon"
 
@@ -14870,15 +14623,15 @@ msgstr "Fanerog"
 msgid "Follow Up Flag"
 msgstr "Dilyn Lan Baner"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Lleoliad Gwreiddiol"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Derbyniwyd"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Negeseuon Wedi'u Hanfon"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Maint"
@@ -15029,10 +14782,6 @@ msgid ""
 msgstr ""
 "_Creu cofnodion yn awtomatig yn y llyfr cyfeiriadau wrth ymateb i e-bost"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "Dewis llyfr cyfeiriadau ar gyfer Cysylltiadau Awtomatig"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "Cysylltiadau Negesu Sydyn"
@@ -15045,10 +14794,6 @@ msgstr ""
 "Cysoni bob hyn a hyn y wybodaeth am gysylltion a'u delweddau o restr "
 "ffrindiau gaim"
 
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "Dewis llyfr cyfeiriadau ar gyfer rhestr ffrindiau Gaim"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -15157,6 +14902,10 @@ msgstr ""
 "Ategyn prawf sy'n arddangos ategyn naidlen sy'n gadael i chi gopïo deunydd "
 "i'r clipfwrdd."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "_Copïo Cyfeiriad Ebost"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Arf copïo"
@@ -15271,7 +15020,7 @@ msgid "Change the password for Exchange account"
 msgstr "Newid y cyfrinair ar gyfer cyfrif Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Newid Cyfrinair"
 
@@ -15344,31 +15093,29 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Nid yw'r ddau gyfrinair yr un peth. Rhowch y cyfrineiriau eto."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "Cadarnhau Cyfrinair:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "Cyfrinair Presennol:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "Cyfrinair Newydd:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr "Mae'ch cyfrinair wedi dod i ben. Newidiwch eich cyfrinair nawr."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Mae'ch cyfrinair yn dod i ben o fewn %d dydd"
 
-#. 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
 msgid "Custom"
 msgstr "Addasedig"
 
@@ -15488,7 +15235,7 @@ msgstr "Enw Plygell"
 msgid "Folder Size"
 msgstr "Maint Plygell"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Tanysgrifio i Blygell Defnyddiwr Arall"
@@ -15503,14 +15250,14 @@ msgstr "Coeden Plygell Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Dad-danysgrifio Plygell..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Tanysgrifio go iawn o'r blygell \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Dad-danysgrifio o'r blygell \"%s\""
@@ -15543,66 +15290,62 @@ msgstr "Ychwanegu Defnyddiwr..."
 msgid "Add User"
 msgstr "Ychwanegu Defnyddiwr"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Caniatadau</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Methu Dileu"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Methu Golygu"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Creu eitemau"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Creu is-ffolderi"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Dileu Unrhyw Eitemau"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Dileu Eitemau fy Hun"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Golygu Unrhyw Eitem"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Golygu Eitemau fy Hun"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Cyswllt plygell"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Perchennog plygell"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Plygell yn weladwy"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Darllen eitemau"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Rôl:"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Na, Peidio â Newid Statws"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 msgid "Select User"
 msgstr "Dewis Defnyddiwr"
@@ -15640,26 +15383,22 @@ msgid "Cannot display folders."
 msgstr "Methu dangos plygellau."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Methu gwneud y weithred."
-
-#: ../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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Bydd y newidiadau i gyfluniad cyfrif Evolution \"{0}\" yn dod i rym wedi i "
-"chi adael ac ail-ddechrau Evolution."
+"Bydd y newidiadau i gyfluniad cyfrif Evolution yn dod i rym wedi i chi adael "
+"ac ail-ddechrau Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Methwyd dilysu gyda'r gweinydd."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Methu newid cyfrinair."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15669,55 +15408,55 @@ msgstr ""
 "yr enw defnyddiwr,\n"
 "a'r cyfrinair, cyn ail-geisio."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Methwyd cysylltu â'r gweinydd Exchange"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Methwyd cysylltu â'r gweinydd {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Methwyd pennu caniatadau plygellau ar gyfer y dirprwyon."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Methu dod o hyd i System Storfa Gwe Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Methu dod o hyd i'r gweinydd {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Methu gwneud {0} yn ddirprwy"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Methu darllen caniatadau'r blygell"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Methu darllen caniatadau'r blygell."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Methu darllen statws allan-o'r-swyddfa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Methu diweddaru caniatadau plygell."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Methu diweddaru statws allan-o'r-swyddfa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Cyfrif Exchange ddim ar-lein."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15746,32 +15485,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Methu diweddaru dirprwyon:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Plygell yn bodoli'n barod"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Plygell ddim yn bodoli"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Ffolder all-lein"
 
-#: ../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:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Gwall generig"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Global Catalog Server is not reachable"
-msgstr "Methu cyrraedd y gweinydd Catalog cyffredinol"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15779,71 +15514,67 @@ msgstr ""
 "Os yw OWA yn rhedeg ar lwybr gwahanol, rhaid i chi roi hynny yn y ddeialog "
 "cyflunio cyfrif."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Nid oes blwch e-bost ar gyfer {0} ar y gweinydd."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Gwnewch yn siŵr fod y LAU yn gywir, cyn ceisio eto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Gwnewch yn siŵr fod enw'r gweinydd wedi ei sillafu'n gywir cyn ceisio eto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Gwnewch yn siŵr fod enw'r defnyddiwr a'r cyfrinair wedi eu sillafu'n gywir "
 "cyn ceisio eto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 "Dim gweinydd Catalog cyffredinol wedi ei gyflunio ar gyfer y cyfrif hwn."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Dim blwch e-bost ar gyfer defnyddiwr {0} ar {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Dim defnyddiwr o'r enw {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Cyfrinair wedi ei newid yn llwyddiannus."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Sever name is correct."
-msgstr "Gwnewch yn siŵr fod enw'r gweinydd Catalog cyffredinol yn gywir."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Ail-gychwynnwch Evolution er mwyn i'r newidiadau ddod i rym"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Ail-gychwynnwch Evolution os gwelwch yn dda"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Dewiswch ddefnyddiwr:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Gweinydd wedi gwrthod y cyfrinair am ei fod yn rhy wan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Bydd y cyfrif Exchange yn cael ei analluogi wedi i chi adael Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Bydd y cyfrif Exchange yn cael ei dynnu wedi i chi adael Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Nid yw'r gweinydd Exchange yn cydweddu â Chysylltydd Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15851,7 +15582,7 @@ msgstr ""
 "Mae'r gweinydd yn rhedeg Exchange 5.5. Dim ond Microsoft \n"
 "Exchange 2000 a 2003 mae Cysylltydd Exchange yn eu cynnal."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15865,51 +15596,51 @@ msgstr ""
 "\n"
 "Neu gallech fod wedi cam-deipio'ch cyfrinair."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Ceisiwch eto gyda chyfrinair gwahanol."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Methu ychwanegu defnyddiwr at y rhestr rheoli mynediad:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Methu golygu dirprwyon."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Gwall anhysbys wrth edrych {0} i fyny"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Gwall anhysbys."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Math anhysbys"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Gweithred heb ei chynnal"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Rydych yn agos at eich cwota o le i storio e-bost ar y gweinydd hwn."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Fedrwch chi ddim gwneud eich hun yn ddirprwy ar gyfer eich hunan"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Rydych dros ben y cwota o le i storio e-bost ar y gweinydd hwn."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Fedrwch chi ond cyflunio un cyfrif Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15917,7 +15648,7 @@ msgstr ""
 "Eich defnydd ar hyn o bryd yw : {0} KB. Ceisiwch greu rhagor o le wrth "
 "ddileu rhai negeseuon."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -15925,7 +15656,7 @@ msgstr ""
 "Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon na derbyn e-"
 "bost nawr."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15933,19 +15664,19 @@ msgstr ""
 "Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon e-bost nes i "
 "chi greu rhagor o le wrth ddileu rhai negeseuon."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Mae'ch cyfrinair wedi dod i ben."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "Methu ychwanegu {0} at restr rheoli mynediad."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} yn ddirprwy'n barod"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} eisoes yn y rhestr"
 
@@ -15972,17 +15703,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Dad-danysgrifio Plygellau"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "_Dad-danysgrifio"
-
-#: ../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
-msgid "Notes"
-msgstr "Nodiadau"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Rhestr wirio"
 
@@ -16027,21 +15748,13 @@ msgstr "_Galluogi"
 msgid "_Junk List"
 msgstr "_Rhestr Sothach"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
-msgid "Message retracted successfully"
-msgstr "Neges wedi ei dynnu'n ôl yn llwyddiannus"
-
-#: ../plugins/groupwise-features/mail-retract.c:60
-msgid "Retract Mail"
-msgstr "Tynnu Ebost yn Ôl"
-
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Ychwanegu Opsiynau Anfon at negeseuon 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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Opsiynau Anfon"
 
@@ -16057,40 +15770,40 @@ msgstr "Nodweddion Groupwise"
 msgid "Accept Tentatively"
 msgstr "Derbyn yn Betrus"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>Defnyddwyr :</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Neges"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Hysbysiad Plygell wedi Rhannu"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Bydd y mynychwyr yn derbyn y wybodaeth ganlynol.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Cysylltiadau..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_Addasu neges hysbysu"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Heb ei Rannu"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Rhennir Gyda..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Yn Rhannu"
 
@@ -16159,10 +15872,7 @@ msgstr "Mewngofnodi Dirprwy"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sRhowch gyfrinair am %s (defnyddiwr %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:505
 msgid "_Proxy Login..."
 msgstr "_Mewngofnodi Dirprwy..."
 
@@ -16223,18 +15933,18 @@ msgid "Select Calendar"
 msgstr "Dewis Calendr"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Mewnforio"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Ffurf iCalendr (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
 msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Cysoni'r dasg/calendr/llyfr cyfeiriadau a ddewiswyd gydag iPod Apple"
+msgstr "Cysoni'r dasg/calendr/llyfr cyfeiriadau a ddewiswyd gyda iPod Apple"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -16281,102 +15991,102 @@ msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr ""
 "Methu agor rhestr calendr/tasgau i'w gwneud Evolution er mwyn allforio data."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Methu llwytho'r calendr '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Mae apwyntiad yn y calendr '%s' yn gwrthdaro â'r cyfarfod hwn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Wedi canfod yr apwyntiad yn y calendr '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Methu canfod unrhyw galendr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Methu canfod y cyfarfod hwn mewn unrhyw galendr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Methu canfod y dasg hon mewn unrhyw restr dasgau"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Methu canfod y cofnod dyddlyfr hwn mewn unrhyw ddyddlyfr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Chwilio am fersiwn o'r apwyntiad sy'n bodoli'n barod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Methu gramadegu eitem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Methu anfon eitem i galendr '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Anfonwyd at galendr '%s' fel eitem wedi'i derbyn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Anfonwyd at galendr '%s' fel eitem wedi'i derbyn yn betrus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Anfonwyd at galendr '%s' fel eitem wedi'i gwrthod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Anfonwyd at galendr '%s' fel eitem wedi'i chanslo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Trefnydd wedi tynnu'r dirprwy %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Wedi anfon neges ganslo at y mynychwr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Methu anfon y neges ganslo at y mynychwr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Methwyd diweddaru cyflwr mynychwr am fod y statws yn annilys"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Methu diweddaru mynychwr. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Statws mynychwr wedi diweddaru"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Mae'r calendr sydd wedi'i atodi yn annilys"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16384,15 +16094,15 @@ msgstr ""
 "Mae'r neges yn honni ei bod yn cynnwys calendr, ond nid yw'r calendr yn "
 "iCalendar dilys."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Nid yw'r eitem yn y calendr yn ddilys"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16400,11 +16110,11 @@ msgstr ""
 "Mae'r neges yn cynnwys calendr, ond nid yw'r calendr yn cynnwys unrhyw "
 "ddigwyddiadau, tasgau na gwybodaeth statws rhydd/prysur"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Mae'r calendr sydd wedi ei atodi yn cynnwys amryw eitemau"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16412,273 +16122,273 @@ msgstr "I brosesu'r holl eitemau, dylid cadw'r ffeil a mewnforio'r calendr"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Dileu'r neges ar ôl gweithredu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Chwilio am Wrthdaro"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Dewis y calendrau i'w chwilio ar gyfer cyfarfodydd sy'n gwrthdaro"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Heddiw"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Heddiw %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "Heddiw %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:202
 msgid "Today %l:%M:%S %p"
 msgstr "Heddiw %I:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Yfory"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Yfory %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %H:%M:%S"
 msgstr "Yfory %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "Yfory %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Yfory %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "Mae <b>%s</b>, trwy %s wedi cyhoeddi'r wybodaeth cyfarfod ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "Mae <b>%s</b> wedi cyhoeddi'r wybodaeth cyfarfod ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "Mae <b>%s</b> wedi dirprwyo'r cyfarfod canlynol atoch chi:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "Mae <b>%s</b>, trwy %s am i chi fod yn bresennol yn y cyfarfod canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "Mae <b>%s</b> am i chi fod yn bresennol yn y cyfarfod canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "Mae <b>%s</b>, trwy %s am ychwanegu at gyfarfod sydd eisoes yn bodoli:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "Mae <b>%s</b> am ychwanegu at neges sy'n bodoli'n barod:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y cyfarfod canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "Mae <b>%s</b> wedi anfon yr ymateb canlynol yn ôl ynghylch cyfarfod:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "Mae <b>%s</b> drwy %s wedi canslo'r cyfarfod canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "Mae <b>%s</b> wedi canslo'r cyfarfod canlynol."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "Mae <b>%s</b> wedi awgrymu'r newidiadau cyfarfod canlynol."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "Mae <b>%s</b>, trwy %s wedi gwrthod y newidiadau canlynol i'r cyfarfod:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "Mae <b>%s</b> wedi gwrthod y newidiadau cyfarfod canlynol."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "Mae <b>%s</b> drwy %s wedi cyhoeddi'r dasg ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "Mae <b>%s</b> wedi cyhoeddi'r dasg ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "Mae <b>%s</b> am i %s gael ei neilltuo i'r dasg ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "Mae <b>%s</b> drwy %s wedi neilltuo tasg i chi:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "Mae <b>%s</b> wedi neilltuo tasg newydd i chi:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "Mae <b>%s</b>, trwy %s am ychwanegu at dasg sydd eisoes yn bodoli:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "Mae <b>%s</b> am ychwanegu at dasg sy'n bodoli'n barod:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -16687,155 +16397,117 @@ msgstr ""
 "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd "
 "wedi ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 "Mae <b>%s</b> wedi anfon yn ôl yr ateb canlynol i dasg gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "Mae <b>%s</b> drwy %s wedi diddymu'r dasg ganlynol gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "Mae <b>%s</b> wedi canslo'r dasg hon, gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "Mae <b>%s</b> yn cynnig y newidiadau canlynol i dasgau gafodd eu neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 "Mae <b>%s</b>, drwy %s, wedi gwrthod y dasg ganlynol gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "Mae <b>%s</b> wedi gwrthod y dasg hon, gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "Mae <b>%s</b> drwy %s wedi cyhoeddi'r memo canlynol:"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "Mae <b>%s</b> wedi cyhoeddi'r memo canlynol:"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "Mae <b>%s</b>, trwy %s am ychwanegu at femo sydd eisoes yn bodoli:"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "Mae <b>%s</b> am ychwanegu at femo sy'n bodoli'n barod:"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "Mae <b>%s</b> drwy %s wedi canslo'r memo canlynol oedd wedi'i rannu:"
-
-#: ../plugins/itip-formatter/itip-view.c:497
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "Mae <b>%s</b> wedi canslo'r memo hwn oedd wedi'i rannu:"
-
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "_Agor calendr"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "_Gwrthod"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "_Derbyn"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "Gwrthod y _cyfan"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "_Gwrthod"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "_Pawb, I'w gadarnhau"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "_I'w gadarnhau"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "Derbyn y _cyfan"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "Anfon _Gwybodaeth"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "_Diweddaru cyflwr mynychwr"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "_Diweddaru"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Amser cychwyn:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Amser gorffen:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Sylw:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Anfon _diweddariadau at y mynychwyr"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "_Defnyddio ym mhob achos"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "_Tasgau :"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "Memos :"
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "Dangos rhannau testun/calendr o fewn negeseuon."
@@ -16847,10 +16519,10 @@ msgstr "Fformatydd Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
-"Mae &quot;{0}&quot; wedi dirprwyo'r cyfarfod. Ydych chi am ychwanegu'r "
-"dirprwy &quot;{1}&quot;?"
+"&quot;{0}&quot; wedi dirprwyo'r cyfarfod. Ydych chi am ychwanegu'r dirprwy "
+"&quot;{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16936,14 +16608,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Cysylltu â _pherchennog y rhestr"
 
 #: ../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 "Cyrchu _archif y rhestr"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Cyrchu gwybodaeth am _ddefnydd y rhestr"
 
@@ -16965,14 +16640,17 @@ msgstr ""
 "danysgrifio, ...)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Postio neges i'r rhestr"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Tanysgrifio â'r rhestr"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Dad-danysgrifio o'r rhestr"
 
@@ -17055,27 +16733,15 @@ msgstr "_Golygu neges"
 msgid "_Send message"
 msgstr "_Anfon neges"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Cysylltu â _pherchennog y rhestr"
-
 #: ../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 "Cysylltu â pherchennog y rhestr trafod mae'r neges hon yn perthyn iddi"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Cyrchu _archif y rhestr"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Cyrchu gwybodaeth am _ddefnydd y rhestr"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Cael archif rhestr y neges"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Cael gwybodaeth ynghylch defnydd rhestr y neges"
 
@@ -17091,24 +16757,12 @@ msgstr "Tanysgrifio â'r rhestr trafod mae'r neges hon yn perthyn iddi"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Dad-danysgrifio o'r rhestr trafod mae'r neges hon yn perthyn iddi"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Postio neges i'r rhestr"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Tanysgrifio â'r rhestr"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "Dad-danysgrifio o'r rhestr"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Marcio'r Cyfan Wedi Darllen"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Marcio n_egeseuon fel rhai wedi eu darllen"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -17370,16 +17024,16 @@ msgstr "Cadw Atodiadau..."
 msgid "Save all attachments"
 msgstr "Cadw pob atodiad"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Dewiswch enw bôn cadw"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Math MIME"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Cadw"
 
@@ -17489,7 +17143,7 @@ msgid "RDF format (.rdf)"
 msgstr "Ffurf RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Dewiswch ffeil gyrchfan"
 
@@ -17537,19 +17191,19 @@ msgstr ""
 "\n"
 "Cliciwch y botwm \"Ymlaen\" i barhau."
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Dewiswch y wybodaeth hoffech chi ei fewnforio:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Oddi wrth %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Mewnforio data."
 
@@ -17606,7 +17260,7 @@ msgstr "Uchder rhagosodedig ffenest"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window state"
-msgstr "Cyflwr rhagosodedig ffenest"
+msgstr "Cyflwr rhagosodedig y ffenestr"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
@@ -17639,15 +17293,11 @@ msgstr "Bar ochr yn weladwy"
 msgid "Skip development warning dialog"
 msgstr "Hepgor deialog rhybudd datblygiad"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Dechreuwch ym modd all-lein"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Bar statws yn weladwy"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17655,19 +17305,19 @@ msgstr ""
 "Fersiwn cyfluniad Evolution, gyda lefel pennaf/lleiaf/cyfluniad (er "
 "enghraifft \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Uchder rhagosodedig y brif ffenestr, mewn picseli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Lled rhagosodedig y brif ffenestr, mewn picseli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Lled rhagosodedig y bar ochr, mewn picseli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17675,7 +17325,7 @@ msgstr ""
 "Fersiwn Evolution pryd gafodd y cyfluniad ei ddiweddaru diwethaf, gyda lefel "
 "pennaf/lleiaf/cyfluniad (er enghraifft \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17685,46 +17335,42 @@ msgstr ""
 "\"bar offer\". Os mai \"bar offer\" sydd wedi ei osod, gosodiadau bar offer "
 "GNOME sy'n penderfynu arddull y botymau."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Bar offer yn weladwy"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "A fydd Evolution yn cychwyn yn y modd all-lein yn lle'r modd ar-lein."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "A ddylid mwyhau'r ffenestr ai peidio."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "A ddylai'r bar ochr fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "A ddylai'r bar statws fod yn weladwy."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "A ddylai'r bar offer fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "A fydd y ddeialog rhybudd mewn fersiynau datblygu o Evolution yn cael ei "
 "hepgor."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "A ddylai botymau ffenestri fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Arddull botwm ffenest"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Botymau ffenestri yn weladwy"
 
@@ -17745,11 +17391,11 @@ msgstr "Cliciwch Iawn er mwyn cau'r cysylltiadau yma a mynd all-lein"
 msgid "(Untitled)"
 msgstr "(Heb Deitl)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Dewiswch pa fath o fewnforiwr i'w redeg:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17763,11 +17409,11 @@ msgstr ""
 "Gallwch chi ddewis \"Awtomatig\" os nad ydych chi'n gwybod, ac fe fydd "
 "Evolution yn ceisio ei ddatrys."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Dewiswch y gyrchfan ar gyfer y mewnforio"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17779,23 +17425,23 @@ msgstr ""
 "ddarganfuwyd unrhyw osodiadau i'w mewnforio. Os hoffech\n"
 "geisio eto, cliciwch y botwm \"Yn ôl\".\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Enw ffeil:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Dewis ffeil"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Math o ffeil:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Mewnforio data a gosodiadau o _raglenni hŷn"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Mewnforio _ffeil unigol"
 
@@ -17856,7 +17502,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "_Gweithio Ar-lein"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Gweithio All-lein"
 
@@ -17883,40 +17529,35 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Newid i %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Gwall system anhysbys."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "Iawn"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Argiau annilys"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Methu cofrestru ar OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Cronfa Ddata Cyfluniad heb ei ganfod"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Newydd"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr "Newydd"
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Prawf Newydd"
@@ -17968,7 +17609,7 @@ msgstr ""
 "fewnforio ffeiliau allanol i mewn i Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18003,7 +17644,7 @@ msgstr ""
 "Gobeithiwn y byddwch yn mwynhau ffrwyth ein llafur caled, ac edrychwn\n"
 "ymlaen yn eiddgar at dderbyn eich cyfraniadau!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18011,39 +17652,35 @@ msgstr ""
 "Diolch\n"
 "Y Tîm Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Peidiwch â dweud wrthyf eto"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Dechrau Evolution gan ymgychwyn y gydran benodol"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Dechreuwch ym modd ar-lein"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Gorfodi pob cydran Evolution i gau i lawr"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Gorfodi ail-fudo o Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Anfon allbwn datnamu bob cydran at ffeil."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Analluogi llwytho unrhyw ategyn."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolution, y Cleient Ebost a Threfnydd Gwybodaeth Bersonol"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18474,7 +18111,7 @@ msgid "_Edit CA Trust"
 msgstr "_Golygu Ymddiriedaeth 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:664
 msgid "Certificate already exists"
 msgstr "Tystysgrif yn bodoli'n barod"
 
@@ -18706,12 +18343,6 @@ msgstr "_Copïo Pob Cyswllt i..."
 msgid "Contact _Preview"
 msgstr "_Rhagolwg Cyswllt"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copïo"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Copïo'r Cyswllt/Cysylltiadau a ddewiswyd i Blygell Arall..."
@@ -18808,12 +18439,12 @@ msgstr "Cadw ar ffurf VCard y cysylltiadau sydd wedi eu dewis."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Cadw ar ffurf VCard y cysylltiadau o fewn y blygell a ddewiswyd"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Dewis Popeth"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Dewis _Popeth"
@@ -18883,7 +18514,7 @@ msgstr "_Symud Cyswllt i..."
 msgid "_Move Folder Contacts To"
 msgstr "_Symud Cysylltiadau'r Blygell i"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Newydd"
 
@@ -18944,7 +18575,6 @@ msgid "Month"
 msgstr "Mis"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Nesaf"
 
@@ -18953,7 +18583,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Rhagolygu'r calendr i'w argraffu"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Blaenorol"
 
@@ -19041,11 +18671,11 @@ msgstr "Torri'r hyn a ddewiswyd i'r clipfwrdd"
 msgid "Paste from clipboard"
 msgstr "Gludo o'r clipfwrdd"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Gludo'r testun sydd ar y clipfwrdd"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Dewis y holl destun"
 
@@ -19080,31 +18710,30 @@ msgstr "Cliciwch yma i weld yr help sydd ar gael"
 msgid "Close"
 msgstr "Cau"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Mewnosod"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Atodiad..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Cau"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Ffeil"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Cymorth"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Mewnosod"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Opsiynau"
@@ -19202,11 +18831,6 @@ msgstr "Toglu p'un ai i ddangos yr amser yn brysur"
 msgid "_Alarms"
 msgstr "_Larymau"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorïau"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19272,74 +18896,54 @@ msgid "F_older"
 msgstr "_Plygell"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "_Rhagolwg Neges"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Symud y blygell a ddewiswyd i blygell arall"
 
 #. 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 ""
 "Tynnu'n barhaol, o bob plygell, pob neges sydd wedi marcio wedi'i ddileu"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Chwilio _Plygellau"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Dangos _Rhagolwg Neges"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Dangos rhagolwg neges ochr-yn-ochr â'r rhestr negeseuon"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Dangos ffenest rhagolwg neges"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tanysgrifio neu dad-danysgrifio o blygellau ar weinyddion pell"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Golwg Glasurol"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Copïo Plygell i..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "_Hidlyddion Negeseuon"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Symud Plygell i..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Rhagolwg"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Tanysgrifiadau"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "Golwg _Fertigol"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Newid enw'r blygell"
@@ -19903,10 +19507,6 @@ msgid "_Unread"
 msgstr "_Heb Ddarllen"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Chwyddo"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Chwyddo"
 
@@ -19914,7 +19514,7 @@ msgstr "_Chwyddo"
 msgid "Close this window"
 msgstr "_Cau'r ffenestr hon"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Bar offer"
 
@@ -19989,6 +19589,11 @@ msgstr "Cael hysbysiad pan fo'ch neges yn cael ei darllen"
 msgid "HT_ML"
 msgstr "_HTML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Mewnosod"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Agor ffeil"
@@ -20096,7 +19701,7 @@ msgstr " Toglu a yw'r maes 'Ateb i' wedi ei ddangos"
 
 #: ../ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the To field is displayed"
-msgstr "Toglu a yw'r maes 'At' wedi ei ddangos"
+msgstr "Toglu a yw'r maes 'I' wedi ei ddangos"
 
 #: ../ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
@@ -20136,7 +19741,7 @@ msgstr "_Diogelwch"
 
 #: ../ui/evolution-message-composer.xml.h:55
 msgid "_To Field"
-msgstr "Maes _At"
+msgstr "Maes _I"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
@@ -20321,51 +19926,43 @@ msgstr "Eiconau _a thestun"
 msgid "Import data from other programs"
 msgstr "Mewnforio data o raglenni eraill"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "_Cynllun"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "_Ffenestr Newydd"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "H_offterau"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Anfon / Derbyn"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Anfon / _Derbyn"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Anfon yr eitemau sydd yn y ciw, a galw am eitemau newydd"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Gosod cyfluniad _Peilot"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Dangos gwybodaeth ynghylch Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Dangos _Bar Ochr"
+msgid "Side _Bar"
+msgstr "_Bar Ochr"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Dangos Bar _Statws"
+msgid "Status _Bar"
+msgstr "_Bar Statws"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Dangos _Bar Offer"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Dangos gwybodaeth ynghylch Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Anfon Adroddiad Nam"
 
@@ -20373,71 +19970,75 @@ msgstr "Anfon Adroddiad Nam"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Anfon Adroddiad _Nam"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Cyflwyno adroddiad nam defnyddio Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Toglu a ydyn ni'n gweithio all-lein."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "_Bar offer"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "_Arddull bar offer"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Cuddio/Gweld y Bar Ochr"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Cuddio/Gweld y Bar Statws"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Ynghylch"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Cau Ffenestr"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Anghofio _Cyfrineiriau"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Cuddio botymau"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "_Eiconau'n unig"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "Cyfeiriad _Cyflym"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Gadael"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Ymddangosiad y Newidydd"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_Opsiynau Cysoni..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "_Testun yn unig"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Ffenestr"
 
@@ -20474,34 +20075,26 @@ msgid "_Work Week View"
 msgstr "Golwg _Wythnos Waith"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Fel Plygell _Anfonwyd yn yr Olwg _Lydan"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Fel Plygell _Anfonwyd"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Ar Sail _Statws"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Ar Sail _Danfonwr"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Ar Sail _Pwnc"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Ar Sail Baner _Dilyn i Fyny"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Yn yr _Olwg Lydan"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Negeseuon"
 
@@ -20517,32 +20110,28 @@ msgstr "Gyda _Dyddiad Dod i Ben"
 msgid "With _Status"
 msgstr "Gyda _Statws"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Parthau Amser</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Dewis</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Dewiswch Gylchfa Amser"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "Blwch combo cylchfa amser"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20550,7 +20139,7 @@ msgid ""
 msgstr ""
 "Defnyddiwch fotwm chwith y llygoden i chwyddo un ardal o'r map a dewis "
 "cylchfa amser.\n"
-"Defnyddiwch fotwm de'r llygoden i grebachu."
+"Defnyddiwch fotwm dde'r llygoden i grebachu."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:188
@@ -20578,7 +20167,7 @@ msgid "_Edit..."
 msgstr "_Golygu..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20592,11 +20181,11 @@ msgstr "Enghraifft"
 msgid "Save Current View"
 msgstr "Cadw'r olwg Gyfredol"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "_Creu golwg newydd"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Disodli'r olwg bresennol"
 
@@ -20631,22 +20220,18 @@ msgstr "Ffatri"
 msgid "Define New View"
 msgstr "Diffinio Golwg Newydd"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "Enw golwg newydd:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "Math o olwg"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 msgstr "Math o olwg:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Awgrymu dangos atodiadau'n awtomatig"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: ../widgets/misc/e-calendar-item.c:416
@@ -20655,7 +20240,6 @@ msgstr "LMMIGSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1093
-#: ../widgets/misc/e-calendar-item.c:1746
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20665,8 +20249,8 @@ msgstr "Calendr Mis"
 
 #: ../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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Lliw llenwi"
 
@@ -20675,16 +20259,16 @@ msgstr "Lliw llenwi"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "Lliw llenwi 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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Llenwi dotwaith"
 
@@ -20723,11 +20307,11 @@ msgid "Minimum Width"
 msgstr "Lleiafswm Lled"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Nawr"
 
@@ -20855,41 +20439,33 @@ msgstr "Blwch combo i ddewis amser"
 msgid "Time"
 msgstr "Amser"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "_Nawr"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Heddiw"
-
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Ehangwyd"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "A yw'r chwyddwr wedi ei chwyddo ai peidio"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Testun label yr ehangydd"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Defnyddio tanlinellu"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20897,89 +20473,73 @@ msgstr ""
 "A ddylid defnyddio tanlinellu yn y testun er mwyn dynodi y dylid defnyddio'r "
 "nod nesaf fel coflythyren bysell cyflymu"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Y gofod i'w roi rhwng y label a'r plentyn"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Teclyn label"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Teclyn i'w ddangos yn lle label arferol y chwyddwr"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Maint Ehangwr"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Maint y saeth ehangu"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Bylchiad Dangosydd"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Y gofod o amgylch y saeth chwyddo"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Chwilio Uwch"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Cadw Chwiliad"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Chwiliadau"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Chwiliadau"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Cadw Chwiliad"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Cadw Chwiliad..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Golygu Chwiliadau wedi'u Harbed..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Chwilio Uwch..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Pob Cyfrif"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Cyfrif Presennol"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Plygell Bresennol"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Neges Bresennol"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Dewiswch Ddelwedd"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Map y Byd"
 
-#: ../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."
@@ -21012,45 +20572,45 @@ msgstr "Ail-redeg model"
 msgid "Column width"
 msgstr "Lled colofn"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Chwilio"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Chwilio"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Canfod Nawr"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Clirio"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Math Chwilio"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID Eitem"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "ID Is-eitem"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Testun"
 
-#. 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:911
-msgid "Show: "
-msgstr "Dangos:"
-
-#. 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:927
-msgid "Sear_ch: "
-msgstr "_Chwilio:"
-
-#. 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:939
-msgid " i_n "
-msgstr "o _fewn"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Chwilio _Nawr"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -21099,8 +20659,8 @@ msgid "A_uto-delete sent item"
 msgstr "_Awto-ddileu eitem anfonwyd"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Dosbarthiad"
+msgid "C_lassification"
+msgstr "_Dosbarthiad"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -21124,29 +20684,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"Arferol\n"
-"Masnachol\n"
-"Cyfyngedig\n"
+"Cyhoeddus\n"
+"Preifat\n"
 "Cyfrinachol\n"
-"Tra Chyfrinachol\n"
-"I'ch Llygaid Chi'n Unig"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "Mae cais am _ymateb"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "Dilyn _Statws"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -21158,51 +20712,51 @@ msgstr ""
 "Arferol\n"
 "Isel"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Ar ôl _derbyn:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "_Ar ôl gorffen:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Ar ôl _gwrthod:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "O _fewn"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Wedi:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Pob gwybodaeth"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Oedi anfon neges"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Wedi'i drosglwyddo"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "Gosod dyddiad _dod i ben"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Tan:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Pan yn gyfleus"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "Ar ôl _agor:"
 
@@ -21220,19 +20774,19 @@ msgstr "%s (%d%% yn gyflawn)"
 msgid "Click here to go to URL"
 msgstr "cliciwch yma i fynd i'r LAU"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "Golygu'r Rhestr Gategorïau Gyffredinol..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "Eitem(au) yn perthyn i'r _categorïau yma:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "Categorïau _Ar Gael:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "categorïau"
 
@@ -21256,23 +20810,23 @@ msgstr "Colofn Wedi Ffocysu"
 msgid "Unselected Column"
 msgstr "Colofn Wedi Dad-Ddewis"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Colofn Wedi Taro Drwyddi"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Colofn Wedi Tanlinellu"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Colofn Fras"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Lliw Colofn"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Colofn Lliw Cefndir"
 
@@ -21287,7 +20841,6 @@ msgstr "Meysydd ar _Gael:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Esgynnol"
 
@@ -21298,7 +20851,6 @@ msgstr "Clirio Pob Un"
 
 #: ../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 "Descending"
 msgstr "Disgynnol"
 
@@ -21396,14 +20948,14 @@ msgstr "_Dangos y meysydd yma yn y drefn:"
 #: ../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-header-item.c:1805
 msgid "DnD code"
 msgstr "Cod llusgo-a-gollwng"
 
 #: ../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-header-item.c:1819
 msgid "Full Header"
 msgstr "Pennawd Llawn"
 
@@ -21423,21 +20975,25 @@ msgstr ""
 "I ychwanegu colofn at eich tabl, llusgwch hi i'r\n"
 "man yr ydych am iddi ymddangos."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d eitem)"
-msgstr[1] "%s : %s (%d eitem)"
-msgstr[2] "%s : %s (%d eitem)"
+msgstr "%s : %s (%d eitem)"
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s: %s (%d eitem)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d eitem)"
-msgstr[1] "%s (%d eitem)"
-msgstr[2] "%s (%d eitem)"
+msgstr "%s (%d eitem)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d eitem)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21517,69 +21073,65 @@ msgstr "Uchder cyson rhesi"
 msgid "Frozen"
 msgstr "Wedi rhewi"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Addasu'r Olwg Bresennol"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Trefnu'n Esgynnol"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Trefnu'n Ddisgynnol"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Dad-drefnu"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Grwpio wrth y Maes Hwn"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Grwpio Wrth Focs"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Tynnu'r Golofn"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Ychwanegu Colofn..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Ffit Orau"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Fformatio Colofnau..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Addasu'r Olwg Gyfredol..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Trefnu Fesul"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Set Ffontiau"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Manylion Trefnu"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21631,7 +21183,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Fe ddylai hyn brofi digwyddiad mini-gerdyn y cynfas"
 
 #: ../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:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Prosesydd Digwyddiadau"
 
@@ -21644,57 +21196,57 @@ msgid "GDKFont"
 msgstr "FfontGDK"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Unioniad"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Defnyddio marc colli geiriau"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Coll geiriau"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Amlapio llinell"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Torri nodau"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Uchafswm llinellau"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Caniatáu llinellau newydd"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Tynnu borderi"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Tynnu cefndir"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Tynnu botwm"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Man y cyrchwr"
 
@@ -21702,159 +21254,62 @@ msgstr "Man y cyrchwr"
 msgid "Emulate label resize"
 msgstr "Efelychu ail-seisio labeli"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Dulliau Mewnbwn"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Bras"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Llinell Drwodd"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Angor"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Lled Clip"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Uchder Clip"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Llenwi petryal clip"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "Atred X"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Atred Y"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Lled testun"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Uchder testun"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "Cyd-destun IM"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Deliwr Naidlen"
 
-#~ msgid "Memo:"
-#~ msgstr "Memo:"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Tanysgrifio"
-
-#~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "_Marcio bob neges yn y blygell a ddewiswyd fel rhai wedi eu darllen"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Category is"
-#~ msgstr "Categori yw"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Cynadledda Fideo"
-
-#~ msgid "work"
-#~ msgstr "gwaith"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "personal"
-#~ msgstr "personol"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "Calendr darllen-yn-unig yw'r un rydych chi wedi ei ddewis"
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "_Calendr:"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "_Lleoliad:"
-
-#~ msgid "Dele_gatees"
-#~ msgstr "_Cynrychiolwyr"
-
-#~ msgid "From:"
-#~ msgstr "Oddi wrth:"
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "date-end"
-#~ msgstr "dyddiad-diwedd"
-
-#~ msgid "date-start"
-#~ msgstr "dyddiad-dechrau"
-
-#~ msgid "Properties..."
-#~ msgstr "Priodweddau..."
-
-#~ msgid "_Memo"
-#~ msgstr "_Memo"
-
-#~ msgid "      "
-#~ msgstr "      "
-
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Methu creu ffeil allbwn: %s\n"
-#~ " %s"
-
-#~ msgid "Original Location"
-#~ msgstr "Lleoliad Gwreiddiol"
-
-#~ msgid "Search Type"
-#~ msgstr "Math Chwilio"
-
-#~ msgid "Subitem ID"
-#~ msgstr "ID Is-eitem"
-
-#~ msgid "Find _Now"
-#~ msgstr "Chwilio _Nawr"
-
-#~ msgid "C_lassification"
-#~ msgstr "_Dosbarthiad"
-
-#~ msgid ""
-#~ "Public\n"
-#~ "Private\n"
-#~ "Confidential\n"
-#~ msgstr ""
-#~ "Cyhoeddus\n"
-#~ "Preifat\n"
-#~ "Cyfrinachol\n"
-
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s: %s (%d eitem)"
-
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d eitem)"
-
 #~ msgid "(%ld seconds)"
 #~ msgstr "(%ld eiliad)"
 
@@ -21899,9 +21354,6 @@ msgstr "Deliwr Naidlen"
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "Cafodd eich neges â'r pwnc &quot;{0}&quot; mo'i ddosbarthu."
 
-#~ msgid "_Insert"
-#~ msgstr "_Mewnosod"
-
 #~ msgid "Message _List As"
 #~ msgstr "Rhestr Negeseuon _Fel"
 
@@ -21974,6 +21426,9 @@ msgstr "Deliwr Naidlen"
 #~ msgid "Attachment Button"
 #~ msgstr "Botwm atodiad"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Toglu'r Bar Atodiadau"
+
 #~ msgid "Filters"
 #~ msgstr "Hidlyddion"
 
diff --git a/po/de.po b/po/de.po
index 1c1fb40e77..6398e08b51 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,13 +13,12 @@
 # cc = Kopie
 # bcc = Blindkopie
 # 
-#: ../mail/em-format-html-display.c:680
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-17 14:48+0200\n"
-"PO-Revision-Date: 2006-07-17 15:04+0200\n"
+"POT-Creation-Date: 2006-05-01 18:03+0200\n"
+"PO-Revision-Date: 2006-07-17 15:01+0200\n"
 "Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +28,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "Evolution-Adressbuch"
 
@@ -43,10 +42,10 @@ msgstr "Neuer Kontakt"
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
-#, fuzzy, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
+#: ../a11y/addressbook/ea-minicard-view.c:152
+#, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "Angezeigter Adressbuchordner enthält %d Karte"
 msgstr[1] "Angezeigter Adressbuchordner enthält %d Karten"
 
@@ -67,32 +66,32 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "Evolution-Minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Es enthält Alarme."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Es enthält Wiederholungen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Es ist eine Besprechung."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalender-Ereignis: Die Zusammenfassung lautet %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Kalender-Ereignis: Keine Zusammenfassung verfügbar."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Erhält Fokus"
 
@@ -121,47 +120,37 @@ msgstr "Gehe zu Datum"
 msgid "a table to view and select the current time range"
 msgstr "Eine Tabelle zur Ansicht und Auswahl der momentanen Zeitspanne"
 
-#. 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Sie enthält %d Ereignis."
 msgstr[1] "Sie enthält %d Ereignisse."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:152
 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Tagesansicht: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 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:191
 msgid "calendar view for one or more days"
 msgstr "Kalenderansicht für einen oder mehrere Tage"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:679
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -172,20 +161,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:190
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -193,10 +180,10 @@ msgstr "%a, %d. %Y"
 #: ../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:703
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/calendar-component.c:716
-#: ../calendar/gui/calendar-component.c:718
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -206,11 +193,9 @@ 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:220
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -340,16 +325,6 @@ msgstr "Vorgabe verwenden"
 msgid "Popup Menu"
 msgstr "Kontextmenü"
 
-#: ../a11y/widgets/ea-expander.c:40
-#, fuzzy
-msgid "Toggle Attachment Bar"
-msgstr "Anlagenleiste"
-
-#: ../a11y/widgets/ea-expander.c:50
-#, fuzzy
-msgid "activate"
-msgstr "Privat"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -531,7 +506,7 @@ msgstr ""
 "Ihre Kontakte für {0} sind nicht verfügbar, solange Evolution nicht neu "
 "gestartet wurde."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -544,7 +519,7 @@ msgid "_Discard"
 msgstr "_Verwerfen"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -584,9 +559,9 @@ msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:265 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -626,7 +601,7 @@ 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:141
 #: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:227
+#: ../calendar/gui/calendar-component.c:209
 #: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
@@ -643,11 +618,11 @@ msgstr "Auf diesem Computer"
 #: ../addressbook/gui/component/addressbook-component.c:149
 #: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/calendar-component.c:217
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Persönlich"
 
@@ -674,7 +649,7 @@ msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
@@ -690,73 +665,72 @@ msgstr "Ein neues Adressbuch anlegen"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Aktualisieren der Adressbucheinstellungen oder -ordner gescheitert."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Basis"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus kopieren"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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: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:2021
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allgemein"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
-msgstr "Migrationsvorgang …"
+msgstr "Migrationsvorgang..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "»%s« wird migriert:"
@@ -779,7 +753,7 @@ msgstr ""
 "Der Speicherort und die Hierarchie der Evolution-Kontaktordner hat sich seit "
 "Evolution 1.x verändert.\n"
 "\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1133
 msgid ""
@@ -789,7 +763,7 @@ msgid ""
 msgstr ""
 "Das Format der Mailinglisten-Kontakte hat sich geändert.\n"
 "\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1142
 msgid ""
@@ -799,7 +773,7 @@ msgid ""
 msgstr ""
 "Das Format der Telefonnummern hat sich teilweise geändert.\n"
 "\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
@@ -810,7 +784,7 @@ msgstr ""
 "Das Palm-Sync-changelog und die map-Dateien von Evolution haben sich "
 "geändert.\n"
 "\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Pilot-Sync-Daten …"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Pilot-Sync-Daten..."
 
 #: ../addressbook/gui/component/addressbook-view.c:434
 #: ../mail/em-folder-utils.c:503
@@ -832,35 +806,34 @@ msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 msgid "A Folder with this name already exists"
 msgstr "Ein Ordner mit diesem Namen existiert bereits"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Neues Adressbuch"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:556
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
-msgstr "Als VCard speichern …"
+msgstr "Als VCard speichern..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:557
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
-msgstr "Ei_genschaften …"
+msgstr "Ei_genschaften..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Kontaktquellenauswahl"
 
@@ -869,7 +842,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Der Zugriff auf den LDAP-Server erfolgt anonym"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
@@ -920,7 +893,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI des zuletzt im Namenswähler verwendeten Ordners."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste"
 
@@ -1201,8 +1174,8 @@ msgstr "An_meldemethode:"
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:163
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -1215,7 +1188,7 @@ msgid "_Search scope:"
 msgstr "_Suchbereich:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1248,15 +1221,17 @@ msgstr "Minuten"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h: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
@@ -1301,13 +1276,13 @@ msgstr "<b>Geschäftlich</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1316,13 +1291,13 @@ msgstr "Kontakt"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
-msgstr "_Voller Name …"
+msgstr "_Voller Name..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
@@ -1358,8 +1333,8 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Geschäftlich"
 
@@ -1381,16 +1356,15 @@ msgid "_Birthday:"
 msgstr "_Geburtstag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#, fuzzy
-msgid "_Categories..."
-msgstr "Ka_tegorien …"
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Kategorien"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1477,8 +1451,8 @@ msgid "_Zip/Postal Code:"
 msgstr "Postleit_zahl:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Adresse"
 
@@ -1486,15 +1460,15 @@ msgstr "Adresse"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2473,7 +2447,7 @@ msgstr "Simbabwe"
 #: ../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
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Name"
@@ -2484,7 +2458,7 @@ msgstr "AOL-Instant-Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2494,7 +2468,7 @@ msgstr "Yahoo-Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2503,7 +2477,7 @@ msgid "Service"
 msgstr "Dienst"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2525,17 +2499,17 @@ msgid "Other"
 msgstr "Weitere"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2564,21 +2538,20 @@ msgid "Changed"
 msgstr "Geändert"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2790
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
-#, fuzzy
-msgid "_No image"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
 msgstr "Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2586,31 +2559,15 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
-#, c-format
-msgid "'%s' has an invalid format"
-msgstr ""
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
-#, c-format
-msgid "%s'%s' has an invalid format"
-msgstr ""
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3119
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#, c-format
-msgid "%s'%s' is empty"
-msgstr ""
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3145
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
@@ -2618,12 +2575,11 @@ msgstr "Voll _bearbeiten"
 msgid "_Full name"
 msgstr "_Voller Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-#, fuzzy
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "E-_Mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "Adressbuch aus_wählen"
 
@@ -2631,7 +2587,7 @@ msgstr "Adressbuch aus_wählen"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontaktliste löschen wollen (%s)?"
@@ -2648,7 +2604,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diesen Kontakt löschen wollen (%s)?"
@@ -2759,7 +2715,6 @@ msgid "_IM Service:"
 msgstr "_IM-Dienst:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2775,7 +2730,7 @@ msgid "Add an email to the List"
 msgstr "Eine E-Mail-Adresse zur Liste hinzufügen"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
@@ -2809,24 +2764,24 @@ 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:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Buch"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Ist neue Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Mitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Kontaktlistenmitglieder"
 
@@ -2868,18 +2823,25 @@ msgstr ""
 "Der Namen oder die E-Mail-Adresse dieses Kontakts existiert\n"
 "bereits in diesem Ordner. Soll er dennoch hinzugefügt werden?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Kategorie ist"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Name beginnt mit"
@@ -2897,9 +2859,9 @@ msgstr[1] "%d Kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Abfrage"
 
@@ -2921,11 +2883,11 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Quelle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
@@ -2934,91 +2896,90 @@ msgstr "Quelle"
 msgid "Type"
 msgstr "Typ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
-msgstr "Als VCard speichern …"
+msgstr "Als VCard speichern..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
-msgstr "_Neuer Kontakt …"
+msgstr "_Neuer Kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
-msgstr "Neue Kontakt_liste …"
+msgstr "Neue Kontakt_liste..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
-msgstr "Als VCard _speichern …"
+msgstr "Als VCard _speichern..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "Kontakt weiter_leiten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "Kontakte weiter_leiten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "_Nachricht an Kontakte schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Drucken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
-msgstr "In Adressbuch _kopieren …"
+msgstr "In Adressbuch _kopieren..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
-msgstr "In Adressbuch _verschieben …"
+msgstr "In Adressbuch _verschieben..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:555
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3155 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "E_infügen"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
@@ -3056,7 +3017,7 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3068,7 +3029,7 @@ msgid "Company Phone"
 msgstr "Firmentelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-Mail"
@@ -3118,7 +3079,7 @@ msgid "Manager"
 msgstr "Vorgesetzter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -3127,7 +3088,7 @@ msgid "Nickname"
 msgstr "Spitzname"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Notiz"
 
@@ -3136,7 +3097,7 @@ msgid "Office"
 msgstr "Büro"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisation"
 
@@ -3255,7 +3216,7 @@ msgstr "Maximale Länge des Feldnamens"
 msgid "Column Width"
 msgstr "Spaltenbreite"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3269,7 +3230,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3283,7 +3244,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3293,7 +3254,7 @@ msgstr ""
 "\n"
 "Suche nach dem Kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3303,7 +3264,7 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden Einträge."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -3315,93 +3276,68 @@ msgstr "Gewählt"
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Link im Browser ö_ffnen"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "Link-Ziel _kopieren"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-#, fuzzy
-msgid "_Send New Message To ..."
-msgstr "Neue Nachricht _schicken an …"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "_E-Mail-Adresse kopieren"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(Karte)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "Karte"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Listenmitglieder"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-Mails"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#, fuzzy
-msgid "Video Chat"
-msgstr "_Video-Chat:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Videokonferenz"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "geschäftlich"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-#, fuzzy
-msgid "Home Page"
-msgstr "_Homepage:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-#, fuzzy
-msgid "Web Log"
-msgstr "_Weblog:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "privat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Tätigkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3432,7 +3368,7 @@ msgstr "Kein eigener Kontakt festgelegt"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
@@ -3457,7 +3393,7 @@ msgstr "Protokoll nicht unterstützt"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -3596,7 +3532,7 @@ msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen eines Kontakts"
 
@@ -3613,7 +3549,7 @@ msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
@@ -3635,7 +3571,7 @@ msgstr[1] ""
 "Wollen Sie wirklich all diese Kontakte anzeigen?"
 
 # CHECK der Kontakt -> diesen?
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3644,71 +3580,71 @@ msgstr ""
 "%s existiert bereits\n"
 "Soll er überschrieben werden?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 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:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Adressbuch auswählen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformationen für %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
-msgstr "Adressbuch wird abgefragt …"
+msgstr "Adressbuch wird abgefragt..."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
@@ -3742,7 +3678,7 @@ msgstr "GTK-Baumansicht"
 #: ../mail/importers/evolution-outlook-importer.c:264
 #: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
-msgstr "Importieren …"
+msgstr "Importieren..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:826
 msgid "Outlook CSV or Tab (.csv, .tab)"
@@ -3773,7 +3709,7 @@ msgstr "Evolution CSV- und Tab-Importeur"
 #: ../calendar/importers/icalendar-importer.c:312
 #: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
-msgstr "Importieren …"
+msgstr "Importieren ..."
 
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -3796,12 +3732,12 @@ msgstr "Evolution-VCard-Importeur"
 msgid "Print envelope"
 msgstr "Umschlag drucken"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Kontakt drucken"
 
@@ -3831,7 +3767,7 @@ msgstr "Abmessungen:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "_Schrift …"
+msgstr "_Schrift..."
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -3850,7 +3786,7 @@ msgstr "Format"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Kopfzeile"
@@ -3954,7 +3890,7 @@ msgstr "Schattierung"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -3983,7 +3919,7 @@ msgstr "Breite:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "_Schrift …"
+msgstr "_Schrift..."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
@@ -4192,17 +4128,14 @@ 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:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Sind Sie sicher, dass Sie diesen Journaleintrag löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 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:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe löschen wollen?"
 
@@ -4497,8 +4430,8 @@ msgstr "Mehrtägige Ereignisse aufteilen:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server konnte nicht gestartet werden"
 
@@ -4532,12 +4465,12 @@ 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:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1319
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalender"
 
@@ -4587,12 +4520,12 @@ msgid "Memos"
 msgstr "Notizen"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/exchange-operations/exchange-folder.c:592
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4612,13 +4545,13 @@ msgstr "_Aufgaben"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4630,7 +4563,7 @@ msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Anfangszeit"
 
@@ -4641,10 +4574,10 @@ msgstr "Termine"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Ort:"
 
@@ -4654,16 +4587,16 @@ msgstr "Schlummer_zeit:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
@@ -4675,31 +4608,32 @@ msgstr "_Schlummer"
 msgid "location of appointment"
 msgstr "Ort des Termins"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Keine Ortinformationen verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sie haben %d Alarme"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4712,7 +4646,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4729,7 +4663,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -4831,109 +4765,96 @@ msgid "Default reminder value"
 msgstr "Wert der Vorgabeerinnerung"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-#, fuzzy
-msgid "Event Gradient"
-msgstr "Ereignisinformationen"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Verfügbarkeits-Server-URLs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Vorlage-URL für Verfügbarkeitsdaten"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Erledigte Aufgaben verbergen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Einheit für das Verbergen von Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Wert für das Verbergen von Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Die Stunde im 24-Stunden-Format von 0 bis 23, an der ein Arbeitstag endet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Die Stunde im 24-Stunden-Format von 0 bis 23, an der ein Arbeitstag beginnt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "In der Tages- und Wochentagsansicht anzuzeigende Intervalle in Minuten."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Letzte Alarmzeit"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Liste der Server-URLs für die Veröffentlichung von "
 "Verfügbarkeitsinformationen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Marcus-Bains-Linie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farbe der Marcus-Bains-Linie - Tagesansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farbe der Marcus-Bains-Linie - Zeitleiste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Die Minute von 0 bis 59, zu der der Arbeitstag endet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Die Minute von 0 bis 59, zu der der Arbeitstag beginnt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste in der Monatsansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste in der Monatsansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Anzahl der Einheiten zur Festlegung einer Vorgabeerinnerung."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr ""
 "Anzahl der Einheiten zur Festlegung, wann Aufgaben verborgen werden sollen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Farbe überfälliger Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4942,7 +4863,7 @@ msgstr ""
 "Kalender und der Aufgabenliste in Pixel, wenn keine Monatsansicht "
 "eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4951,16 +4872,7 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn die "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-#, fuzzy
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Die Position der vertikalen Leiste zwischen den Karten- und Listenansichten "
-"und dem Vorschaufeld in Pixel."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4968,7 +4880,7 @@ msgstr ""
 "Die Position der vertikalen Schiebeleiste zwischen der Aufgabenliste und dem "
 "Aufgabenvorschaufeld in Pixel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4977,7 +4889,7 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn die "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4986,65 +4898,65 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn keine "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programme, die als Teil von Alarmen ausgeführt werden können."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Endzeiten von Terminen in Wochen- und Monatsansichten anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Kategoriefeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Alarmausgaben im Benachrichtigungsfeld anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../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.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Das Vorschaufeld anzeigen"
 
-#: ../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.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Das Vorschaufeld anzeigen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Zeitzonenfeld im Ereignis-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Typenfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Wochennummern im Datumsnavigator anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Farbe heute fälliger Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste in der Aufgabenansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5054,7 +4966,7 @@ msgstr ""
 "wird durch den Benutzerteil der E-Mail-Adresse und »%d« durch die Domain "
 "ersetzt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5062,61 +4974,55 @@ msgstr ""
 "Die Vorgabezeitzone zur Verwendung für Datum und Zeit im Kalender als "
 "unübersetzer Ort der Olsen-Zeitzonendatenbank, z.B. »Europe/Berlin«."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Zeiteinteilungen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 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.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24-Stunden-Zeitformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Einheit für eine Vorgabeerinnerung (»minutes«, »hours« oder »days«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einheit zur Festlegung, wann Aufgaben verborgen werden sollen (»minutes«, "
 "»hours« oder »days«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Wochenanfang"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 "Wochentag von Sonntag (»0«) bis Sonnabend (»6«), mit dem die Woche beginnt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Soll das Benachrichtigungsfeld für Alarmausgaben verwendet werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Soll beim Löschen von Terminen oder Aufgaben rückgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Soll beim Säubern von Terminen oder Aufgaben rückgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5124,100 +5030,92 @@ msgstr ""
 "Sollen Wochenenden in der Monatsansicht komprimiert werden, wobei die Tage "
 "Sonnabend und Sonntag im Raum eines einzelnen Wochentages enthalten sind?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Sollen die Endzeiten von Ereignissen in den Wochen- und Monatsansichten "
 "angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Soll eine Marcus-Bains-Linie (Linie auf der momentanen Zeit) im Kalender "
 "angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Soll eine Vorgabeerinnerung für Termine festgelegt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Soll das Kategoriefeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Soll das Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Soll das Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Sollen Zeiten im 24-Stunden- und nicht im »AM/PM«-Format angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Soll das Zeitzonenfeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Soll das Typenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Sollen die Wochennummern im Datumsnavigator angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "Arbeitstage"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Stunde, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minute, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Stunde, zu der der Arbeitstag beginnt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minute, zu der der Arbeitstag beginnt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr ""
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
@@ -5226,19 +5124,19 @@ msgstr "Zusammenfassung enthält"
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Ort enthält"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
@@ -5246,10 +5144,10 @@ msgid "Print"
 msgstr "Drucken"
 
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:727
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2099
-#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
@@ -5278,7 +5176,7 @@ msgstr "Ereignisse löschen älter als"
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "Tage"
 
@@ -5286,92 +5184,92 @@ msgstr "Tage"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:253
+#: ../calendar/gui/calendar-component.c:235
 #: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Im Web"
 
-#: ../calendar/gui/calendar-component.c:271 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:277
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Wetter"
 
-#: ../calendar/gui/calendar-component.c:554
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Auffrischen der Kalender gescheitert."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1139
 #, 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:1173
+#: ../calendar/gui/calendar-component.c:1152
 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:1294
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/calendar-component.c:1490
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1498
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1506
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1507
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:1514
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Ka_lender"
 
-#: ../calendar/gui/calendar-component.c:1515
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
@@ -5403,11 +5301,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:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "Alarm bearbeiten"
 
@@ -5523,26 +5421,54 @@ msgid "A_dd"
 msgstr "_Hinzufügen"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarme"
 
-#: ../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
-#, fuzzy
-msgid "_Suggest automatic display of attachment"
+#: ../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 "Automatische Anzeige der Anlage vorschlagen"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../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 "Eigenschaften der Anlage"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: ../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 "Dateiname:"
+
+#: ../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-Typ:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Ausgewählte Kalender für die Alarme"
 
@@ -5569,7 +5495,7 @@ msgstr ""
 "</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<b>Alarme</b>"
 
@@ -5578,7 +5504,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<b>Vorgabe-Verfügbarkeits-Server</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<b>Allgemein</b>"
@@ -5595,31 +5521,27 @@ msgstr "<b>Zeit</b>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<b>Arbeitswoche</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Tag _endet:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5629,13 +5551,13 @@ msgstr ""
 "Stunden\n"
 "Tage"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Montag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5653,197 +5575,188 @@ msgstr ""
 "Samstag\n"
 "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_So"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Kalender für Alarmbenachrichtigung auswählen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "Heute fällige _Aufgaben:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "D_o"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Vorlage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "W_oche beginnt am:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim _Löschen von Objekten rückfragen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_Fr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Mo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "_Überfällige Aufgaben:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "S_a"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Endzeiten von Terminen in Wochen- und Monatsansicht anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "Zeit_unterteilungen:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_Di"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "M_i"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-#, fuzzy
-msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr "Den Kalenderinhalt lokal zur Arbeit im Offline-Modus kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-#, fuzzy
-msgid "Cop_y task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr ""
 "Den Inhalt der Aufgabenliste lokal zur Arbeit im Offline-Modus kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-#, fuzzy
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizenliste lokal zur Arbeit im Offline-Modus kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Farbe:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Notizenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Aufgabenlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Neue Notizenliste"
 
@@ -5934,49 +5847,49 @@ msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " bis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2891
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Beigelegte Nachricht - %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:2896
-#: ../composer/e-msg-composer.c:3092
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Beigelegte Nachricht"
 msgstr[1] "%d beigelegte Nachrichten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3156
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3158
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "_Ziehen abbrechen"
 
@@ -5984,7 +5897,7 @@ msgstr "_Ziehen abbrechen"
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2504
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5996,99 +5909,100 @@ msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3656
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3657 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3659
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
-msgstr "Anlage _hinzufügen …"
+msgstr "Anlage _hinzufügen..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2262
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Anlagen anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 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:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -6104,10 +6018,6 @@ msgstr "Ziel konnte nicht geöffnet werden"
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
@@ -6166,7 +6076,7 @@ msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
-msgstr "Kontakte …"
+msgstr "Kontakte..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #: ../plugins/exchange-operations/exchange-delegates.c:421
@@ -6177,124 +6087,139 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_Termin"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Dieses Ereignis enthält Alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "_Kalender:"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Delegaten"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Ereignis ohne Anfangsdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organisator ist kein Konto mehr zugeordnet."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Hinzufügen"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, 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:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, 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:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 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:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Anpassen"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2296
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "Keine"
 
@@ -6311,34 +6236,38 @@ msgid "15 minutes before appointment"
 msgstr "15 Minuten vor dem Termin"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-#, fuzzy
-msgid "Attendee_s..."
-msgstr "Teil_nehmer …"
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "Teil_nehmer..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "Ka_tegorien …"
+msgstr "Ka_tegorien..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Benutzerdefinierter Alarm:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_Beschreibung:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Ereignisbeschreibung"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Ort:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Zusammenfassung:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "A_larm"
 
@@ -6360,6 +6289,14 @@ msgstr "für"
 msgid "until"
 msgstr "bis"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "Dele_gaten"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Von:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6406,7 +6343,7 @@ msgstr "UAwg"
 #: ../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
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -6420,18 +6357,18 @@ msgstr "Organisa_tor ändern"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "Co_ntacts..."
-msgstr "Ko_ntakte …"
+msgstr "Ko_ntakte..."
 
 #: ../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
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Notiz"
 
@@ -6636,7 +6573,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Ausnahmen</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>Vorschau</b>"
 
@@ -6701,15 +6638,15 @@ msgstr "<b>Status</b>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #: ../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:1029
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Hoch"
 
@@ -6718,20 +6655,20 @@ msgstr "Hoch"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #: ../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:1027
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Niedrig"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
@@ -6739,7 +6676,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -6752,7 +6689,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Nicht festgelegt"
 
@@ -6761,7 +6698,7 @@ msgid "_Date completed:"
 msgstr "A_bgeschlossen am:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Priorität:"
 
@@ -6769,12 +6706,12 @@ msgstr "_Priorität:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Aufgabendetails"
 
@@ -6787,13 +6724,9 @@ msgstr "Das Fälligkeitsdatum ist falsch"
 msgid "Unable to open tasks in '%s'."
 msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "Teil_nehmer …"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
-msgstr "Ka_tegorien …"
+msgstr "Ka_tegorien..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
@@ -6931,7 +6864,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
@@ -6951,7 +6884,7 @@ msgstr "Namenlos"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -6969,7 +6902,7 @@ msgstr "Fällig am:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Status:"
 
@@ -6977,26 +6910,18 @@ msgstr "Status:"
 msgid "Priority:"
 msgstr "Priorität:"
 
-#: ../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:3
-msgid "Description:"
-msgstr "Beschreibung:"
-
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Öffentlich"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Vertraulich"
 
@@ -7010,19 +6935,19 @@ msgstr "Anfangsdatum"
 
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Zusammenfassung"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Frei"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -7036,17 +6961,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nein"
@@ -7057,42 +6982,42 @@ msgstr "Nein"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Zugewiesen"
 
 #: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
-msgstr "Speichern unter …"
+msgstr "Speichern unter..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2110
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
-msgstr "Ordner zum Speichern der gewählten Anlagen auswählen …"
+msgstr "Ordner zum Speichern der gewählten Anlagen auswählen..."
 
 #: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
-#: ../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:846
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
-msgstr "_Speichern unter …"
+msgstr "_Speichern unter..."
 
 #: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
@@ -7106,136 +7031,121 @@ msgstr "Auswahl _speichern"
 #: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
-msgstr "In %s öffnen …"
+msgstr "In %s öffnen..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
-msgstr "Speichern unter …"
+msgstr "Speichern unter..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Neue _Aufgabe"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: ../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:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
-msgstr "_Drucken …"
+msgstr "_Drucken..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Ausschneiden"
 
-#: ../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:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-#, fuzzy
-msgid "_Mark as Incomplete"
-msgstr "Als abgeschlossen _markieren"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-#, fuzzy
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -7245,7 +7155,7 @@ msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
 msgid "% Complete"
 msgstr "% abgeschlossen"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -7271,101 +7181,105 @@ msgstr "Anfangsdatum"
 msgid "Task sort"
 msgstr "Aufgabensortierung"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Objekte werden verschoben"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Objekte werden kopiert"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
-msgstr "Neuer _Termin …"
+msgstr "Neuer _Termin..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Neue Bes_prechung"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Neue _Aufgabe"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Aktuelle Ansicht"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
-msgstr "_Datum wählen …"
+msgstr "_Datum wählen..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
-msgstr "In Kalender k_opieren …"
+msgstr "In Kalender k_opieren..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
-msgstr "In Kalender _verschieben …"
+msgstr "In Kalender _verschieben..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
-msgstr "Besprechung dele_gieren …"
+msgstr "Besprechung dele_gieren..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
-msgstr "Besprechung _ansetzen …"
+msgstr "Besprechung _ansetzen..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
-msgstr "Als i_Calendar weiterleiten …"
+msgstr "Als i_Calendar weiterleiten..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Diese Wiederholung löschen"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "_Termin inkl. Wiederholungen löschen"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -7395,7 +7309,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
@@ -7406,22 +7320,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:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "PM"
 
@@ -7533,22 +7445,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Angenommen"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Abgelehnt"
 
@@ -7773,7 +7685,7 @@ msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
@@ -7822,35 +7734,48 @@ msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--an--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalendermitteilung"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Kalender laden"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
-msgstr "Kalender wird geladen …"
+msgstr "Kalender wird geladen..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server-Nachricht:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "datum-ende"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "datum-anfang"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Vorsitzende"
@@ -7869,65 +7794,65 @@ msgid "Resources"
 msgstr "Ressourcen"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Raum"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Vorläufig"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegiert"
 
@@ -7936,14 +7861,14 @@ msgstr "Delegiert"
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "In 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -7951,86 +7876,86 @@ msgstr "%a, %d. %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Nicht im Büro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
-msgstr "_Teilnehmer …"
+msgstr "_Teilnehmer..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Auto-Auswählen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Benötigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "Gewählte Notizen _löschen"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 
@@ -8038,8 +7963,8 @@ msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 msgid "Memo sort"
 msgstr "Notizsortierung"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2543
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8057,76 +7982,75 @@ msgstr "Notizen werden geladen"
 msgid "Opening memos at %s"
 msgstr "Notizen unter %s werden geöffnet"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
-msgstr "Gewählte Objekte werden gelöscht …"
+msgstr "Gewählte Objekte werden gelöscht..."
 
 #: ../calendar/gui/e-pub-utils.c:322
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Geben Sie das Passwort für %s ein"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
-msgstr "Aufgaben werden abgeschlossen …"
+msgstr "Aufgaben werden abgeschlossen..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:781
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Abfrage wird aktualisiert"
 
-#: ../calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "Be_nutzerdefinierte Ansicht"
 
-#: ../calendar/gui/gnome-cal.c:2223
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "Benutzerdefinierte Ansicht _speichern"
 
-#: ../calendar/gui/gnome-cal.c:2228
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
-msgstr "Ansichten _definieren …"
+msgstr "Ansichten _definieren..."
 
-#: ../calendar/gui/gnome-cal.c:2388
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Termine unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2407
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2511
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
-msgstr "%s wird geöffnet …"
+msgstr "%s wird geöffnet..."
 
-#: ../calendar/gui/gnome-cal.c:3384
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -8241,10 +8165,22 @@ 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:450
-#, fuzzy
-msgid "_New Memo List"
-msgstr "Neue Notizenliste"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopieren"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Eigenschaften..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8285,9 +8221,8 @@ msgid "New memo"
 msgstr "Neue Notiz"
 
 #: ../calendar/gui/memos-component.c:1156
-#, fuzzy
-msgid "Mem_o"
-msgstr "Notiz"
+msgid "_Memo"
+msgstr "_Notiz"
 
 #: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
@@ -8298,8 +8233,7 @@ msgid "New memo list"
 msgstr "Neue Notizenliste"
 
 #: ../calendar/gui/memos-component.c:1164
-#, fuzzy
-msgid "Memo li_st"
+msgid "Memo l_ist"
 msgstr "Noti_zenliste"
 
 #: ../calendar/gui/memos-component.c:1165
@@ -8320,7 +8254,7 @@ msgstr ""
 "Der Speicherort und die Hierarchie der Evolution-Aufgabenordner hat sich "
 "seit Evolution 1.x verändert.\n"
 "\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
 #: ../calendar/gui/migration.c:166
 msgid ""
@@ -8332,7 +8266,7 @@ msgstr ""
 "Der Speicherort und die Hierarchie der Evolution-Kalenderordner hat sich "
 "seit Evolution 1.x verändert.\n"
 "\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
@@ -8352,240 +8286,240 @@ msgstr "Der Kalender »%s« konnte nicht migriert werden."
 msgid "Unable to migrate tasks `%s'"
 msgstr "Die Aufgaben in »%s« konnten nicht migriert werden."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "So"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Gewählter Tag (%a, %d. %b %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Gewählte Woche (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Gewählter Monat (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Gewähltes Jahr (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
@@ -8644,15 +8578,14 @@ msgid "New task list"
 msgstr "Neue Aufgabenliste"
 
 #: ../calendar/gui/tasks-component.c:1187
-#, fuzzy
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "Aufgabenl_iste"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8665,11 +8598,11 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Nicht mehr rückfragen."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
@@ -10264,7 +10197,7 @@ msgid "%.0fG"
 msgstr "%.0f GB"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Anlagenleiste"
 
@@ -10272,43 +10205,28 @@ msgstr "Anlagenleiste"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Datei konnte nicht beigelegt werden: %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Datei %s konnte nicht beigelegt werden: keine reguläre Datei"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Eigenschaften der Anlage"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Dateiname:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME-Typ:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 
@@ -10319,46 +10237,46 @@ msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "Antwo_rt an:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "V_on:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "A_n:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Kopie an:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "Blindko_pie an:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10369,15 +10287,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Veröffentlichen in:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Veröffentlichen in:"
 
@@ -10385,18 +10303,18 @@ msgstr "Veröffentlichen in:"
 msgid "A_ttach"
 msgstr "Bei_legen"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Anlage hinzufügen"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10404,52 +10322,52 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "A_nlagenleiste verbergen"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2536
-#: ../composer/e-msg-composer.c:3902
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "A_nlagenleiste anzeigen"
 
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Datei konnte nicht geöffnet werden"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
 
-#: ../composer/e-msg-composer.c:1691
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Namenlose Nachricht"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1726
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: ../composer/e-msg-composer.c:2176 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: ../composer/e-msg-composer.c:2279
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-msg-composer.c:2547 ../composer/e-msg-composer.c:3784
-#: ../composer/e-msg-composer.c:3787
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:5011
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10607,7 +10525,7 @@ msgstr "Nachricht _speichern"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10676,14 +10594,18 @@ msgid "Yes, Change Status"
 msgstr "Ja, den Status ändern"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Abrufen von E-Mails</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Verschicken von E-Mails:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10696,33 +10618,33 @@ msgstr ""
 "Ihnen eine\n"
 "Lesebestätigung erbeten wird.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "In jedem Fall eine Lesebestätigung verschicken"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Nachfragen, ob eine Lesebestätigung verschickt werden soll"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Keinesfalls eine Lesebestätigung verschicken"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Lesebestätigungen"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Für alle verschickten Nachrichten eine Lesebestätigung anfordern"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "Sofern die Nachricht an eine Mailingliste und nicht an mich persönlich "
 "geschickt wurde"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10730,7 +10652,7 @@ msgstr ""
 "Wie soll Evolution verfahren, wenn Sie eine E-Mail erhalten, für die eine "
 "Lesebestätigung angefordert wurde?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10738,28 +10660,28 @@ msgstr ""
 "Es existiert bereits eine Datei mit diesem Namen.\n"
 "Überschreiben?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution-Fehler"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution-Warnung"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution-Informationen"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution-Abfrage"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interner Fehler, unbekannter Fehler »%s« angefordert"
@@ -10854,24 +10776,24 @@ msgstr "%d.%m.%Y"
 msgid "Select a time to compare against"
 msgstr "Wählen Sie eine Vergleichszeit"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Eine Datei wählen"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Wichtig"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Später"
 
@@ -10921,11 +10843,11 @@ msgid "Include threads"
 msgstr "Threads einschließen"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -11023,7 +10945,7 @@ msgstr "in der Vergangenheit"
 msgid "months"
 msgstr "Monate"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -11096,22 +11018,22 @@ msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution-E-Mail-Einstellungsbedienelement"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-Mail"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
@@ -11139,7 +11061,7 @@ msgstr ""
 "Haken Sie das Kontrollkästchen ab, um sie zu akzeptieren.\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
@@ -11147,11 +11069,11 @@ msgstr "Ordner wählen"
 msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identität"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
@@ -11159,16 +11081,16 @@ msgstr "Abrufen von E-Mails"
 msgid "Automatically check for _new mail every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Vorgaben"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Sicherheit"
@@ -11182,11 +11104,11 @@ msgstr "Empfangsoptionen"
 msgid "Checking for New Mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
@@ -11206,22 +11128,22 @@ msgid "[Default]"
 msgstr "[Vorgabe]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Kontoname"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protokoll"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Namenlose"
 
@@ -11297,12 +11219,6 @@ msgstr "Empfangsdatum"
 msgid "Date sent"
 msgstr "Verschickt-Datum"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Löschen"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Gelöscht"
@@ -11391,7 +11307,7 @@ msgstr "ist nicht"
 msgid "is not Flagged"
 msgstr "ist nicht markiert"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Unerwünscht"
@@ -11400,7 +11316,7 @@ msgstr "Unerwünscht"
 msgid "Junk Test"
 msgstr "Unerwünscht-Test"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Beschriftung"
 
@@ -11444,7 +11360,7 @@ msgstr "Klang abspielen"
 msgid "Read"
 msgstr "Gelesen"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Empfänger"
 
@@ -11472,11 +11388,11 @@ msgstr "liefert kleiner als"
 msgid "Run Program"
 msgstr "Programm ausführen"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Bewertung"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Absender"
 
@@ -11508,9 +11424,9 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11526,49 +11442,9 @@ msgstr "Status nicht setzen"
 msgid "<b>Then</b>"
 msgstr "<b>Dann</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
-msgstr "Sucho_rdner aus Suche anlegen …"
-
-#: ../mail/em-folder-browser.c:183
-#, fuzzy
-msgid "All Messages"
-msgstr "Nachrichten"
-
-#: ../mail/em-folder-browser.c:184
-#, fuzzy
-msgid "Unread Messages"
-msgstr "Ungelesene Nachrichten:"
-
-#: ../mail/em-folder-browser.c:186
-#, fuzzy
-msgid "No Label"
-msgstr "Beschriftung"
-
-#: ../mail/em-folder-browser.c:193
-#, fuzzy
-msgid "Read Messages"
-msgstr "Ge_lesene Nachrichten verbergen"
-
-#: ../mail/em-folder-browser.c:194
-#, fuzzy
-msgid "Recent Messages"
-msgstr "Nachrichten ö_ffnen"
-
-#: ../mail/em-folder-browser.c:195
-#, fuzzy
-msgid "Last 5 Days Messages"
-msgstr "Fehlerhafte Aufgabenmitteilung"
-
-#: ../mail/em-folder-browser.c:196
-#, fuzzy
-msgid "Messages with Attachments"
-msgstr "Anlage hinzufügen"
-
-#: ../mail/em-folder-browser.c:197
-#, fuzzy
-msgid "Messages Not Junk"
-msgstr "Nachricht ist nicht unerwünscht"
+msgstr "Sucho_rdner aus Suche anlegen..."
 
 #. 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
@@ -11603,7 +11479,7 @@ msgid "Folder _name:"
 msgstr "Ordner_name:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Suchordner"
 
@@ -11619,7 +11495,7 @@ msgstr "Entwürfe"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Eingang"
 
@@ -11633,80 +11509,80 @@ msgstr "Verschickt"
 
 #: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
-msgstr "Ladevorgang …"
+msgstr "Ladevorgang..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 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:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "In _neuem Fenster öffnen"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
-msgstr "_Kopieren …"
+msgstr "_Kopieren..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
-msgstr "_Verschieben …"
+msgstr "_Verschieben..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
-msgstr "Ordner a_nlegen …"
+msgstr "Ordner a_nlegen..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
-msgstr "_Umbenennen …"
+msgstr "_Umbenennen..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Müll leeren"
 
@@ -11715,14 +11591,13 @@ msgstr "_Müll leeren"
 msgid "Copying `%s' to `%s'"
 msgstr "»%s« wird nach »%s« kopiert"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opieren"
 
@@ -11744,171 +11619,158 @@ msgstr "Ordner anlegen"
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
-msgstr "Als neue Nachricht _bearbeiten …"
+msgstr "Als neue Nachricht _bearbeiten..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "Löschen rü_ckgängig"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
-msgstr "In Ordner verschie_ben …"
+msgstr "In Ordner verschie_ben..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
-msgstr "In Ordner _kopieren …"
+msgstr "In Ordner _kopieren..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Als u_ngelesen markieren"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/em-folder-view.c:1135
-#, fuzzy
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Als u_nerwünscht markieren"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
-msgstr "Als Folg_enachricht markieren …"
+msgstr "Als Folg_enachricht markieren..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Keine"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Re_gel aus Nachricht anlegen"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Suchordner über _Betreff"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Suchordner über Abse_nder"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Suchordner über _Empfänger"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Suchordner über Mailing_liste"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filter über Be_treff"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filter über Ab_sender"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filter über Em_pfänger"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filter über Ma_ilingliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "Link-Ziel _kopieren"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr ""
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:502
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: ../mail/em-format-html-display.c:645
-#, fuzzy
-msgid "Find:"
-msgstr "S_uchen:"
-
-#: ../mail/em-format-html-display.c:676
-#, fuzzy
-msgid "M_atch case"
-msgstr "Auf alles zutreffen"
-
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Unsigniert"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11916,12 +11778,12 @@ msgstr ""
 "Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
 "daher nicht sichergestellt."
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Gültige Signatur"
 
 # CHECK
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11929,11 +11791,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:926 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Ungültige Signatur"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11941,11 +11803,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:927
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte nicht verifiziert werden"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11953,11 +11815,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:933 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11965,11 +11827,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:934 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Schwach verschlüsselt"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11979,11 +11841,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:935 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11991,11 +11853,11 @@ msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können Dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Stark verschlüsselt"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12005,73 +11867,73 @@ msgstr ""
 "verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:1037 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../mail/em-format-html-display.c:1052
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
 # CHECK
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fertiggestellt am %d. %B %Y, %R"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "am %d. %b, %k:%M"
 
-#: ../mail/em-format-html-display.c:1442
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "An _Ort und Stelle anzeigen"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "In der Breite ein_passen"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "In _Originalgröße anzeigen"
 
-#: ../mail/em-format-html-display.c:1864 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: ../mail/em-format-html-display.c:2071
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
-msgstr "Ordner zum Speichern aller Anlagen auswählen …"
+msgstr "Ordner zum Speichern aller Anlagen auswählen..."
 
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
-msgstr "Gewählte _speichern …"
+msgstr "Gewählte _speichern..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2185
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d A_nlage"
 msgstr[1] "%d A_nlagen"
 
-#: ../mail/em-format-html-display.c:2192 ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Speichern"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../mail/em-format-html-display.c:2264
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Keine Anlagen"
 
@@ -12085,94 +11947,94 @@ msgstr "Seite %d von %d"
 msgid "Retrieving `%s'"
 msgstr "»%s« wird abgerufen"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Fehlerhaft formatierter external-body-Teil."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf entfernte Daten (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Von"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "An"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Kopie"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Blindkopie"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Datum"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Newsgroups"
@@ -12226,7 +12088,7 @@ msgstr "Einmal pro Woche"
 msgid "Once per month"
 msgstr "Einmal pro Monat"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12236,50 +12098,50 @@ msgstr ""
 "Der Speicherort und die Hierarchie der Evolution-E-Mail-Ordner hat sich seit "
 "Evolution 1.x verändert.\n"
 "\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Der Ordner »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Der Ordner »%s« konnte nicht nach »%s« kopiert werden: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "»%s« konnte nicht auf vorhandene Postfächer überprüft werden: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Alte POP-Keep-on-Server-Daten »%s« konnten nicht geöffnet werden: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "POP-Keep-on-Server-Datenverzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP-Keep-on-Server-Daten »%s« konnten nicht kopiert werden: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Lokale E-Mail-Ordner unter »%s« konnten nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12296,9 +12158,13 @@ msgstr "_Antwort an Absender"
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Link im Browser ö_ffnen"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
-msgstr "Neue Nachricht _schicken an …"
+msgstr "Neue Nachricht _schicken an..."
 
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
@@ -12309,45 +12175,45 @@ msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dieser Speicher unterstützt keine Abonnements oder sie sind nicht aktiviert."
 
-#: ../mail/em-subscribe-editor.c:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Ordner"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "Nachricht"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
-msgstr "Nachricht speichern …"
+msgstr "Nachricht speichern..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Adresse hinzufügen"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -12356,7 +12222,7 @@ msgstr "Nachrichten von %s"
 msgid "Search _Folders"
 msgstr "Such_ordner"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Suchordner-Quelle"
 
@@ -12389,106 +12255,84 @@ msgid "Composer Window default width"
 msgstr "Vorgabebreite des Editorfensters"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Die Vorgabehöhe des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Die Vorgabehöhe des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Die Vorgabehöhe des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Die Vorgabebreite des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Die Vorgabebreite des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Die Vorgabebreite des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Indikatoren für Rechtschreibfehler bei der Eingabe zeichnen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Müllordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Müllordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor "
 "angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12496,14 +12340,8 @@ 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.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-
 # CHECK - etwas holprig
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12514,27 +12352,23 @@ msgstr ""
 "Bonobo-Komponentenbetrachter verknüpft ist, dieser Betrachter der GNOME-MIME-"
 "Datenbank entnommen und zum Anzeigen des Inhalts verwendet."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Letzte Müllleerung"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Liste akzeptierter Lizenzen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12543,12 +12377,12 @@ msgstr ""
 "enthält Zeichenketten, die Unterverzeichnisse relativ zu »/apps«/evolution/"
 "mail/accounts« angeben."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12558,21 +12392,21 @@ msgstr ""
 "HTML-Hextriplet anzugeben ist."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 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.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste der Protokollnamen, deren Lizenzen akzeptiert wurden."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Bilder von HTML-Nachrichten per HTTP laden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12581,101 +12415,97 @@ msgstr ""
 "Bilder von HTML-Nachrichten per HTTP(S) laden. Mögliche Werte sind: 0 - "
 "Keinesfalls, 1 - Falls Absender im Adressbuch, 2 - Immer"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Vorgabehöhe des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Vorgabebreite des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 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.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 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.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 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.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Klangdatei zur Benachrichtigung bei neuen E-Mails"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Benachrichtigungstyp bei neuen E-Mails"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff rückfragen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 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.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern rückfragen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 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.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12683,110 +12513,93 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "rückfragen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 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.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 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.in.h:71
-#, fuzzy
-msgid "Prompt while marking multiple messages"
-msgstr "Beim Säubern rückfragen"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Smileys im Text erkennen und durch Bilder ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 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.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-#, fuzzy
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-#, fuzzy
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Beim Eintreffen neuer E-Mails wiederzugebende Klangdatei."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Legt den Typ der Benachrichtigung bei neuen E-Mails fest, den der Benutzer "
 "verwenden möchte."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Vorgabehöhe des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Vorgabebreite des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Die Zeit seit der letzten Müllleerung in Tagen seit der Epoche."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12798,110 +12611,100 @@ 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.in.h:95
-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:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Die Nachrichtenliste nach Threads sortieren."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Die Nachrichtenliste nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Spamassassin-Daemon und -Client verwenden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin-Daemon und -Client verwenden (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Ausschließlich lokale Spam-Tests verwenden."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ausschließlich lokale Spam-Tests verwenden (kein DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Ansicht/Von-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Ansicht/Von-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv."
 
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12909,16 +12712,6 @@ msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-#, fuzzy
-msgid "Width of the message-list pane"
-msgstr "Höhe des Nachrichtenlistenfelds"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-#, fuzzy
-msgid "Width of the message-list pane."
-msgstr "Höhe des Nachrichtenlistenfelds."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Elm-Daten werden importiert"
@@ -12950,15 +12743,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importeur für Ordner im Berkeley-Mailbox-Format"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "»%s« wird importiert"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -13143,31 +12936,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d ungelesen"
 msgstr[1] ", %d ungelesen"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Neuer E-Mail-Ordner"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Auffrischen der E-Mail-Einstellungen oder -Ordner fehlgeschlagen."
 
@@ -13195,224 +12988,230 @@ msgstr "Zu er_ledigen"
 msgid "_Later"
 msgstr "S_päter"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " _Prüfen, welche Typen unterstützt werden "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL wird von diesem Evolution-Build nicht unterstützt</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Sig_naturen</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Sprachen</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 "<small>Dies erhöht die Zuverlässigkeit des Filters, verlangsamt ihn jedoch "
 "erheblich</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<b>Konteninformationen</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<b>Legitimationsart</b>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<b>Legitimation</b>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<b>Verfassen von Nachrichten</b>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<b>Konfiguration</b>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<b>Vorgabeverhalten</b>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<b>Löschen von E-Mails</b>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<b>_Angezeigte E-Mail-Kopfzeilen</b>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<b>Filteroptionen</b>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<b>Beschriftungen und Farben</b>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<b>Laden von Bildern</b>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<b>Nachrichtenanzeige</b>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<b>Nachrichtenschriften</b>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<b>Nachrichtenquittierungen</b>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<b>Benachrichtigung bei neuen E-Mails</b>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<b>Optionale Informationen</b>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<b>Optionen</b>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<b>Pretty Good Privacy (PGP/GPG)</b>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<b>Druckschriften</b>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<b>Erforderliche Informationen</b>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<b>Sicheres MIME (S/MIME)</b>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<b>Sicherheit</b>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<b>Verschickte Nachrichten und Nachrichtenentwürfe</b>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<b>Server-Konfiguration</b>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "N_eue Signatur …"
+msgstr "N_eue Signatur..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "_Skript hinzufügen"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten _immer signieren"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails auch zu sich sel_bst verschlüsseln"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Immer _Kopie schicken an:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Immer _Blindkopie schicken an:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Schlüssel am Schlüsselbund beim Verschlüsseln _immer vertrauen"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer vor mir selbst verschlüsseln"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Originalnachricht anhängen"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "_Smiley-Bilder automatisch einfügen"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "Beim Eintreffen neuer E-Mails _Piepston ausgeben"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "_Zeichensatz:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Prüfen, welche Typen unterstützt werden "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "_Eingehende E-Mail auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Rechtschreibprüfung während der Ein_gabe durchführen"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Überprüft, ob eingehende Nachrichten unerwünscht sind"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "En_tfernen"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Ent_fernen"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Farbe für falsch geschriebene Wörter:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Farben"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "Beim _Säubern eines Ordners rückfragen"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13430,116 +13229,116 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Voreingestellte _Zeichenkodierung:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Originalnachricht nicht zitieren"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Fertig"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "_Entwurfsordner:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-Mail-Konten"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Müllordner beim Beenden _leeren"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Verschlüsselungszertifikat:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ausgehende Nachrichten _verschlüsseln (per Vorgabe)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "_Dicktengleiche Schrift:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "_Dicktengleich:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Schrifteigenschaften"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "_Voller Name:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML-E-Mail"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "Zusätzliche _Ferntests durchführen"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Sprachtabelle"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "E-Mail-Kopf-Tabelle"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Nachrichteneditor"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13547,19 +13346,19 @@ msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Beim Eintreffen neuer E-Mails _Klangdatei abspielen"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13567,7 +13366,7 @@ msgstr ""
 "Bitte geben Sie unten einen beschreibenden Namen für dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige verwendet."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13576,7 +13375,7 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13587,117 +13386,117 @@ msgstr ""
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
 "nachfragen"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Originalnachricht zitieren"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "An Passwort _erinnern"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "An _Passwort erinnern"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
-msgstr "A_uswählen …"
+msgstr "A_uswählen..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
-msgstr "Aus_wählen …"
+msgstr "Aus_wählen..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "Dicktengleiche HTML-Druckschrift wählen"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wählen"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "HTML-Proportionaldruckschrift wählen"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "Nachrichtenquittierungen verschicken:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "_Server-Typ: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_Signatur:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Signaturtabelle"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "T_yp:"
 
-#: ../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."
@@ -13705,7 +13504,7 @@ msgstr ""
 "Diese Sprachliste enthält ausschließlich die Sprachen, für die ein "
 "Wörterbuch installiert sind."
 
-#: ../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"
@@ -13715,7 +13514,7 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zu Anzeigezwecken verwendet."
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13723,15 +13522,15 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Geschäftlich« oder »Persönlich«."
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Proportional:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13741,73 +13540,69 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Vor«, um zu beginnen."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Beim Eintreffen neuer E-Mails nicht benachrichtigen"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "Bilder in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
 "wünschen"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nachfrage beim Abschicken von Nachrichten mit _leerem Betreff"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skript:"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "Bildanimationen an_zeigen"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr ""
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Sichere Verbindung verwenden:"
@@ -13817,22 +13612,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
 #: ../mail/mail-config.glade.h:176
-#, fuzzy
-msgid "addresses"
-msgstr "Adresse"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "Beschreibung"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Suchordner-Quellen</b>"
@@ -13846,67 +13632,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<b>Verschlüsselung</b>"
 
 #: ../mail/mail-dialogs.glade.h:5
-#, fuzzy
-msgid "All active remote folders"
-msgstr "mit allen aktiven entfernten Ordnern"
-
-#: ../mail/mail-dialogs.glade.h:6
-#, fuzzy
-msgid "All local and active remote folders"
-msgstr "mit allen lokalen und aktiven, entfernten Ordnern"
-
-#: ../mail/mail-dialogs.glade.h:7
-#, fuzzy
-msgid "All local folders"
-msgstr "mit allen lokalen Ordnern"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Abges_chlossen"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "S_uchen:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Als Folgenachricht markieren"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Keiner gewählt"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: ../mail/mail-dialogs.glade.h:19
-#, fuzzy
-msgid "Specific folders"
-msgstr "nur bestimmte Ordner"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13916,51 +13682,67 @@ msgstr ""
 "Bitte wählen Sie eine Aktion für die Folgenachricht aus dem Menü "
 "»Markierung«."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "Lizenz _akzeptieren"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Fällig am:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "nur bestimmte Ordner"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "mit allen aktiven entfernten Ordnern"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "mit allen lokalen und aktiven, entfernten Ordnern"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "mit allen lokalen Ordnern"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13969,114 +13751,123 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschicken«-Ordner anzuhängen."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 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:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Abgesagt."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Ordner wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht(en) wird/werden abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d Nachricht(en) wird/werden gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Ausgabedatei konnte nicht angelegt werden: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14085,11 +13876,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14098,70 +13889,60 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
-msgstr "Absagevorgang …"
+msgstr "Absagevorgang..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "_Alles abbrechen"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
-msgstr "Aktualisieren …"
+msgstr "Aktualisieren..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
-msgstr "Warten …"
+msgstr "Warten..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/mail-session.c:205
-#, fuzzy, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Passwort für %s eingeben"
-
-#: ../mail/mail-session.c:207
-#, fuzzy
-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:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
@@ -14218,11 +13999,11 @@ msgstr "Suchordner für »%s:%s« werden aktualisiert"
 msgid "Updating Search Folders for '%s'"
 msgstr "Suchordner für »%s« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Suchordner bearbeiten"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
@@ -14234,7 +14015,6 @@ msgstr ""
 "anderen Namen."
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
@@ -14244,7 +14024,7 @@ msgstr ""
 "Es existiert bereits ein nicht leerer Ordner unter »{1}«.\n"
 "\n"
 "Sie können diesen Ordner ignorieren, überschreiben, seinen Inhalt anhängen "
-"oder abbrechen.\n"
+"oder abbrechen."
 
 #: ../mail/mail.error.xml.h:5
 msgid ""
@@ -14648,10 +14428,9 @@ msgid "Signature Already Exists"
 msgstr "Signatur existiert bereits"
 
 #: ../mail/mail.error.xml.h:89
-#, fuzzy
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 "Ximian Evolution benötigt Systemordner, um korrekt zu funktionieren und "
 "können weder umbenannt, noch verschoben oder gelöscht werden."
@@ -14826,74 +14605,74 @@ msgstr "_Säubern"
 msgid "_Open Messages"
 msgstr "Nachrichten ö_ffnen"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Höher"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
@@ -14913,16 +14692,15 @@ msgstr "Markiert"
 msgid "Follow Up Flag"
 msgstr "Folgenachricht-Markierung"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Ursprünglicher Speicherort"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Erhalten"
 
-#: ../mail/message-list.etspec.h:14
-#, fuzzy
-msgid "Sent Messages"
-msgstr "Nachrichten ö_ffnen"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Größe"
@@ -15052,7 +14830,7 @@ msgstr "Plugin zum Sichern und Wiederherstellen"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
-msgstr "Backup-Einstellungen …"
+msgstr "Backup-Einstellungen..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
@@ -15060,7 +14838,7 @@ msgstr "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
-msgstr "Einstellungen zurücksetzen …"
+msgstr "Einstellungen zurücksetzen..."
 
 #: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -15074,11 +14852,6 @@ msgid ""
 msgstr ""
 "_Automatische Erstellung von Adressbucheinträgen bei Beantwortung von E-Mails"
 
-#: ../plugins/bbdb/bbdb.c:460
-#, fuzzy
-msgid "Select Address book for Automatic Contacts"
-msgstr "Automatische Kontakte"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "Instant-Messaging-Kontakte"
@@ -15091,11 +14864,6 @@ msgstr ""
 "Kontaktinformationen und Bilder regelmäßig mit der Gaim-Buddy-Liste "
 "abgleichen"
 
-#: ../plugins/bbdb/bbdb.c:496
-#, fuzzy
-msgid "Select Address book for Gaim buddy list"
-msgstr "Adressbuch auswählen"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -15204,6 +14972,10 @@ msgstr ""
 "Ein Test-Plugin, welches ein Kontextmenü-Plugin demonstriert, mit dem Dinge "
 "in die Zwischenablage kopiert werden können."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "_E-Mail-Adresse kopieren"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Werkzeug zum Kopieren"
@@ -15353,19 +15125,19 @@ msgstr "Ordnergröße"
 msgid "Exchange Settings"
 msgstr "Exchange-Einstellungen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "_Legitimation"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "Legitimationsart"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "_Prüfen, welche Arten unterstützt werden"
 
@@ -15411,15 +15183,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:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Ihr Passwort wird in den nächsten %d Tagen ablaufen"
 
-#. 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
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
@@ -15530,7 +15300,7 @@ msgstr "Auf_gaben:"
 #: ../plugins/exchange-operations/exchange-folder-permission.c:58
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
-msgstr "Berechtigungen …"
+msgstr "Berechtigungen..."
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:135
 msgid "Folder Name"
@@ -15540,7 +15310,7 @@ msgstr "Ordnername"
 msgid "Folder Size"
 msgstr "Ordnergröße"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Ordner eines anderen Benutzers abonnieren"
@@ -15553,27 +15323,27 @@ msgstr "Exchange-Ordnerbaum"
 #: ../plugins/exchange-operations/exchange-folder.c:229
 #: ../plugins/exchange-operations/exchange-folder.c:239
 msgid "Unsubscribe Folder..."
-msgstr "Ordner abbestellen …"
+msgstr "Ordner abbestellen..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Den Ordner »%s« wirklich abbestellen?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Abbestellen von »%s«"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
-msgstr "Passwortablauf-Warnung …"
+msgstr "Passwortablauf-Warnung..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "Ihr Passwort wird in 7 Tagen ablaufen …"
+msgstr "Ihr Passwort wird in 7 Tagen ablaufen..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
@@ -15595,59 +15365,59 @@ msgstr "Benutzer hinzufügen:"
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Berechtigungen</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Löschen fehlgeschlagen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Bearbeiten fehlgeschlagen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Objekte erstellen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Unterordner anlegen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Jegliche Objekte löschen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Eigene Objekte löschen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Jegliche Objekte bearbeiten"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Eigene Objekte bearbeiten"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Ordnerkontakt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Besitzer des Ordners"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Ordner sichtbar"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Objekte lesen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Position: "
 
@@ -15657,7 +15427,7 @@ msgstr "Benutzer auswählen"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
 msgid "Address Book..."
-msgstr "Adressbuch …"
+msgstr "Adressbuch..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
@@ -15690,28 +15460,22 @@ msgid "Cannot display folders."
 msgstr "Ordner konnten nicht angezeigt werden."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-#, fuzzy
-msgid "Cannot perform the operation."
-msgstr "Fehler beim Ausführen eines Vorgangs."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-#, fuzzy
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
 "Die Änderungen an der Konfiguration des Exchange-Kontos werden erst "
 "angewendet, nachdem Evolution beendet und neu gestartet wurde."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Legitimation am Server gescheitert."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Das Passwort konnte nicht geändert werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15722,55 +15486,55 @@ msgstr ""
 "Sie die Adresse, den Benutzernamen und das Passwort.\n"
 "Versuchen Sie es danach erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Verbindung mit dem Exchange-Server konnte nicht hergestellt werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Verbindung mit Server {0} konnte nicht hergestellt werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Ordnerberechtigungen für Delegaten konnten nicht ermittelt werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Exchange Web Storage System wurde nicht gefunden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Server {0} wurde nicht gefunden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "{0} konnte nicht zum Delegaten gemacht werden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Ordnerberechtigungen konnten nicht gelesen werden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Ordnerberechtigungen konnten nicht gelesen werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Abwesenheitsstatus konnte nicht gelesen werden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Ordnerberechtigungen konnten nicht aktualisiert werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Abwesenheitsstatus konnte nicht aktualisiert werden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Exchange-Konto ist offline."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15798,28 +15562,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Aktualisierung der Delegaten gescheitert:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Ordner existiert bereits"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Ordner existiert nicht"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Ordner offline"
 
-#: ../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:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15827,69 +15591,68 @@ msgstr ""
 "Falls OWA unter einem anderen Pfad läuft, muss dies im Konten-"
 "Konfigurationsdialog angegeben werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Das Postfach für {0} befindet sich nicht auf diesem Server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 "Stellen Sie sicher, dass die Adresse korrekt ist und versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Stellen Sie sicher, dass der Name des Servers korrekt geschrieben ist und "
 "versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Stellen Sie sicher, dass Benutzername und Passwort korrekt sind und "
 "versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Für dieses Konto ist kein globaler Katalog-Server konfiguriert."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Kein Postfach für den Benutzer {0} auf {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Benutzer {0} nicht vorhanden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Das Passwort wurde erfolgreich geändert."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-#, fuzzy
-msgid "Please restart Evolution for changes to take effect"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
 msgstr "Bitte starten Sie Evolution neu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Bitte wählen Sie einen Benutzer."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Der Server hat das Passwort abgelehnt, da es zu einfach ist."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Das Exchange-Konto wird deaktiviert, sobald Sie Evolution beenden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Das Exchange-Konto wird entfernt, sobald Sie Evolution beenden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Der Exchange-Server ist mit dem Exchange-Connector nicht kompatibel."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15897,7 +15660,7 @@ msgstr ""
 "Auf dem Server läuft Exchange 5.5. Exchange-Connector \n"
 "unterstützt nur Microsoft Exchange 2000 und 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15911,56 +15674,56 @@ msgstr ""
 "\n"
 "Oder Sie haben nur ein falsches Passwort eingegeben."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Versuchen Sie es mit einem anderen Passwort noch einmal."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr ""
 "Der Benutzer konnte nicht zur Zugriffskontrollliste hinzugefügt werden:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Bearbeitung der Delegaten nicht möglich."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Unbekannter Fehler beim Suchen von {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Unbekannter Typ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Nicht unterstützte Aktion"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Sie nähern sich Ihrem Speicherplatzlimit zum Ablegen von Nachrichten auf "
 "diesem Server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Sie können sich nicht selbst als Ihren eigenen Delegaten angeben."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Sie haben Ihr Speicherplatzlimit zum Ablegen von Nachrichten auf diesem "
 "Server überschritten."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Sie dürfen nur ein einziges Exchange-Konto konfigurieren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15968,7 +15731,7 @@ msgstr ""
 "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Versuchen Sie durch "
 "das Löschen einiger Nachrichten etwas Platz zu schaffen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -15976,7 +15739,7 @@ msgstr ""
 "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Sie sind jetzt nicht "
 "mehr in der Lage, Nachrichten zu senden oder zu empfangen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15985,19 +15748,19 @@ msgstr ""
 "Speicherplatz durch das Löschen einiger Nachrichten freigemacht wurde, "
 "werden Sie wieder Nachrichten verschicken können."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Ihr Passwort ist abgelaufen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} kann nicht zu einer Zugriffskontrollliste hinzugefügt werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} ist bereits ein Delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} befindet sich bereits in der Liste"
 
@@ -16041,7 +15804,7 @@ msgstr "<b>Einstellungen zu unerwünschten Nachrichten</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 msgid "Junk Mail Settings..."
-msgstr "Einstellungen zu unerwünschten Nachrichten …"
+msgstr "Einstellungen zu unerwünschten Nachrichten..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
@@ -16074,7 +15837,7 @@ msgstr "Sendeoptionen zu GroupWise-Nachrichten hinzufügen"
 
 #: ../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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Sendeoptionen"
 
@@ -16109,7 +15872,7 @@ msgstr "Die berechtigten Nutzer werden folgende Benachrichtigung erhalten.\n"
 
 #: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
-msgstr "_Kontakte …"
+msgstr "_Kontakte..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
@@ -16121,7 +15884,7 @@ msgstr "_Nicht freigeben"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
-msgstr "_Freigegeben für …"
+msgstr "_Freigegeben für ..."
 
 #: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
@@ -16192,12 +15955,9 @@ msgstr "Vertretungsanmeldung"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 
-#. 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:505
 msgid "_Proxy Login..."
-msgstr "_Vertretungsanmeldung …"
+msgstr "_Vertretungsanmeldung..."
 
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
@@ -16217,7 +15977,7 @@ msgstr "Eingabe der Benutzer und Festlegen der Rechte"
 
 #: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "New _Shared Folder..."
-msgstr "Neue Ordner_freigabe …"
+msgstr "Neue Ordner_freigabe..."
 
 #: ../plugins/groupwise-features/share-folder-common.c:450
 msgid "Sharing"
@@ -16225,7 +15985,7 @@ msgstr "Freigeben"
 
 #: ../plugins/groupwise-features/status-track.c:242
 msgid "Track Message Status..."
-msgstr "Nachrichtenstatus verfolgen …"
+msgstr "Nachrichtenstatus verfolgen..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
@@ -16237,7 +15997,7 @@ msgstr "Hula-Kontoeinrichtung"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
-msgstr "In Kalender i_mportieren …"
+msgstr "In Kalender i_mportieren..."
 
 #: ../plugins/import-ics-attachments/icsimporter.c:88
 msgid "_Import to Tasks"
@@ -16256,12 +16016,12 @@ msgid "Select Calendar"
 msgstr "Kalender auswählen"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importieren"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-Format (.ics)"
 
@@ -16320,104 +16080,104 @@ msgstr ""
 "Der Evolution-Kalender bzw. die ToDo-Liste konnte zum Exportieren der Daten "
 "nicht geöffnet werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Der Kalender »%s« konnte nicht geladen werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, 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:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender »%s« gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Dieser Journaleintrag wurde in keinem Journal gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, 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:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Delegaten %s entfernt "
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Delegaten wurde eine Absagenachricht zugestellt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 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:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 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:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16425,15 +16185,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gültiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16441,11 +16201,11 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16455,23 +16215,23 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 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:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Heute"
 
@@ -16818,26 +16578,26 @@ msgid "_Update"
 msgstr "A_ktualisieren"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Anfangszeit:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Endzeit:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Akt_ualisierungen an die Teilnehmer verschicken"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "Auf alle _Instanzen anwenden"
 
@@ -16852,7 +16612,7 @@ msgstr "Itip-Formatierung"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "»{0}« hat die Besprechung delegiert. Möchten Sie den Delegaten »{1}« "
 "hinzufügen?"
@@ -16944,14 +16704,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Die gewählte Nachricht in eine neue Aufgabe umwandeln"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Kontaktlisten_besitzer"
 
 #: ../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 "Listen_archiv abrufen"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Ben_utzungsinformationen der Liste abrufen"
 
@@ -16973,14 +16736,17 @@ msgstr ""
 "(abonnieren, abbestellen, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Nachricht an Liste schicken"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "Liste _abonnieren"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "Liste ab_bestellen"
 
@@ -17066,30 +16832,15 @@ msgstr "Nachricht _bearbeiten"
 msgid "_Send message"
 msgstr "Nachricht ver_schicken"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
-msgid "Contact List _Owner"
-msgstr "Kontaktlisten_besitzer"
-
 #: ../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 "Kontakt zum Eigner der Mailingliste dieser Nachricht aufnehmen"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-#, fuzzy
-msgid "Get List _Archive"
-msgstr "Listen_archiv abrufen"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-#, fuzzy
-msgid "Get List _Usage Information"
-msgstr "Ben_utzungsinformationen der Liste abrufen"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Ein Archiv der Mailingliste dieser Nachricht abrufen"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Informationen über die Nutzung der Mailingliste dieser Nachricht abrufen"
@@ -17106,28 +16857,12 @@ msgstr "Die Mailingliste der gewählten Nachricht abonnieren"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Die Mailingliste der gewählten Nachricht abbestellen"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
-msgid "_Post Message to List"
-msgstr "_Nachricht an Liste schicken"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
-msgid "_Subscribe to List"
-msgstr "Liste _abonnieren"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
-msgid "_Unsubscribe from List"
-msgstr "Abbestellen von »%s«"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Alles als gelesen markieren"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-#, fuzzy
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Nachrichten als ge_lesen markieren"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -17387,22 +17122,22 @@ msgstr "Anlagen speichern"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
-msgstr "Anlagen speichern …"
+msgstr "Anlagen speichern ..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Alle Anlagen speichern"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Basisnamen zum Speichern festlegen"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME-Typ"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Speichern"
 
@@ -17514,7 +17249,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF-Format (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Zieldatei wählen"
 
@@ -17563,19 +17298,19 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Vor«, um fortzufahren. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte wählen Sie die Informationen, die Sie importieren wollen:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Daten werden importiert."
 
@@ -17631,9 +17366,8 @@ msgid "Default window height"
 msgstr "Voreingestellte Fensterhöhe"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-#, fuzzy
 msgid "Default window state"
-msgstr "Voreingestellte Fensterbreite"
+msgstr "Voreingestellter Fensterzustand"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
@@ -17668,16 +17402,11 @@ msgstr "Seitenleiste anzeigen"
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Statusbar is visible"
-msgstr "Seitenleiste anzeigen"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17685,19 +17414,19 @@ msgstr ""
 "Die Konfigurationsversion von Evolution mit Haupt-, Unter- und "
 "Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Die Vorgabehöhe des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Die Vorgabebreite des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Die Vorgabebreite der Seitenleiste in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17705,7 +17434,7 @@ msgstr ""
 "Die zuletzt aktualisierte Konfigurationsversion von Evolution mit Haupt-, "
 "Unter- und Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17715,47 +17444,41 @@ msgstr ""
 "»both« und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der "
 "GNOME-Einstellungen festgelegt."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Werkzeugleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Soll Evolution im Offline- statt im Online-Modus gestartet werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
-msgstr "Sollen die Fensterknöpfe angezeigt werden?"
+msgstr "Soll das Fenster maximiert angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Soll die Seitenleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-#, fuzzy
-msgid "Whether the status bar should be visible."
-msgstr "Soll die Werkzeugleiste angezeigt werden?"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Soll der Warndialog in Evolution-Entwicklerversionen nicht angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Sollen die Fensterknöpfe angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Fensterknopfstil"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Fensterknöpfe sind sichtbar"
 
@@ -17777,11 +17500,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Wählen Sie den auszuführenden Importeur:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17795,11 +17518,11 @@ msgstr ""
 "Falls er Ihnen unbekannt ist, können Sie »Automatisch« wählen. Evolution "
 "wird dann versuchen, ihn selbst zu bestimmen."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Wählen Sie das Ziel dieses Imports"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17812,23 +17535,23 @@ msgstr ""
 "gefunden. Klicken Sie bitte den »Zurück«-Knopf an, falls\n"
 "Sie es noch einmal versuchen wollen.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus ä_lteren Programmen importieren"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
@@ -17892,7 +17615,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
@@ -17921,41 +17644,35 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Unbekannter Systemfehler."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Neu"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-#, fuzzy
-msgid " New "
-msgstr "Neu"
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Neuer Test"
@@ -18009,7 +17726,7 @@ msgstr ""
 "Dateien in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18048,7 +17765,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:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18056,40 +17773,35 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Remigrierung von Evolution 1.4 erzwingen"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:515
-#, fuzzy
-msgid "- The Evolution PIM and Email Client"
-msgstr "Die Evolution PIM- und E-Mail-Anwendung"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18277,7 +17989,7 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:595
 #: ../smime/gui/certificate-manager.c:603
 msgid "Select a certificate to import..."
-msgstr "Wählen Sie ein zu importierendes Zertifikat …"
+msgstr "Wählen Sie ein zu importierendes Zertifikat..."
 
 #: ../smime/gui/certificate-manager.c:267
 #: ../smime/gui/certificate-manager.c:472
@@ -18532,7 +18244,7 @@ msgid "_Edit CA Trust"
 msgstr "CA-Vertrauenswürdigkeit _bearbeiten"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "Zertifikat existiert bereits"
 
@@ -18760,21 +18472,15 @@ msgstr "Die Eigenschaften des gewählten Ordners ändern"
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "Kontakte _kopieren nach …"
+msgstr "Kontakte _kopieren nach..."
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "Kontakt_vorschau"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopieren"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Gewählte Kontakte in einen anderen Ordner kopieren …"
+msgstr "Gewählte Kontakte in einen anderen Ordner kopieren..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
@@ -18786,7 +18492,7 @@ msgstr "Die Auswahl kopieren"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
-msgstr "In Ordner kopieren …"
+msgstr "In Ordner kopieren..."
 
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new addressbook folder"
@@ -18820,11 +18526,11 @@ msgstr "Kontakt weiterleiten"
 
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
-msgstr "Alle Kontakte _verschieben nach …"
+msgstr "Alle Kontakte _verschieben nach..."
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Gewählte Kontakte in einen anderen Ordner verschieben …"
+msgstr "Gewählte Kontakte in einen anderen Ordner verschieben..."
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -18832,7 +18538,7 @@ msgstr "Die Kontakte des gewählten Ordners in einen anderen Ordner verschieben"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
-msgstr "In Ordner verschieben …"
+msgstr "In Ordner verschieben..."
 
 #: ../ui/evolution-addressbook.xml.h:23
 #: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
@@ -18873,7 +18579,7 @@ msgid "Select All"
 msgstr "Alle auswählen"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Alle auswählen"
@@ -18921,7 +18627,7 @@ msgstr "A_ktionen"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "Kontakt _kopieren nach …"
+msgstr "Kontakt _kopieren nach..."
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
@@ -18933,17 +18639,17 @@ msgstr "Kontakt _löschen"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
-msgstr "Kontakt _weiterleiten …"
+msgstr "Kontakt _weiterleiten..."
 
 #: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
-msgstr "Kontakt _verschieben nach …"
+msgstr "Kontakt _verschieben nach..."
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
 msgstr "Ordnerkontakte verschie_ben nach"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Neu"
 
@@ -18953,7 +18659,7 @@ msgstr "_Umbenennen"
 
 #: ../ui/evolution-addressbook.xml.h:61
 msgid "_Save Contact as VCard..."
-msgstr "Kontakt als V_Card speichern …"
+msgstr "Kontakt als V_Card speichern..."
 
 #: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
@@ -18961,7 +18667,7 @@ msgstr "Ordnerkontakte als VCa_rd speichern"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
-msgstr "_Nachricht an Kontakt schicken …"
+msgstr "_Nachricht an Kontakt schicken..."
 
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
@@ -19004,7 +18710,6 @@ msgid "Month"
 msgstr "Monat"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Weiter"
 
@@ -19013,7 +18718,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Vorherige"
 
@@ -19101,11 +18806,11 @@ msgstr "Auswahl in die Zwischenablage verschieben"
 msgid "Paste from clipboard"
 msgstr "Inhalt der Zwischenablage einfügen"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Den in der Zwischenablage befindlichen Text einfügen"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
@@ -19140,31 +18845,30 @@ msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
 msgid "Close"
 msgstr "Schließen"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Ein_fügen"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
-msgstr "_Anlage …"
+msgstr "_Anlage..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Datei"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Hilfe"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "Ein_fügen"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Optionen"
@@ -19262,11 +18966,6 @@ msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
 msgid "_Alarms"
 msgstr "_Alarme"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorien"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19332,79 +19031,53 @@ msgid "F_older"
 msgstr "_Ordner"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Nachrichten_vorschau"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner verschieben"
 
 #. 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 "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../ui/evolution-mail-global.xml.h:13
-#, fuzzy
-msgid "Show Message _Preview"
-msgstr "Nachrichten_vorschau"
-
 #: ../ui/evolution-mail-global.xml.h:14
-#, fuzzy
-msgid "Show message preview below the message list"
-msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
-
-#: ../ui/evolution-mail-global.xml.h:15
-#, fuzzy
-msgid "Show message preview side-by-side with the message list"
-msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf entfernten Servern abonnieren oder abbestellen"
 
-#: ../ui/evolution-mail-global.xml.h:18
-#, fuzzy
-msgid "_Classic View"
-msgstr "E_instufung"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
-msgstr "Ordner _kopieren nach …"
+msgstr "Ordner _kopieren nach..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
-msgstr "Ordner verschie_ben nach …"
+msgstr "Ordner verschie_ben nach..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
-msgstr "_Neu …"
-
-#: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
-msgid "_Preview"
-msgstr "Vorschau:"
+msgstr "_Neu..."
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "A_bonnements"
 
-#: ../ui/evolution-mail-global.xml.h:28
-#, fuzzy
-msgid "_Vertical View"
-msgstr "Vertikales Zeichengitter"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners ändern"
@@ -19648,23 +19321,23 @@ msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
 #: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
-msgstr "_Weiterleiten als …"
+msgstr "_Weiterleiten als..."
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
-msgstr "Filter über Mailing_liste …"
+msgstr "Filter über Mailing_liste..."
 
 #: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
-msgstr "Filter über _Absender …"
+msgstr "Filter über _Absender..."
 
 #: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
-msgstr "Filter über _Empfänger …"
+msgstr "Filter über _Empfänger..."
 
 #: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
-msgstr "Filter über _Betreff …"
+msgstr "Filter über _Betreff..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
@@ -19676,7 +19349,7 @@ msgstr "Die gewählten Nachrichten zur Nachverfolgung markieren"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
-msgstr "_Folgenachricht …"
+msgstr "_Folgenachricht..."
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
@@ -19820,19 +19493,19 @@ msgstr "Die gewählten Nachrichten als Textdatei speichern"
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
-msgstr "Suchordner über Mailing_liste …"
+msgstr "Suchordner über Mailing_liste..."
 
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
-msgstr "Suchordner über _Empfänger …"
+msgstr "Suchordner über _Empfänger..."
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
-msgstr "Suchordner über _Betreff …"
+msgstr "Suchordner über _Betreff..."
 
 #: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
-msgstr "Suchordner über _Absender …"
+msgstr "Suchordner über _Absender..."
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
@@ -19952,7 +19625,7 @@ msgstr "_Zitiert"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
-msgstr "Nachricht _speichern …"
+msgstr "Nachricht _speichern..."
 
 #: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
@@ -19963,11 +19636,6 @@ msgid "_Unread"
 msgstr "_Ungelesen"
 
 #: ../ui/evolution-mail-message.xml.h:131
-#, fuzzy
-msgid "_Zoom"
-msgstr "Ansicht ver_größern"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
@@ -19975,7 +19643,7 @@ msgstr "Ansicht ver_größern"
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Hauptwerkzeugleiste"
 
@@ -20052,6 +19720,11 @@ msgstr ""
 msgid "HT_ML"
 msgstr "_HTML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Ein_fügen"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Eine Datei öffnen"
@@ -20086,7 +19759,7 @@ msgstr "Entwurf speichern"
 
 #: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _As..."
-msgstr "Speichern _unter …"
+msgstr "Speichern _unter..."
 
 #: ../ui/evolution-message-composer.xml.h:23
 msgid "Save _Draft"
@@ -20098,7 +19771,7 @@ msgstr "Als Entwurf speichern"
 
 #: ../ui/evolution-message-composer.xml.h:25
 msgid "Save in folder..."
-msgstr "In Ordner speichern …"
+msgstr "In Ordner speichern..."
 
 #: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file"
@@ -20179,7 +19852,7 @@ msgstr "_Von-Feld"
 
 #: ../ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
-msgstr "Ö_ffnen …"
+msgstr "Ö_ffnen..."
 
 #: ../ui/evolution-message-composer.xml.h:50
 msgid "_Post-To Field"
@@ -20327,7 +20000,7 @@ msgstr "Aufgabe ö_ffnen"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
-msgstr "Info zu Evolution …"
+msgstr "Info zu Evolution..."
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
@@ -20372,7 +20045,7 @@ msgstr "Fensterknöpfe verbergen"
 
 #: ../ui/evolution.xml.h:13
 msgid "I_mport..."
-msgstr "I_mportieren …"
+msgstr "I_mportieren..."
 
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
@@ -20382,55 +20055,43 @@ msgstr "Symbole _und Text"
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ../ui/evolution.xml.h:16
-#, fuzzy
-msgid "La_yout"
-msgstr "_Info"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Neues F_enster"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Einstellungen"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Verschicken/Abrufen"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Die Pilot-Einstellungen festlegen"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Informationen zu Evolution anzeigen"
+
 #: ../ui/evolution.xml.h:24
-#, fuzzy
-msgid "Show Side _Bar"
+msgid "Side _Bar"
 msgstr "Sei_tenleiste"
 
 #: ../ui/evolution.xml.h:25
-#, fuzzy
-msgid "Show _Status Bar"
+msgid "Status _Bar"
 msgstr "Stat_usleiste"
 
 #: ../ui/evolution.xml.h:26
-#, fuzzy
-msgid "Show _Toolbar"
-msgstr "_Werkzeugleiste"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Informationen zu Evolution anzeigen"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
@@ -20438,71 +20099,75 @@ msgstr "Fehlerbericht einschicken"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Fehler_bericht einschicken"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "_Werkzeugleiste"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "_Werkzeugleistenstil"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Seitenleiste anzeigen/verbergen"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Statusleiste anzeigen/verbergen"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Info"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "Fenster s_chließen"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Passwörter ver_werfen"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "Schaltflächen verber_gen"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Nur S_ymbole"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Kurzreferenz"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Erscheinungsbild der _Schaltflächen"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
-msgstr "S_ynchronisationsoptionen …"
+msgstr "S_ynchronisationsoptionen..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Nur _Text"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Fenster"
 
@@ -20539,36 +20204,26 @@ msgid "_Work Week View"
 msgstr "_Arbeitswochenansicht"
 
 #: ../views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As Sent Folder for Wi_de View"
-msgstr "Als _Verschickt-Ordner"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Als _Verschickt-Ordner"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Nach _Status"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Nach _Absender"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Nach _Betreff"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Nach _Folgenachricht-Markierung"
 
-#: ../views/mail/galview.xml.h:7
-#, fuzzy
-msgid "For _Wide View"
-msgstr "Arbeitswochenansicht"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Nachrichten"
 
@@ -20584,12 +20239,8 @@ msgstr "Mit _Fälligkeitsdatum"
 msgid "With _Status"
 msgstr "Mit _Status"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20642,10 +20293,10 @@ msgstr "Ansichten für »%s« definieren"
 
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit..."
-msgstr "_Bearbeiten …"
+msgstr "_Bearbeiten..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20659,11 +20310,11 @@ msgstr "Instanz"
 msgid "Save Current View"
 msgstr "Aktuelle Ansicht speichern"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "Neue Ansicht er_stellen"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "Vorhandene Ansicht erset_zen"
 
@@ -20680,7 +20331,7 @@ msgstr "Benutzerdefinierte Ansicht speichern"
 #: ../widgets/menus/gal-view-instance.c:592
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
-msgstr "Ansichten definieren …"
+msgstr "Ansichten definieren..."
 
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "C_urrent View"
@@ -20688,7 +20339,7 @@ msgstr "A_ktuelle Ansicht"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
-msgstr "Benutzerdefinierte Ansicht speichern …"
+msgstr "Benutzerdefinierte Ansicht speichern..."
 
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
@@ -20710,19 +20361,14 @@ msgstr "Art der Ansicht"
 msgid "Type of view:"
 msgstr "Art der Ansicht:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Automatische Anzeige der Anlage vorschlagen"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20790,11 +20436,11 @@ msgid "Minimum Width"
 msgstr "Mindestbreite"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Abstand"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Jetzt"
 
@@ -20893,7 +20539,7 @@ msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 
 #: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
-msgstr "Weitere …"
+msgstr "Weitere..."
 
 #: ../widgets/misc/e-charset-picker.c:482
 msgid "Ch_aracter Encoding"
@@ -20901,7 +20547,7 @@ msgstr "_Zeichenkodierung"
 
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
-msgstr " …"
+msgstr "..."
 
 #: ../widgets/misc/e-dateedit.c:321
 msgid "Date and Time"
@@ -20923,43 +20569,33 @@ msgstr "Auswahlliste für die Zeit"
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../widgets/misc/e-dateedit.c:461
-#, fuzzy
-msgid "No_w"
-msgstr "Jetzt"
-
-#: ../widgets/misc/e-dateedit.c:467
-#, fuzzy
-msgid "_Today"
-msgstr "Heute"
-
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%k:%M"
 
 #. 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
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Ausgeklappt"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Ist der Ausklapper ausgeklappt?"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Text der Ausklapperbeschriftung"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Unterstrich verwenden"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20967,95 +20603,75 @@ msgstr ""
 "Legt fest, ob ein Unterstrich im Text anzeigt, dass das nächste Zeichen als "
 "Kürzelbuchstabe verwendet werden soll"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Zwischen die Beschriftung und das Kind einzufügende Polsterung"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Beschriftungs-Widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Ein Widget, das anstatt der normalen Ausklapperbeschriftung angezeigt werden "
 "soll"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Ausklappergröße"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Größe des Ausklapppfeils"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikator-Polsterung"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Polsterung um Aufklapppfeil"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Suche speichern"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Suchen"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Suchen"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Suche speichern"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
-msgstr "Suche _speichern …"
+msgstr "Suche _speichern..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
-msgstr "Gespeicherte Suchen _bearbeiten …"
+msgstr "Gespeicherte Suchen _bearbeiten..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
-msgstr "Er_weiterte Suche …"
-
-#: ../widgets/misc/e-filter-bar.h:103
-#, fuzzy
-msgid "All Accounts"
-msgstr "E-Mail-Konten"
-
-#: ../widgets/misc/e-filter-bar.h:104
-#, fuzzy
-msgid "Current Account"
-msgstr "Quellkonto"
-
-#: ../widgets/misc/e-filter-bar.h:105
-#, fuzzy
-msgid "Current Folder"
-msgstr "Ordner anlegen"
-
-#: ../widgets/misc/e-filter-bar.h:106
-#, fuzzy
-msgid "Current Message"
-msgstr "Nachrichten ö_ffnen"
+msgstr "Er_weiterte Suche..."
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Bild wählen"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Weltkarte"
 
-#: ../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."
@@ -21088,47 +20704,45 @@ msgstr "Rückfluss-Modell"
 msgid "Column width"
 msgstr "Spaltenbreite"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Suchen"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Verwerfen"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Suchtyp"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Objektkennung"
 
-#: ../widgets/misc/e-search-bar.c:792 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "Kennung des Unterobjekts"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "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:911
-msgid "Show: "
-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:927
-#, fuzzy
-msgid "S_earch: "
-msgstr "Suchen"
-
-#. 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:938
-#, fuzzy
-msgid " in "
-msgstr " und "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "_Jetzt suchen"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -21177,8 +20791,7 @@ msgid "A_uto-delete sent item"
 msgstr "Gesendetes Element a_utomatisch löschen"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-#, fuzzy
-msgid "Classification"
+msgid "C_lassification"
 msgstr "E_instufung"
 
 #: ../widgets/misc/e-send-options.glade.h:7
@@ -21203,23 +20816,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
+"Öffentlich\n"
+"Privat\n"
+"Vertraulich\n"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "Rüc_kmeldung gewünscht"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusverfolgung"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -21231,51 +20844,51 @@ msgstr ""
 "Normal\n"
 "Niedrig"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Wenn a_ngenommen:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Wenn a_bgeschlossen:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Wenn abge_lehnt:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "B_innen"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "D_anach:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Alle Informationen"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "Ver_zögerungsnachricht zustellen"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "Zuge_stellt"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "_Verfallsdatum angeben"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Bis:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Wenn passend"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "_Wenn geöffnet:"
 
@@ -21295,7 +20908,7 @@ msgstr "Hier klicken, um zur Adresse zu gehen"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
-msgstr "Hauptkategorienliste bearbeiten …"
+msgstr "Hauptkategorienliste bearbeiten..."
 
 #: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
@@ -21329,23 +20942,23 @@ msgstr "Fokussierte Spalte"
 msgid "Unselected Column"
 msgstr "Nicht markierte Spalte"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Durchgestrichene Spalte"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Unterstrichene Spalte"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Fette Spalte"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Farbige Spalte"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Spalte für Hintergrundfarbe"
 
@@ -21360,7 +20973,6 @@ msgstr "_Verfügbare Felder:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -21371,7 +20983,6 @@ msgstr "Alles entfernen"
 
 #: ../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 "Descending"
 msgstr "Absteigend"
 
@@ -21427,12 +21038,12 @@ msgstr "Hinzu_fügen ->"
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "_Fields Shown..."
-msgstr "An_gezeigte Felder …"
+msgstr "An_gezeigte Felder..."
 
 #: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
 msgid "_Sort..."
-msgstr "_Sortieren …"
+msgstr "_Sortieren..."
 
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
@@ -21460,7 +21071,7 @@ msgstr "Verfügbare Felder"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
-msgstr "_Gruppieren nach …"
+msgstr "_Gruppieren nach..."
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
@@ -21469,20 +21080,20 @@ msgstr "Diese Felder der Reihe nach an_zeigen:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Ziehen und Ablegen-Code"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Alle Kopfzeilen"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 msgid "Add a column..."
-msgstr "Spalte hinzufügen …"
+msgstr "Spalte hinzufügen..."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
@@ -21594,70 +21205,65 @@ msgstr "Einheitliche Zeilenhöhe"
 msgid "Frozen"
 msgstr "Eingefroren"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Aufsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Absteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Nicht sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Nach diesem Feld gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Nach Fächern gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Diese Spalte entfernen"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
-msgstr "Spalte hinzufügen …"
+msgstr "Spalte hinzufügen..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Optimal"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
-msgstr "Spalten formatieren …"
+msgstr "Spalten formatieren..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
-msgstr "Aktuelle Ansicht anpassen …"
+msgstr "Aktuelle Ansicht anpassen..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-#, fuzzy
-msgid "Sort By"
-msgstr "Sortieren"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Schriftsatz"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Sortierinfos"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21838,77 +21444,6 @@ msgstr "EM-Kontext"
 msgid "Handle Popup"
 msgstr "Handle-Popup"
 
-#~ msgid "Category is"
-#~ msgstr "Kategorie ist"
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "_Kalender:"
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "date-end"
-#~ msgstr "datum-ende"
-
-#~ msgid "date-start"
-#~ msgstr "datum-anfang"
-
-#~ msgid "_Memo"
-#~ msgstr "_Notiz"
-
-#~ msgid "      "
-#~ msgstr "      "
-
-#~ msgid "Original Location"
-#~ msgstr "Ursprünglicher Speicherort"
-
-#~ msgid "Search Type"
-#~ msgstr "Suchtyp"
-
-#~ msgid "Subitem ID"
-#~ msgstr "Kennung des Unterobjekts"
-
-#, fuzzy
-#~ msgid "Find No_w"
-#~ msgstr "_Jetzt suchen"
-
-#~ msgid "C_lassification"
-#~ msgstr "E_instufung"
-
-#~ msgid ""
-#~ "Public\n"
-#~ "Private\n"
-#~ "Confidential\n"
-#~ msgstr ""
-#~ "Öffentlich\n"
-#~ "Privat\n"
-#~ "Vertraulich\n"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Videokonferenz"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "_Ort:"
-
-#~ msgid "Dele_gatees"
-#~ msgstr "Dele_gaten"
-
-#~ msgid "From:"
-#~ msgstr "Von:"
-
-#~ msgid "Properties..."
-#~ msgstr "Eigenschaften …"
-
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Ausgabedatei konnte nicht angelegt werden: %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"
@@ -21924,9 +21459,6 @@ msgstr "Handle-Popup"
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "Ihre Nachricht mit dem Betreff »{0}« wurde nicht zugestellt."
 
-#~ msgid "_Insert"
-#~ msgstr "Ein_fügen"
-
 #~ msgid "(%ld seconds)"
 #~ msgstr "(%ld Sekunden)"
 
@@ -21974,7 +21506,7 @@ msgstr "Handle-Popup"
 #~ "zu verwenden, da Ihre Verbindung bereits sicher ist."
 
 #~ msgid "Advanced..."
-#~ msgstr "Komplex …"
+#~ msgstr "Komplex..."
 
 #~ msgid "Select target addressbook."
 #~ msgstr "Wählen Sie das Zieladressbuch."
@@ -22134,10 +21666,10 @@ msgstr "Handle-Popup"
 #~ msgstr "<b>Von:</b>"
 
 #~ msgid "_Delegate To..."
-#~ msgstr "_Delegieren an …"
+#~ msgstr "_Delegieren an..."
 
 #~ msgid "Con_tacts..."
-#~ msgstr "_Kontakte …"
+#~ msgstr "_Kontakte..."
 
 #~ msgid "Assignment"
 #~ msgstr "Arbeitsauftrag"
@@ -22215,7 +21747,7 @@ msgstr "Handle-Popup"
 #~ msgstr "Filter"
 
 #~ msgid "Execute Command..."
-#~ msgstr "Befehl ausführen …"
+#~ msgstr "Befehl ausführen..."
 
 #~ msgid "T_erminal Font:"
 #~ msgstr "_Terminal-Schrift:"
@@ -22328,7 +21860,7 @@ msgstr "Handle-Popup"
 #~ msgstr "Verschieben"
 
 #~ msgid "_About Evolution..."
-#~ msgstr "_Info zu Evolution …"
+#~ msgstr "_Info zu Evolution..."
 
 #~ msgid "_Send / Receive"
 #~ msgstr "_Verschicken/Abrufen"
diff --git a/po/dz.po b/po/dz.po
index 44cff41cf6..152ba3afcf 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,14 +1,13 @@
 # Dzongkha translation of evolution
-# Copyright @ 2006 Free Software Foundation. Inc.
+# Copyright @ 2006 Free Software Foundation, Inc.
 # Mindu Dorji
 #
-#: ../mail/em-format-html-display.c:680
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.dz\n"
+"Project-Id-Version: evolution 2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-18 19:21+0530\n"
-"PO-Revision-Date: 2006-07-18 13:59+0530\n"
+"POT-Creation-Date: 2006-05-24 04:40+0200\n"
+"PO-Revision-Date: 2006-05-24 14:30+0530\n"
 "Last-Translator: Mindu Dorji\n"
 "Language-Team: DZONGKHA <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +20,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཁ་བྱང་ཀི་དེབ།"
 
@@ -35,12 +34,12 @@ msgstr "འབྲེལ་ས་གསརཔ།"
 msgid "New Contact List"
 msgstr "འབྲེལ་ས་གསར་པའི་ཐོ་ཡིག"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "ད་ལྟོའི་ཁ་བྱང་ཀི་དེབ་སྣོད་འཛིན་%sལུ་ ཤོག་བྱང་ %d འདུག"
-msgstr[1] "ད་ལྟོའི་ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་འཛིན་%sལུ་ ཤོག་བྱང་ %d འདུག"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "ད་ལྟོའི་ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་འཛིན་ལུ་ ཤོག་བྱང་ %d འདུག"
+msgstr[1] "ད་ལྟོའི་ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་འཛིན་ལུ་ ཤོག་བྱང་ %d འདུག"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -59,32 +58,32 @@ msgstr "འབྲེལ་ས:"
 msgid "evolution minicard"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ ཤོག་བྱང་ཆུང་བ།"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "འདི་ལུ་འཇིགས་བརྡ་འདུག"
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "འདི་ལུ་སླར་འབྱུང་འདུག"
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "འདི་འཛོམས་འདུ་ཅིག་ཨིན་པས།"
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ཟླ་ཐོའི་བྱུང་ལས་: བཅུད་དོན་%s.ཨིན།"
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "ཟླ་ཐོའི་བྱུང་ལས་: འདི་ལུ་བཅུད་དོན་མིན་འདུག"
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "ཟླ་ཐོའི་མཐོང་སྣང་བྱུང་ལས།"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "ཆེད་དམིགས་བཟུང་།"
 
@@ -113,47 +112,39 @@ msgstr "ཚེས་གྲངས་ལུ་འགྱོ།"
 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:149
+#: ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "འདི་ལུ་ བྱུང་ལས་%dའདུག"
 msgstr[1] "འདི་ལུ་བྱུང་ལས་%dའདུག"
 
-#. 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:151
+#: ../a11y/calendar/ea-week-view.c:152
 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ཉིནམ་གི་མཐོང་སྣང་: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "ལཱ་གི་བདུན་ཕྲག་ཅིག་གི་དོན་ལུ་ཟླ་ཐོའི་མཐོང་སྣང་།"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "ཉིནམ་གཅིག་གམ་ དེ་ལས་མང་བའི་ཟླ་ཐོའི་མཐོང་སྣང་།"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:679
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -164,20 +155,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:190
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711
+#: ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -185,10 +175,10 @@ msgstr "%a %d %b %Y"
 #: ../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:703
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/calendar-component.c:716
-#: ../calendar/gui/calendar-component.c:718
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -198,11 +188,10 @@ 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:220
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -332,21 +321,9 @@ msgstr "སྔོན་སྒྲིག་ཤུགས་ལྡན་བཟོ།
 msgid "Popup Menu"
 msgstr "པོཔ་ཨཔ་དཀར་ཆག"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སོར་སྟོན་འབད།"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "ཤུགས་ལྡན་བཟོ།"
-
 #: ../addressbook/addressbook.error.xml.h:1
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"ཁ་བྱང་འདི་དང་གཅིག་ཁར་ འབྲེལ་ས་ཅིག་ ཧེ་མ་ལས་རང་འདུག  ཁྱོད་ཀྱིས་ཁ་བྱང་འདི་དང་གཅིག་ཁར་ ཤོག་བྱང་"
-"གསརཔ་ཅིག་ གང་རུང་སྦེ་ ཁ་སྐོང་བརྐྱབ་ནི་ཨིན་ན?"
+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
 msgid "Address '{0}' already exists."
@@ -361,14 +338,8 @@ msgid "Category editor not available."
 msgstr "དབྱེ་རིམ་ཞུན་དགཔམིན་འདུག"
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"ཁྱོད་རའི་ཆོག་ཡིག་གི་སྡེབ་ འཛོལ་མ་འཛོལ་དང་ རྒྱབ་སྐྱོར་ཡོད་པའི་ ནང་བསྐྱོད་ཐབས་ཤེས་ཅིག་ཨིན་མིན་ ཞིབ་དཔྱད་"
-"འབད། ཆོག་ཡིག་མང་རབས་ཅིག་ ཡི་གུ་ཆེ་ཆུང་ལུ་རགས་ལསཔ་ཨིནམ་ སེམས་ཁར་དྲན། ཁྱོད་རའི་ཚུགས་ལྡེ་ཨཱོན་སྦེ་"
-"ཡོདཔ་འོང་།"
+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
 msgid "Could not get schema information for LDAP server."
@@ -379,14 +350,8 @@ msgid "Could not remove addressbook."
 msgstr "ཁ་བྱང་ཀི་དེབ་ རྩ་བསྐྲད་བཏང་མ་ཚུགས།"
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"ད་ལྟོ་ཁྱོད་ཀྱིས་ཇི་ནོམ་ནང་ལས་ སྡེ་རིམ་རིམ་ལུགས་ཁ་བྱང་ཀི་དེབ་རྐྱངམ་གཅིག་ལུ་ འཛུལ་སྤྱོད་འབད་ཚུགས། ཁྱོད་རའི་"
-"སྡེ་རིམ་གྱི་འཕྲལ་འཕྲལ་འབྱུང་མི་འབྲེལ་ས་དང་ སྡེ་རིམ་གྱི་རང་དོན་འབྲལ་སའི་སྣོད་འཛིན་ཚུ་འཐོབ་ནིའི་དོན་ལུ་ ཐེངས་"
-"གཅིག་སྡེ་རིམ་ཡིག་འཕྲིན་གྱི་ཞབས་ཏོག་སྤྱོད་མི་གཞན་ཅིག་ ལག་ལེན་འཐབ་གནང་།"
+msgid "Currently you can access only GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once, to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr "ད་ལྟོ་ཁྱོད་ཀྱིས་ ཨི་བོ་ལུ་ཤཱན་ནང་ལས་ སྡེ་རིམ་རིམ་ལུགས་ཁ་བྱང་ཀི་དེབ་རྐྱངམ་གཅིག་ལུ་ འཛུལ་སྤྱོད་འབད་ཚུགས། ཁྱོད་རའི་སྡེ་རིམ་གྱི་འབྱུང་ཐེངས་འབྲེལ་ས་དང་ སྡེ་རིམ་གྱི་རང་དོན་འབྲེལ་སའི་སྣོད་འཛིན་ཚུ་ལེན་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་ཐེངས་གཅིག་ སྡེ་རིམ་ཡིག་འཕྲིན་གྱི་ཞབས་ཏོག་སྤྱོད་མི་གཞན་ཅིག་ ལག་ལེན་འཐབ་གནང་།"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
@@ -425,20 +390,12 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཁ་བྱང་ཀི་དེབ་དེ་ རེ་བ་མེད་པར་ སྤངས་ད་ནུག"
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"ཁྱོད་ཀྱིས་སེལ་འཐུ་འབད་མི་ གཟུགས་བརྙན་དེ་སྦོམ་དྲགས་པས། སླར་ཚད་སྒྲིག་འབད་དེ་ གསོག་འཇོག་འབད་ནི་ཨིན་ན?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "ཁྱོད་ཀྱིས་སེལ་འཐུ་འབད་མི་ གཟུགས་བརྙན་དེ་སྦོམ་དྲགས་པས། སླར་ཚད་སྒྲིག་འབད་དེ་ གསོག་འཇོག་འབད་ནི་ཨིན་ན?"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"ཨེལ་ཌི་ཨེ་པི་འདི་གིས་ བྱ་ལས་འདི་ལུ་ རྒྱབ་སྐྱོར་མི་འབད་བའི་ ཨེལ་ཌི་ཨེ་པི་གི་ ཐོན་རིམ་རྙིངམ་ཅིག་ ལག་ལེན་"
-"འཐབ་དོ་འོང་ནིའམ་ རིམ་སྒྲིག་འཛོལ་བ་འོང་ནི་མས། ཁྱོད་རང་གི་བདག་སྐྱོང་པ་ལས་ རྒྱབ་སྐྱོར་ཡོད་པའི་ འཚོལ་ཞིབ་"
-"གཞི་རྟེན་ཚུ་ལེན།"
+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:20
 msgid "This address book will be removed permanently."
@@ -453,12 +410,8 @@ msgid "This addressbook server does not have any suggested search bases."
 msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་ སར་བར་འདི་ལུ་ བསམ་འཆར་བཀོད་མི་ འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་ ག་ནི་ཡང་མིན་འདུག"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"ཁ་བྱང་ཀི་དེབ་ཀྱི་ སར་བར་འདི་ ལྷོད་སར་མིན་འདུག་ ཡང་ཅིན་ སར་བར་གྱི་མིང་གི་ ཡིག་སྡེབ་འཛོལ་སོངཔ་དང་ "
-"ཡང་ཅིན་ ཡོངས་འབྲེལ་གྱི་ མཐུད་ལམ་མེདཔ་འོང་ནི་མས།"
+msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་ སར་བར་འདི་ ལྷོད་སར་མིན་འདུག་ ཡང་ཅིན་ སར་བར་གྱི་མིང་གི་ ཡིག་སྡེབ་འཛོལ་སོངཔ་དང་ ཡང་ཅིན་ ཡོངས་འབྲེལ་གྱི་ མཐུད་ལམ་མེདཔ་འོང་ནི་མས།"
 
 #: ../addressbook/addressbook.error.xml.h:24
 msgid "This server does not support LDAPv3 schema information."
@@ -481,35 +434,23 @@ msgid "Would you like to save your changes?"
 msgstr "ཁྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ བསྲུང་ནི་ཨིན་ན?"
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"ཁྱོད་ཀྱིས་འབྲེལ་ས་ཅིག་ ཁ་བྱང་ཀི་དེབ་ གཅིག་ལས་གཅིག་ལུ་ སྤོ་བཤུད་འབད་ནིའི་ དཔའ་བཅམ་ཨིན་རུང་ འབྱུང་"
-"ཁུངས་ནང་ལས་ རྩ་བསྐྲད་གཏང་མི་ཚུགས་པས། དེ་གི་ཚབ་ལུ་ འདྲ་བཤུས་ཅིག་བསྲུང་ནི་ཨིན་ན?"
+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:30
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"ཁྱོད་ཀྱིས་རྒྱབ་སྐྱོར་མེད་པའི་ སྡེ་རིམ་སར་བར་ཅིག་ལུ་ མཐུད་ནིའི་འབད་དོ་ཡོདཔ་ལས་ ཨི་བོ་ལུ་ཤཱན་ ལག་ལེན་འཐབ་"
-"ནི་ལུ་ དཀའ་ངལ་འབྱུང་འོང་། གྲུབ་འབྲས་ཡང་དག་འབྱུང་ཐབས་ལུ་ སར་བར་དེ་ རྒྱབ་སྐྱོར་ཡོད་པའི་ཐོན་རིམ་ཅིག་"
-"ལུ་ ཡར་བསྐྱེད་འབད་དགོ"
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+msgstr "ཁྱོད་ཀྱིས་རྒྱབ་སྐྱོར་མེད་པའི་ སྡེ་རིམ་སར་བར་ཅིག་ལུ་ མཐུད་ནིའི་འབད་དོ་ཡོདཔ་ལས་ ཨི་བོ་ལུ་ཤཱན་ ལག་ལེན་འཐབ་ནི་ལུ་ དཀའ་ངལ་འབྱུང་འོང་། གྲུབ་འབྲས་ཡང་དག་འབྱུང་ཐབས་ལུ་ སར་བར་དེ་ རྒྱབ་སྐྱོར་ཡོད་པའི་ཐོན་རིམ་ཅིག་ལུ་ ཡར་བསྐྱེད་འབད་དགོ"
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "ཁྱོད་ཀྱིས་འབྲེལ་ས་འདི་ལུ་ ལེགས་བཅོས་འབད་ཡི། བསྒྱུར་བཅོས་དེ་ཚུ་ བསྲུང་ནི་ཨིན་ན?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་མ་བཙུགས་ཚུན་ཚོད་ ཁྱོད་ཀྱི་འབྲེལ་ས་{0}དེ་འཐོབ་མི་ཚུགས།"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -521,7 +462,7 @@ msgid "_Discard"
 msgstr "བཏོན་བཀོག (_D)"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -561,9 +502,10 @@ 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:265 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "འབྲེལ་ས་ཚུ།"
 
@@ -603,11 +545,15 @@ msgstr "ཁྱོད་རའི་ ཨེསི་/མ་ཡིམ་ ལག་
 #. 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:227
-#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
-#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194
+#: ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567
+#: ../calendar/gui/migration.c:1075
+#: ../calendar/gui/tasks-component.c:190
+#: ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201
+#: ../mail/mail-component.c:299
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "གློག་རིག་འདི་གུ།"
@@ -620,11 +566,15 @@ msgstr "གློག་རིག་འདི་གུ།"
 #: ../addressbook/gui/component/addressbook-component.c:149
 #: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:235
-#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
-#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575
+#: ../calendar/gui/migration.c:1083
+#: ../calendar/gui/tasks-component.c:198
+#: ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1054
+#: ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "རང་དོན།"
 
@@ -651,7 +601,7 @@ 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-config.c:1202
 msgid "New Address Book"
 msgstr "ཁ་བྱང་ཀི་དེབ་གསརཔ།"
 
@@ -665,75 +615,78 @@ msgstr "ཁ་བྱང་ཀི་དེབ་གསརཔ་ཅིག་ ག�
 
 #: ../addressbook/gui/component/addressbook-component.c:406
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་གཞི་སྒྲིག་གམ་ སྣོད་འཛིན་ཚུ་ ཡར་སྐྱེད་འབད་མ་ཚུགས།"
+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:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
-msgstr "དབྱེ་བ་: (_T)"
+msgstr "དབྱེ་བ: (_T)"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../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/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: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:2021
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222
+#: ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ཡོངས་ཁྱབ།"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "ཁ་བྱང་ཀི་དེབ།"
 
-#: ../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/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
+#: ../mail/mail-dialogs.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "རྒྱས་བཤད།"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 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:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་རྒྱུ་དངོས།"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153
+#: ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "གཞིས་སྤོ་དོ་..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200
+#: ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s':གཞིས་སྤོ་དོ།"
@@ -748,13 +701,11 @@ msgstr "རང་བཞིན་མཇུག་སྡུད་ གཞི་ས�
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1119
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"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 ""
-"ཨི་བོ་ལུ་ཤཱན་1.x.ལས་ཚུར་ ཨི་བོ་ལུ་ཤཱན་གྱི་ འབྲེལ་སའི་སྣོད་འཛིན་ཚུ་གི་ གནས་ཁོངས་དང་ སྡེ་རིམ་ཚུ་ གྱུར་ཡར་"
-"སོ་ནུག\n"
+"ཨི་བོ་ལུ་ཤཱན་1.x.ལས་ཚུར་ ཨི་བོ་ལུ་ཤཱན་གྱི་ འབྲེལ་སའི་སྣོད་འཛིན་ཚུ་གི་ གནས་ཁོངས་དང་ སྡེ་རིམ་ཚུ་ གྱུར་ཡར་སོ་ནུག\n"
 "\n"
 "ཨི་བོ་ལུ་ཤཱན་ ཁྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་བའི་རིང་ལུ་ བཟོད་པ་བསྒོམ་གནང་། "
 
@@ -806,37 +757,43 @@ msgstr "སྣོད་འཛིན་གྱི་མིང་ཚུ་ནང་
 
 #: ../addressbook/gui/component/addressbook-view.c:445
 msgid "A Folder with this name already exists"
-msgstr "མིང་འདི་ཡོད་མི་ སྣོད་འཛིན་ཅིག་ཧེ་མ་ལས་རང་འདུག"
+msgstr "མིང་འདི་འབད་མི་ སྣོད་འཛིན་ཅིག་ ཧེ་མ་ལས་རང་འདུག"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "ཁ་བྱང་ཀི་དེབ་གསརཔ།(_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:556
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
-#: ../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
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617
+#: ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/memos-component.c:452
+#: ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091
+#: ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
-msgstr "བཏོན་གཏང་། (_D)"
+msgstr "བཏོན་བཏང་། (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
-msgstr "ཝི་ཤོག་བྱང་སྦེ་སྲུངས་..."
+msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་སྲུངས་..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:557
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/memos-component.c:453
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "རྒྱུ་དངོས་ཚུ་...(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "འབྲེལ་སའི་འབྱུང་ཁུངས་སེལ་བྱེད།"
 
@@ -845,7 +802,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "མིང་མེད་ཐོག་ལས་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ འཛུལ་སྤྱོད་འབད་དོ།"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "བདེན་བཤད་འབད་མ་ཚུགས།\n"
 
@@ -868,22 +825,16 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "མཇུག་བསྡུ་བའི་ ཡུ་ཨར་ཨའི་ཚུ་གི་ ཐོ་ཡིག་གི་དོན་ལས་ ཨི་ཕཱོལ་ཌར་ལིསིཊི་ ཨེགསི་ཨེམ་ཨེལ།"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"ཤོག་བྱང་དང་ ཐོ་ཡིག་མཐོང་སྣང་ དེ་ལས་ སྔོན་ལྟའི་པེན་གྱི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་།"
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgstr "ཤོག་བྱང་དང་ ཐོ་ཡིག་མཐོང་སྣང་ དེ་ལས་ སྔོན་ལྟའི་པེན་གྱི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་།"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
 msgstr "སྔོན་ལྟའི་པེན་སྟོན།"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་གྱིས་ རང་བཞིན་མཇུག་བསྡུ་ མ་འབད་བའི་ཧེ་མར་ ཡིག་འབྲུའི་ཨང་གྲངས་ཚུ་ ཡིག་དཔར་བརྐྱབ་དགོ"
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgstr "ཨི་བོ་ལུ་ཤཱན་གྱིས་ རང་བཞིན་མཇུག་བསྡུ་ མ་འབད་བའི་ཧེ་མར་ ཡིག་འབྲུའི་ཨང་གྲངས་ཚུ་ ཡིག་དཔར་བརྐྱབ་དགོ"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -894,7 +845,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "མིང་སེལ་འཐུའི་ཌའི་ལོག་ནང་ མཐའ་མཇུག་ལག་ལེན་འཐབ་མི་ སྣོད་འཛིན་གྱི་དོན་ལུ་ ཡུ་ཨར་ཨའི།"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "ཀེར་ཕྲང་པེན་གྱི་གནས་ས།"
 
@@ -973,11 +924,8 @@ 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."
-msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་སར་བར་དང་གཅིག་ཁར་ བདེན་བཤད་འབད་ནིའི་དོན་ལུ་ གློག་འཕྲིན་ཁ་བྱང་འདི་ ལག་ལེན་"
-"འཐབ་འོང་།"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་སར་བར་དང་གཅིག་ཁར་ བདེན་བཤད་འབད་ནིའི་དོན་ལུ་ གློག་འཕྲིན་ཁ་བྱང་འདི་ ལག་ལེན་འཐབ་འོང་།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -985,7 +933,7 @@ msgstr "སྲིད་པའི་འཚོལ་ཞིབ་ གཞི་ར�
 
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
-msgstr "ནང་བཀོད་འབད་: (_g)"
+msgstr "ནང་བཀོད་འབད: (_g)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:776
@@ -997,7 +945,7 @@ msgstr "ནམ་ཡང་།"
 #: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
-msgstr "གསང་བཟོ་འབད་ནི་མེད།"
+msgstr "གསང་བཟོ་མིན་འདུག།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
@@ -1013,11 +961,11 @@ msgstr "ཨེསི་ཨེསི་ཨེལ་གསང་བཟོ།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
-msgstr "འཚོལ་ཞིབ་ཚགས་མ།"
+msgstr "ཚགས་མའཚོལ་ཞིབ་འབད།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
-msgstr "འཚོལ་ཞིབ་གཞི་རྟེན་: (_b)"
+msgstr "འཚོལ་ཞིབ་གཞི་རྟེན: (_b)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
@@ -1028,38 +976,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 ""
-"གདམ་ཁ་འདི་ སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ ཨེསི་ཨེསི་ཨེལ་ལུ་ རྒྱབ་སྐྱོར་ཡོད་པ་ཅིན་ "
-"ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་རྐྱངམ་གཅིག་མཐུད་འོང་།"
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "གདམ་ཁ་འདི་ སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ ཨེསི་ཨེསི་ཨེལ་ལུ་ རྒྱབ་སྐྱོར་ཡོད་པ་ཅིན་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་རྐྱངམ་གཅིག་མཐུད་འོང་།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"གདམ་ཁ་འདི་ སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་སྐྱོར་ཡོད་པ་ཅིན་ ཨི་"
-"བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་རྐྱངམ་གཅིག་མཐུད་འོང་།"
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "གདམ་ཁ་འདི་ སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་སྐྱོར་ཡོད་པ་ཅིན་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་རྐྱངམ་གཅིག་མཐུད་འོང་།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"གདམ་ཁ་འདི་སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་སར་བར་གྱིས་ ཨེསི་ཨེསི་ཨེལ་ ཡང་ན་ ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་སྐྱོར་མི་"
-"འབད། འདི་གིས་སྦེ་ ཁྱོད་ཀྱི་མཐུད་ལམ་ལུ་ མཐའ་བཙན་མེདཔ་ལས་ གནོད་ཉེན་ཡོད།"
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "གདམ་ཁ་འདི་སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་སར་བར་གྱིས་ ཨེསི་ཨེསི་ཨེལ་ ཡང་ན་ ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་སྐྱོར་མི་འབད། འདི་གིས་འབད་ ཁྱོད་ཀྱི་མཐུད་ལམ་ལུ་ མཐའ་བཙན་མེདཔ་ལས་ གནོད་ཉེན་ཡོད།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1078,66 +1008,32 @@ msgid "TLS encryption"
 msgstr "ཊི་ཨེལ་ཨེསི་གསང་བཟོ།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་འདི་ ཁྱོད་ཀྱི་འཚོལ་ཞིབ་ འགོ་བཙུགས་སའི་ ཐོ་བཀོད་ཀྱི་ཁྱད་འཕགས་མིང་(ཌི་ཨེན)དེ་ཨིན། "
-"ཁྱོད་ཀྱིས་འདི་སྟོངམ་སྦེ་བཞག་པ་ཅིན་ འཚོལ་ཞིབ་དེ་ སྣོད་ཐོ་རྩ་འབྲེལ་གྱི་རྩ་བ་ལས་ འགོ་བཙུགས་འོང་།"
+msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་འདི་ ཁྱོད་ཀྱི་འཚོལ་ཞིབ་ འགོ་བཙུགས་སའི་ ཐོ་བཀོད་ཁྱད་འཕགས་ཀྱི་མིང་(ཌི་ཨེན)དེ་ཨིན། ཁྱོད་ཀྱིས་འདི་ སྟོངམ་སྦེ་བཞག་པ་ཅིན་ འཚོལ་ཞིབ་དེ་ སྣོད་ཐོ་རྩ་འབྲེལ་གྱི་ རྩ་བ་ལས་ འགོ་བཙུགས་འོང་།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"འཚོལ་ཞིབ་ཀྱི་འོས་སྐབས་འདི་གིས་ སྣོད་ཐོ་རྩ་འབྲེལ་ལུ་ གཏིང་ཟབ་ག་དེ་ཚུན་ཚོད་ འཚོལ་ཞིབ་འབད་ནི་ཨིན་ན་ ངེས་"
-"འཛིན་འབདཝ་ཨིན། འཚོལ་ཞིབ་འོས་སྐབས་ \"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"
-"\"."
-msgstr ""
-"འདི་ཁྱོད་ཀྱི་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་མིང་ ཆ་ཚང་ཨིན། དཔྱེ་འབད་བ་ཅིན་ \"ldap.mycompany.com\"."
+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
-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\" གུ་བཀལཝ་"
-"ད་ ཁྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ མིང་མེད་ཀྱི་འཛུལ་སྤྱོད་དགོ"
+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
-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 ""
-"ཨི་བོ་ལེ་ཤཱན་གྱིས་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་གུ་མཐུད་ནིའི་ མཐུད་ལམ་འདི་ཨིན། ཚད་ལྡན་མཐུད་ལམ་གྱི་ ཐོ་ཡིག་ཅིག་"
-"བྱིན་ཏེ་ཡོདཔ་ལས་ མཐུད་ལམ་ག་ཅི་ གསལ་བཀོད་འབད་དགོཔ་ཨིན་ན་ ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་ལུ་དྲིས།"
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "ཨི་བོ་ལེ་ཤཱན་གྱིས་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་གུ་མཐུད་ནིའི་ མཐུད་ལམ་འདི་ཨིན། ཚད་ལྡན་མཐུད་ལམ་གྱི་ ཐོ་ཡིག་ཅིག་བྱིན་ཏེ་ཡོདཔ་ལས་ མཐུད་ལམ་ག་ཅི་ གསལ་བཀོད་འབད་དགོཔ་ཨིན་ན་ ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་ལུ་དྲིས།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
@@ -1153,41 +1049,41 @@ msgstr "ནམ་འབད་ཚུགསཔ་ཅིག"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
-msgstr "ཁ་བྱང་ཀི་དེབ་ཁ་སྐོང་རྐྱབས། (_A)"
+msgstr "ཁ་བྱང་ཀི་དེབ་ ཁ་སྐོང་རྐྱབས། (_A)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
-msgstr "ཕབ་ལེན་གྱི་བཅད་ཚད་:(_D)"
+msgstr "ཕབ་ལེན་གྱི་བཅད་ཚད:(_D)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
-msgstr "སྲིད་པའི་འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་འཚོལ། (_F)"
+msgstr "སྲིད་པའི་འཚོལ་ཞིབ་ཀྱི་ གཞི་རྟེན་འཚོལ། (_F)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
-msgstr "ནང་བསྐྱོད་ཐབས་ཤེས་: (_L)"
+msgstr "ནང་བསྐྱོད་ཐབས་ཤེས: (_L)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:163
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "མིང་: (_N)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
-msgstr "འདྲེན་ལམ་: (_P):"
+msgstr "འདྲེན་ལམ། (_P):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
-msgstr "འཚོལ་ཞིབ་ཀྱི་འོས་སྐབས་: (_S)"
+msgstr "འཚོལ་ཞིབ་ཀྱི་འོས་སྐབས: (_S)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
-msgstr "སར་བར་:(_S)"
+msgstr "སར་བར:(_S)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
@@ -1195,7 +1091,7 @@ msgstr "ངལ་མཚམས་: (_T)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
-msgstr "མཐའ་བཙན་ལྡན་པའི་ མཐུད་ལམ་ལག་ལེན་འཐབ་: (_U)"
+msgstr "མཐའ་བཙན་ལྡན་པའི་ མཐུད་ལམ་ལག་ལེན་འཐབ: (_U)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
@@ -1205,7 +1101,8 @@ msgstr "ཤོག་བྱང་།"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -1217,15 +1114,17 @@ msgstr "སྐར་མ།"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h: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
@@ -1270,13 +1169,13 @@ msgstr "<b>ལཱ་གཡོག་</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "ཨེ་ཨའི་ཨེམ།"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1285,13 +1184,13 @@ msgstr "འབྲེལ་ས།"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "འབྲེལ་སའི་ཞུན་དགཔ།"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
-msgstr "མིང་ཆ་ཚང་...(_N)"
+msgstr "མིང་ཆ་ཚང་།...(_N)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
@@ -1308,7 +1207,7 @@ msgstr "ཡིག་གཏོང་ཁ་བྱང་།"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
-msgstr "སྐྱོན་མིང་...(_c)"
+msgstr "སྐྱོན་མིང་། (_c)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
@@ -1327,19 +1226,20 @@ msgstr "བརྒྱུད་འཕྲིན།"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122
+#: ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "ལཱ་གཡོག"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
-msgstr "ཁ་བྱང་...(_A)"
+msgstr "ཁ་བྱང་། (_A)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
-msgstr "ལོ་བསྟར་དུས་དྲན་: (_A)"
+msgstr "ལོ་བསྟར་དུས་དྲན: (_A)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
@@ -1347,18 +1247,19 @@ msgstr "ལས་རོགས་: (_A)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
-msgstr "སྐྱེ་བའི་ཉིནམ་: (_B)"
+msgstr "སྐྱེས་ཚེས: (_B)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
-msgstr "ཟླ་ཐོ་: (_C)"
+msgstr "ཟླ་ཐོ: (_C)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "དབྱེ་རིམ་ཚུ་...(_C)"
+#: ../ui/evolution-event-editor.xml.h:27
+#: ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "དབྱེ་རིམ། (_C)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1370,15 +1271,15 @@ msgstr "ཚོང་སྡེ་: (_C)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
-msgstr "རྒྱལ་ཁབ་: (_C)"
+msgstr "རྒྱལ་ཁབ: (_C)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
-msgstr "ལས་ཁུངས་: (_D)"
+msgstr "ལས་ཁུངས: (_D)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
-msgstr "འོག་ལུ་ཡིག་སྣོད་རྐྱབས་: (_F)"
+msgstr "ཡིག་སྣོད་འོག་ལུ་: (_F)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
@@ -1429,7 +1330,7 @@ msgstr "གློག་ཐོག་ཁ་སླབ་: (_V)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
-msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཡིག་འཕྲིན་འཐོབ་དགོ་མནོ་ཡི། (_W)"
+msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཡིག་འཕྲིན་འཐོབ་དགོ་མནོཝ་ཨིན། (_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
@@ -1445,8 +1346,8 @@ msgid "_Zip/Postal Code:"
 msgstr "གནས་ཡུལ་/འགྲེམ་ཨང་: (_Z)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "ཁ་བྱང་།"
 
@@ -1454,16 +1355,18 @@ msgstr "ཁ་བྱང་།"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/table/e-cell-text.c:1777
+#: ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313
+#: ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "ཞུན་དག་འབད་བཏུབཔ།"
@@ -2440,7 +2343,7 @@ msgstr "ཛིམ་བབ་ཝི།"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "མིང་།"
@@ -2451,7 +2354,7 @@ msgstr "ཨེ་ཨོ་ཨེལ་ འཕྲལ་མྱུར་ མེ་�
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "ཇེབ་བར།"
 
@@ -2461,7 +2364,7 @@ msgstr "ཡ་ཧུ་ མེ་སེན་ཇར།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ཨའི་སི་ཀིའུ།"
 
@@ -2470,7 +2373,7 @@ msgid "Service"
 msgstr "ཞབས་ཏོག"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2491,17 +2394,17 @@ msgid "Other"
 msgstr "གཞན།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "ཡ་ཧུ།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "ཨེམ་ཨེསི་ཨེན།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "སྡེ་རིམ།"
 
@@ -2530,20 +2433,20 @@ msgid "Changed"
 msgstr "བསྒྱུར་བཅོས་འབད་ཡོདཔ།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "འབྲེལ་སའི་ཞུན་དགཔ་ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2790
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "འབྲེལ་ས་འདི་གི་དོན་ལུ་ གཟུགས་བརྙན་ཅིག་ སེལ་འཐུ་འབད།"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
-msgid "_No image"
-msgstr "གཟུགས་བརྙན་མིན་འདུག(_N)"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "གཟུགས་བརྙན་མིན་འདུག"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2551,43 +2454,43 @@ msgstr ""
 "འབྲེལ་སའི་གནད་སྡུད་དེ་ ནུས་མེད་ཨིན་པས།:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'ལུ་ནུས་མེད་རྩ་སྒྲིག་ཅིག་འདུག"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'ལུ་ནུས་མེད་རྩ་སྒྲིག་ཅིག་འདུག"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3119
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
-msgstr "%s'%s'སྟོངམ་ཨིན་མས།"
+msgstr "%s'%s'སྟོངམ་ཨིན་པས།"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3145
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "ནུས་མེད་འབྲེལ་ས།"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "ཀུ་ཡིག་-ཨེཌི་ལུ་འབྲེལ་བ་འཐབ།"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
-msgstr "ཆ་ཚང་ཞུན་དག (_E)"
+msgstr "ཆ་ཚང་ཞུན་དག་རྐྱབས། (_E)"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
-msgstr "མིང་ཆ་ཚང་། (_F)"
+msgstr "མིང་ཆ་ཚང་།(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "གློག་འཕྲིན། (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "ཁ་བྱང་ཀི་དེབ་སེལ་འཐུ་འབད།(_S)"
 
@@ -2595,7 +2498,7 @@ msgstr "ཁ་བྱང་ཀི་དེབ་སེལ་འཐུ་འབད
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "ཁྱོད་ཀྱིས་འབྲེལ་སའི་ཐོ་ཡིག་(%s)\n"
 "ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
@@ -2612,7 +2515,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "ཁྱོད་ཀྱིས་འབྲེལ་ས་(%s)\n"
 "ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
@@ -2627,7 +2530,7 @@ msgstr ""
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
-msgstr "ཁ་བྱང་༢ པ་:  (_༢)"
+msgstr "ཁ་བྱང་༢ པ།  (_༢)"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
@@ -2696,19 +2599,19 @@ msgstr "རྒན་ཤོས"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
-msgstr "དང་པ་:(_F)"
+msgstr "དང་པ: (_F)"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
-msgstr "མཇུག་མ་: (_L)"
+msgstr "མཐའ་མཇུགམ་: (_L)"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
-msgstr "བར་མ་: (_M)"
+msgstr "བར་མ: (_M)"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
-msgstr "རྗེས་ཚིག་: (_S)"
+msgstr "རྗེས་ཚིག: (_S)"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
@@ -2720,15 +2623,14 @@ msgstr "རྩིས་ཐོའི་མིང་: (_A)"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
-msgstr "ཨའི་ཨེམ་ཞབས་ཏོག་: (_I)"
+msgstr "ཨའི་ཨེམ་ཞབས་ཏོག: (_I)"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../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
 msgid "_Location:"
-msgstr "གནས་ཁོངས:་ (_L)"
+msgstr "གནས་ཁོངས་: (_L)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
@@ -2739,7 +2641,7 @@ msgid "Add an email to the List"
 msgstr "ཐོ་ཡིག་ལུ་ གློག་འཕྲིན་ཅིག་ ཁ་སྐོང་རྐྱབས།"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "འབྲེལ་སའི་ཐོ་ཡིག་ཞུན་དགཔ།"
 
@@ -2749,7 +2651,7 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ནང་ལས་ གློག�
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
-msgstr "འཐུས་མི་ཚུ།"
+msgstr "ཚོགས་འཐུས་ཚུ།"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
@@ -2769,29 +2671,28 @@ msgstr "སེལ་འཐུ་འབད། (_S)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"འོག་གི་ཐོ་ཡིག་ནང་ལུ་ གློག་འཕྲིན་ཁ་བྱང་ཅིག་ ཡིག་དཔར་རྐྱབས་ ཡང་ཅིན་ འབྲེལ་ས་ཅིག་ འདྲུད་དེ་སྐྱེལ། (_T)"
+msgstr "འོག་གི་ཐོ་ཡིག་ནང་ལུ་ གློག་འཕྲིན་ཁ་བྱང་ཅིག་ ཡིག་དཔར་རྐྱབས་ ཡང་ཅིན་ འབྲེལ་ས་ཅིག་ འདྲུད་དེ་སྐྱེལ།(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "ཀི་དེབ།"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "ཐོ་ཡིག་གསརཔ་ཨིན།"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
-msgstr "འཐུས་མི་ཚུ། (_M)"
+msgstr "ཚོགས་འཐུས་ཚུ། (_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
-msgstr "འབྲེལ་སའི་ཐོ་ཡིག་འཐུས་མི།"
+msgstr "འབྲེལ་སའི་ཐོ་ཡིག་ཚོགས་འཐུས།"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2830,18 +2731,25 @@ msgstr ""
 "འབྲེལ་ས་འདི་གི་མིང་ངམ་ གློག་འཕྲིན་ཁ་བྱང་ ཧེ་མ་ལས་རང་ སྣོད་འཛིན་འདི་ནང་འདུག\n"
 "ཁྱོད་ཀྱིས་ འདི་གང་རུང་འབད་ ཁ་སྐོང་བརྐྱབ་ནི་ཨིན་ན?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "ས་སྒོ་གང་རུང་ནང་ཡོད་པ།"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "དབྱེ་རིམ་ཨིན་།"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "གློག་འཕྲིན་འདི་གིས་ འགོ་བཙུགསཔ་ཨིན།"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "མིང་འདི་གིས་ འགོ་བཙུགསཔ་ཨིན།"
@@ -2859,9 +2767,9 @@ 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:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "འདྲི་དཔྱད།"
 
@@ -2874,8 +2782,10 @@ msgstr "ཀི་དེབ་ཀྱི་མཐོང་སྣང་ ལེན�
 #: ../widgets/table/e-table-selection-model.c:311
 #: ../widgets/table/e-table.c:3329
 #: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
+#: ../widgets/text/e-entry.c:1235
+#: ../widgets/text/e-entry.c:1236
+#: ../widgets/text/e-text.c:3471
+#: ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "དཔེ།"
 
@@ -2883,11 +2793,11 @@ msgstr "དཔེ།"
 msgid "Error modifying card"
 msgstr "ཤོག་བྱང་ལེགས་བཅོས་འབད་ནི་ལུ་འཛོལ་བ།"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "འབྱུང་ཁུངས།"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
@@ -2896,91 +2806,100 @@ msgstr "འབྱུང་ཁུངས།"
 msgid "Type"
 msgstr "དབྱེ་བ།"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུངས།..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595
+#: ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ཁ་ཕྱེ། (_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "འབྲེལ་ས་གསརཔ་…(_N)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "འབྲེལ་སའི་ཐོ་ཡིག་གསརཔ་…(_L)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
-msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུང་བཞག་འབད་...(_S)"
+msgstr "ཝི་ཤོག་བྱང་སྦེ་སྲུངས་...(_S)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "འབྲེལ་ས་གདོང་བསྐྱོད་འབད།(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "འབྲེལ་ས་ཚུ་གདོང་བསྐྱོད་འབད།(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
-msgstr "འབྲེལ་ས་ལུ་ འཕྲིན་དོན་གཏང་།(_M)"
+msgstr "འཕྲིན་དོན་འབྲེལ་ས་ལུ་གཏང་།(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
-msgstr "ཐོ་ཡིག་ལུ་འཕྲིན་དོན་གཏང་།(_M)"
+msgstr "འཕྲིན་དོན་ཐོ་ཡིག་ལུ་གཏང་།(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
-msgstr "འབྲེལ་ས་ཚུ་ལུ་ འཕྲིན་དོན་གཏང་།(_M)"
+msgstr "འཕྲིན་དོན་འབྲེལ་ས་ཚུ་ལུ་གཏང་།(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "དཔར་བསྐྲུན།(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "ཁ་བྱང་ཀི་དེབ་ནང་ འདྲ་བཤུས་རྐྱབས་...(_y)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "ཁ་བྱང་ཀི་དེབ་ནང་ སྤོ་བཤུད་འབད་...(_v)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
-msgstr "བཏོག (_t)"
+msgstr "བཏོག (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:555
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3152 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
-#: ../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
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724
+#: ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "འདྲ་བཤུས། (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "སྦྱར།(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "དབྱེ་རིམ་གང་རུང་།"
 
@@ -3018,7 +2937,7 @@ msgid "Car Phone"
 msgstr "སྣུམ་འཁོར་བརྒྱུད་འཕྲིན།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3030,7 +2949,7 @@ msgid "Company Phone"
 msgstr "ཚོང་སྡེའི་བརྒྱུད་འཕྲིན།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "གློག་འཕྲིན།"
@@ -3080,7 +2999,7 @@ msgid "Manager"
 msgstr "འཛིན་སྐྱོང་པ།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "འགྲུལ་འཕྲིན།"
 
@@ -3089,7 +3008,7 @@ msgid "Nickname"
 msgstr "སྐྱོན་མིང་།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "དྲན་འཛིན།"
 
@@ -3098,7 +3017,7 @@ msgid "Office"
 msgstr "ཡིག་ཚང་།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "ལས་སྡེ།"
 
@@ -3162,8 +3081,10 @@ msgstr "ཝེབ་ས་ཁོངས།"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
+#: ../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
@@ -3171,23 +3092,29 @@ msgstr "ཝེབ་ས་ཁོངས།"
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
+#: ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "རྒྱ་ཚད།"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
+#: ../widgets/misc/e-canvas-vbox.c:108
+#: ../widgets/misc/e-canvas-vbox.c:109
+#: ../widgets/misc/e-reflow.c:1444
+#: ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-field-chooser-item.c:663
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
-#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
+#: ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "མཐོ་ཚད།"
 
@@ -3216,7 +3143,7 @@ msgstr "ས་སྒོའི་མིང་གི་རིང་ཚད་མཐ
 msgid "Column Width"
 msgstr "ཀེར་ཐིག་གི་རྒྱ་ཚད།"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3230,7 +3157,7 @@ msgstr ""
 "\n"
 "ཡང་ཅིན་ འབྲེལ་ས་གསརཔ་བཟོ་ནི་ལུ་ ནཱ་ལུ་ ཨེབ་གཏང་ཐེངས་གཉིས་འབད།"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3244,7 +3171,7 @@ msgstr ""
 "\n"
 "འབྲེལ་ས་གསརཔ་ཅིག་ གསར་བསྐྲིན་འབད་ནི་ལུ་ ནཱ་ལུ་ ཨེབ་གཏང་ཐེངས་གཉིས་འབད།"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3254,7 +3181,7 @@ msgstr ""
 "\n"
 "འབྲེལ་སའི་དོན་ལུ་འཚོལ་ཞིབ་འབད།"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3264,7 +3191,7 @@ msgstr ""
 "\n"
 "མཐོང་སྣང་འདི་ནང་སྟོན་ནིའི་ རྣམ་གྲངས་མིན་འདུག"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "མཐུན་བྱེད།"
 
@@ -3276,89 +3203,68 @@ msgstr "སེལ་འཐུ་འབད་ཡོད་པའི།"
 msgid "Has Cursor"
 msgstr "འོད་རྟགས་འདུག"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "བརའུ་ཟར་ནང་ལུ་ འབྲེལ་ལམ་ཁ་ཕྱེ། (_O)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "འབྲེལ་ལམ་གནས་ཁོངས་ འདྲ་བཤུས་རྐྱབས། (_C)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "འཕྲིན་དོན་གསརཔགཏང་ཡུལ་... (_S)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "གློག་འཕྲིན་ཁ་བྱང་ཚུ་འདྲ་བཤུས་རྐྱབས།(_E)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(ས་ཁྲ)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "ས་ཁྲ།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
-msgstr "འཐུས་མི་ཚུ་ཐོ་བཀོད་འབད།"
+msgstr "ཚོགས་འཐུས་ཚུ་ཐོ་བཀོད་འབད།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "གློག་འཕྲིན།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "གནས་ས།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "གློག་ཐོག་ཁ་སླབ།"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "གློག་ཐོག་ཞལ་འཛོམས"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "བརྒྱུད་འཕྲིན།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "དཔར་འཕྲིན།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "ལཱ་གཡོག"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "ཁྱིམ་གྱི་ཤོག་ལེབ།"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "ཌབ་ལུ་ཌབ་ལུ་ཌབ་ལུ།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
-msgstr "ཝེབ་དྲན་དེབ།"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "བོལོག"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "རང་དོན།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "ལས་གཡོག་གི་མགོ་མིང་།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "ཁྱིམ་གྱི་ཤོག་ལེབ།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "བོལོག"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3389,7 +3295,7 @@ msgstr "རང་ཉིད་ཀྱི་འབྲེལ་ས་ ངེས་�
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "གནང་བ་བྱིན་མ་བཏུབ།"
 
@@ -3414,7 +3320,8 @@ msgstr "གནད་སྤེལ་ལམ་ལུགས་ལུ་ རྒྱ�
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462
+#: ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "ཆ་མེད་བཏང་ཡོད།"
 
@@ -3461,50 +3368,25 @@ msgid "Invalid server version"
 msgstr "ནུས་མེད་སར་བར་ཐོན་རིམ།"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:94
-msgid ""
-"We were unable to open this addressbook. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
-msgstr ""
-"ང་བཅས་ཀྱིས་ ཁ་བྱང་ཀི་དེབ་འདི་ ཁ་ཕྱེ་མ་ཚུགས། འདི་གི་དོན་དག་ ཀི་དེབ་འདི་ ཡང་ཅིན་ ཨོཕ་ལ་ཡིན་ ལག་"
-"ལེན་གྱི་དོན་ལུ་ རྟགས་མ་བཀལཝ་དང་ ཡང་ཅིན་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ ཕབ་ལེན་མ་འབདཝ་འོང་ནི་"
-"མས། ཁ་བྱང་ཀི་དེབ་ཀྱི་ནང་དོན་ཚུ་ ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ ཁ་བྱང་ཀི་དེབ་དེ་ ཨཱོན་ལ་ཡིན་ཐབས་ལམ་གུ་ "
-"ཚར་གཅིག་མངོན་གསལ་འབད་གནང་།"
+msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+msgstr "ང་བཅས་ཀྱིས་ ཁ་བྱང་ཀི་དེབ་འདི་ ཁ་ཕྱེ་མ་ཚུགས། འདི་གི་དོན་དག་ ཀི་དེབ་འདི་ ཡང་ཅིན་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ རྟགས་མ་བཀལཝ་དང་ ཡང་ཅིན་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ ཕབ་ལེན་མ་འབདཝ་འོང་ནི་མས། ཁ་བྱང་ཀི་དེབ་ཀྱི་ནང་དོན་ཚུ་ ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ ཁ་བྱང་ཀི་དེབ་དེ་ ཨཱོན་ལ་ཡིན་ཐབས་ལམ་གུ་ ཚར་གཅིག་མངོན་གསལ་འབད་གནང་།"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
-msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"exists and that you have permission to access it."
-msgstr ""
-"ང་བཅས་ཀྱིས་ ཁ་བྱང་ཀི་དེབ་འདི་ ཁ་ཕྱེ་མ་ཚུགས། འགྲུལ་ལམ་%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:112
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"ང་བཅས་ཀྱིས་ ཁ་བྱང་ཀི་དེབ་འདི་ ཁ་ཕྱེ་མ་ཚུགས། འདི་གི་དོན་དག་ ཡང་ཅིན་ ཁྱོད་ཀྱིས་ བདེན་མེད་ཀྱི་ ཡུ་ཨར་"
-"ཨའི་ བཙུགས་ཡོདཔ་ད་ ཡང་ཅིན་ སར་བར་དེ་ བདའ་མ་ཟུནམ་འོང་ནི་མས།"
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgstr "ང་བཅས་ཀྱིས་ ཁ་བྱང་ཀི་དེབ་འདི་ ཁ་ཕྱེ་མ་ཚུགས། འདི་གི་དོན་དག་ ཡང་ཅིན་ ཁྱོད་ཀྱིས་ བདེན་མེད་ཀྱི་ ཡུ་ཨར་ཨའི་ བཙུགས་ཡོདཔ་ད་ ཡང་ཅིན་ སར་བར་དེ་ བདའ་མ་ཟུནམ་འོང་ནི་མས།"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་ ཐོན་རིམ་འདི་ནང་ལུ་ ཨེལ་ཌི་ཨེ་པི་གི་རྒྱབ་སྐྱོར་ ཕྱོགས་སྒྲིག་འབད་འབདཝ་མིན་འདུག ཁྱོད་ཀྱིས་ ཨི་བོ་"
-"ལུ་ཤཱན་ནང་ ཨེལ་ཌི་ཨེ་པི་ ལག་ལེན་འཐབ་དགོ་པ་ཅིན་ ཨེལ་ཌི་ཨེ་པི་-ལྕོགས་ཅན་བཟོ་མི་ ཨི་བོ་ལུ་ཤཱན་ ཐུམ་སྒྲིལ་"
-"ཅིག་ གཞི་བཙུགས་འབད་དགོ"
+msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
+msgstr "ཨི་བོ་ལུ་ཤཱན་ ཐོན་རིམ་འདི་ནང་ལུ་ ཨེལ་ཌི་ཨེ་པི་གི་རྒྱབ་སྐྱོར་ ཕྱོགས་སྒྲིག་འབད་འབདཝ་མིན་འདུག ཁྱོད་ཀྱིས་ ཨི་བོ་ལུ་ཤཱན་ནང་ ཨེལ་ཌི་ཨེ་པི་ ལག་ལེན་འཐབ་དགོ་པ་ཅིན་ ཨེལ་ཌི་ཨེ་པི་-ལྕོགས་ཅན་བཟོ་མི་ ཨི་བོ་ལུ་ཤཱན་ ཐུམ་སྒྲིལ་ཅིག་ གཞི་བཙུགས་འབད་དགོ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:124
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"ང་བཅས་ཀྱིས་ ཁ་བྱང་ཀི་དེབ་འདི་ ཁ་ཕྱེ་མ་ཚུགས། འདི་གི་དོན་དག་ ཡང་ཅིན་ ཁྱོད་ཀྱིས་ བདེན་མེད་ཡུ་ཨར་ཨའི་"
-"ཅིག་ བཙུགས་ཡོདཔ་ད་ ཡང་ཅིན་ སར་བར་དེ་ བདའ་མ་ཟུནམ་འོང་ནི་མས།"
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
+msgstr "ང་བཅས་ཀྱིས་ ཁ་བྱང་ཀི་དེབ་འདི་ ཁ་ཕྱེ་མ་ཚུགས། འདི་གི་དོན་དག་ ཡང་ཅིན་ ཁྱོད་ཀྱིས་ བདེན་མེད་ཡུ་ཨར་ཨའི་ཅིག་ བཙུགས་ཡོདཔ་ད་ ཡང་ཅིན་ སར་བར་དེ་ བདའ་མ་ཟུནམ་འོང་ནི་མས།"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
 msgid ""
@@ -3547,7 +3429,7 @@ 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:695
 msgid "Error adding contact"
 msgstr "འབྲེལ་ས་ཁ་སྐོང་བརྐྱབ་ནི་ལུ་འཛོལ་བ།"
 
@@ -3564,7 +3446,7 @@ 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:650
 msgid "Error removing contact"
 msgstr "འབྲེལ་ས་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཛོལ་བ།"
 
@@ -3583,7 +3465,7 @@ msgstr[1] ""
 "འབྲེལ་ས་%dཁ་ཕྱེཝ་ད་ ཝིན་ཌོསི་གསརཔ་%dཡང་ ཁ་ཕྱེཝ་ཨིན།.\n"
 "ཁྱོད་ཀྱིས་ ངེས་པར་དུ་ འབྲེལ་ས་དེ་ཚུ་ཆ་མཉམ་ བཀྲམ་སྟོན་འབད་ནི་ཨིན་ན?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3592,69 +3474,69 @@ msgstr ""
 "%s ཧེ་མ་ལས་འདུག\n"
 "འདི་ཚབ་སྲུང་འབད་ནི་ཨིན་ན?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "འབྲེལ་ས།"
 msgstr[1] "འབྲེལ་ས།"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "ཤོག་བྱང་.ཝི་སི་ཨེཕ།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 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:756
 msgid "Move contact to"
 msgstr "འབྲེལ་ས་ལུ་ སྤོ་བཤུད་འབད།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "འབྲེལ་ས་ལུ་ འདྲ་བཤུས་རྐྱབས།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "འབྲེལ་ས་ཚུ་སྤོ་བཤུད་འབད་ཡུལ།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "འབྲེལ་ས་ཚུ་འདྲ་བཤུས་བརྐྱབ་ཡུལ།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "སྣ་མང་ཝི་ཤོག་བྱང་།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "%sགི་དོན་ལས་ ཝི་ཤོག་བྱང་།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "འབྲེལ་སའི་བརྡ་དོན།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
-msgstr "%sགི་དོན་ལུ་འབྲེལ་སའི་བརྡ་དོན།"
+msgstr "%s གི་དོན་ལུ་ འབྲེལ་སའི་བརྡ་དོན།"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "ཁ་བྱང་ཀི་དེབ་ལུ་ འདྲི་དཔྱད་འབད་དོ།..."
 
@@ -3694,32 +3576,33 @@ msgstr "ནང་འདྲེན་འབད་དོ་..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:826
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "ཕྱི་སྣང་གི་ སི་ཨེསི་ཝི་ ཡང་ན་ ཨེབ་ལྡེ།(.སི་ཨེསི་ཝི་ .ཨེབ་ལྡེ་)"
+msgstr "ཕྱི་སྣང་གི་སི་ཨེསི་ཝི་ ཡང་ན་ མཆོང་ལྡེ།(.སི་ཨེསི་ཝི་ .མཆོང་ལྡེ)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:827
 msgid "Outlook CSV and Tab Importer"
-msgstr "ཕྱི་སྣང་གི་ སི་ཨེསི་ཝི་དང་ ཨེབ་ལྡེ་ནང་འདྲེན་པ།"
+msgstr "ཕྱི་སྣང་སི་ཨེསི་ཝི་དང་ མཆོང་ལྡེའི་ནང་འདྲེན་པ།"
 
 #: ../addressbook/importers/evolution-csv-importer.c:835
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "མོ་ཛིལ་ལ་གི་ སི་ཨེསི་ཝི་ ཡང་ན་ ཨེབ་ལྡེ།(.སི་ཨེསི་ཝི་ .ཨེབ་ལྡེ་)"
+msgstr "མོ་ཛི་ལ་གི་ སི་ཨེསི་ཝི་ ཡང་ན་ མཆོང་ལྡེ།(.སི་ཨེསི་ཝི་ .མཆོང་ལྡེ)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:836
 msgid "Mozilla CSV and Tab Importer"
-msgstr "མོ་ཛིལ་ལི་གི་སི་ཨེསི་ཝི་དང་ ཨེབ་ལྡེ་ནང་འདྲེན་པ།"
+msgstr "མོ་ཛི་ལ་སི་ཨེསི་ཝི་དང་ མཆོང་ལྡེའི་ནང་འདྲེན་པ།"
 
 #: ../addressbook/importers/evolution-csv-importer.c:844
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ སི་ཨེསི་ཝི་ ཡང་ན་ ཨེབ་ལྡེ།(.སི་ཨེསི་ཝི་ .ཨེབ་ལྡེ་)"
+msgstr "ཨི་བུ་ཤཱན་གྱི་ སི་ཨེསི་ཝི་ ཡང་ན་ མཆོང་ལྡེ།(.སི་ཨེསི་ཝི་ .མཆོང་ལྡེ)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:845
 msgid "Evolution CSV and Tab Importer"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ སི་ཨེསི་ཝི་དང་ ཨེབ་ལྡེ་ནང་འདྲེན་པ།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ སི་ཨེསི་ཝི་དང་ མཆོང་ལྡེའི་ནང་འདྲེན་པ།"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677
+#: ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "ནང་འདྲེན་འབད་དོ་..."
 
@@ -3744,12 +3627,12 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཝི་ཤོག་བྱང�
 msgid "Print envelope"
 msgstr "ཡིག་ཤུབས་དཔར་བསྐྲུན་འབད།"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "འབྲེལ་ས་ཚུ་དཔར་བསྐྲུན་འབད།"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "འབྲེལ་ས་དཔར་བསྐྲུན་འབད།"
 
@@ -3779,7 +3662,7 @@ msgstr "མཚོན་གྲངས།"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "ཡིག་གཟུགས།...(_o)"
+msgstr "ཡིག་གཟུགས།...(_F)"
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -3798,7 +3681,7 @@ msgstr "རྩ་སྒྲིག"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "མགོ་ཡིག"
@@ -3902,7 +3785,7 @@ msgstr "ནག་གྲིབ་བཟོ་བ།"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -3931,7 +3814,7 @@ msgstr "རྒྱ་ཚད:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "ཡིག་གཟུགས་...(_F)"
+msgstr "ཡིག་གཟུགས།...(_F)"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
@@ -3993,20 +3876,16 @@ 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 asychronous mode, default size 100."
+msgstr "གནད་སྡུད་རྒྱུན་སྤེལ་གྱི་ ཐབས་ལམ་ནང་  ཨའུཊི་པུཊི་ཡིག་སྣོད་གཅིག་གི་ ཤོག་བྱང་གི་གྲངས། སྔོན་སྒྲིག་ཚད་ ༡༠༠།"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "ཨང་གྲངས།"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"བཀོད་ལམ་གྱི་སྒྲུབ་རྟགས་འཛོལ་བ་འདུག ལག་ལེན་བལྟ་ནིའི་དོན་ལུ་ --help གདམ་ཁ་ལག་ལེན་འཐབ་གནང་།"
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "བཀོད་ལམ་གྱི་སྒྲུབ་རྟགས་འཛོལ་བ་འདུག ལག་ལེན་བལྟ་ནིའི་དོན་ལུ་ --help གདམ་ཁ་ལག་ལེན་འཐབ་གནང་།"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
@@ -4037,36 +3916,23 @@ msgid "No filename provided."
 msgstr "ཡིག་སྣོད་ཀྱི་མིང་ མ་བྱིན་པས།"
 
 #: ../calendar/calendar.error.xml.h:1
-msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr ""
-"ཁྱོད་ཀྱི་ངོ་འཕྲད་ལུ་ དོན་ལྡན་གྱི་བཅུད་དོན་ཅིག་ ཁ་སྐོང་བརྐྱབ་པ་ཅིན་ ཁྱོད་རའི་ལེན་མཁན་ཚུ་ལུ་ ཁྱོད་ཀྱི་ངོ་འཕྲད་"
-"དེ་ ག་ཅི་གི་སྐོར་ལས་ཨིན་ན་ ཧ་གོ་ནི་ལུ་ ཕན་ཐབས་ཡོད།"
+msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgstr "ཁྱོད་ཀྱི་ངོ་འཕྲད་ལུ་ དོན་ལྡན་གྱི་བཅུད་དོན་ཅིག་ ཁ་སྐོང་བརྐྱབ་པ་ཅིན་ ཁྱོད་རའི་ལེན་མཁན་ཚུ་ལུ་ ཁྱོད་ཀྱི་ངོ་འཕྲད་དེ་ ག་ཅི་གི་སྐོར་ལས་ཨིན་ན་ ཧ་གོ་ནི་ལུ་ ཕན་ཐབས་ཡོད།"
 
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"ཁྱོད་ཀྱི་ལས་ཀ་ལུ་ དོན་ལྡན་གྱི་བཅུད་དོན་ཅིག་ ཁ་སྐོང་བརྐྱབ་པ་ཅིན་ ཁྱོད་རའི་ལེན་མཁན་ཚུ་ལུ་ ཁྱོད་ཀྱི་ལས་ཀ་"
-"དེ་ ག་ཅི་གི་སྐོར་ལས་ཨིན་ན་ ཧ་གོ་ནི་ལུ་ ཕན་ཐབས་ཡོད།"
+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."
+msgid "All information in these journal entries will be deleted and can not be restored."
 msgstr "གསར་དེབ་ཐོ་བཀོད་འདི་ཚུ་གི་ བརྡ་དོན་ཆ་མཉམ་ བཏོན་གཏང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས།"
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr "གསར་དེབ་འདི་ནང་གི་ བརྡ་དོན་ཆ་མཉམ་ བཏོན་གཏང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས།"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
 msgstr "ངོ་འཕྲད་འདི་གི་ བརྡ་དོན་ཆ་མཉམ་ བཏོན་གཏང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས།"
 
 #: ../calendar/calendar.error.xml.h:6
@@ -4074,19 +3940,15 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "ལས་ཀ་འདི་ཚུ་གི་ བརྡ་དོན་ཆ་མཉམ་ བཏོན་གཏང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས།"
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+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."
+msgid "All information on this journal entry will be deleted and can not be restored."
 msgstr "གསར་དེབ་ཐོ་བཀོད་འདི་གི་ བརྡ་དོན་ཆ་མཉམ་ བཏོན་གཏང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས།"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "འཛོམས་འདུ་་འདི་གི་ བརྡ་དོན་ཆ་མཉམ་ བཏོན་གཏང་ནི་ཨིནམ་ལས་ སོར་ཆུད་འབད་མི་ཚུགས།"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4122,17 +3984,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "ཁྱོད་ཀྱིས་ ངོ་འཕྲད་འདི་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "ཁྱོད་ཀྱིས་ གསར་དེབ་ཐོ་བཀོད་འདི་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ཁྱོད་ཀྱིས་ འཛོམས་འདུ་་འདི་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "ཁྱོད་ཀྱིས་ ལས་ཀ་འདི་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
@@ -4146,7 +4005,7 @@ msgstr "ཁྱོད་ཀྱིས་ ལས་ཀ་འདི་ བཅུད�
 
 #: ../calendar/calendar.error.xml.h:23
 msgid "Cannot create a new event"
-msgstr "ལས་ཀ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+msgstr "འབྱུང་ལས་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད་མི་ཚུགས།།"
 
 #: ../calendar/calendar.error.xml.h:24
 msgid "Delete calendar '{0}'?"
@@ -4154,7 +4013,7 @@ msgstr "ཟླ་ཐོ་[༠]བཏོན་གཏང་ནི་ཨིན་�
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "Delete memo list '{0}'?"
-msgstr "ལས་ཀའི་ཐོ་ཡིག་'{0}'བཏོན་གཏང་ནི་ཨིན་ན?"
+msgstr "བརྗེད་ཐོ་'{0}'བཏོན་གཏང་ནི་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:26
 msgid "Delete task list '{0}'?"
@@ -4162,7 +4021,7 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་[༠]བཏོན་གཏང�
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "Do _not Send"
-msgstr "མ་བཏང་།(_n)"
+msgstr "མ་གཏང་།(_n)"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the appointment?"
@@ -4177,17 +4036,12 @@ msgid "Editor could not be loaded."
 msgstr "ཞུན་དགཔ་མངོན་གསལ་འབད་མ་ཚུགས།"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ གློག་འཕྲིན་ཐོག་ལས་ མགྲོན་བརྡ་བཏང་ཞིནམ་ལས་ ལས་ཀ་འདི་ལུ་ ངོས་ལེན་འབད་"
-"བཅུག"
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ གློག་འཕྲིན་ཐོག་ལས་ མགྲོན་བརྡ་བཏང་ཞིནམ་ལས་ ལས་ཀ་འདི་ལུ་ ངོས་ལེན་འབད་བཅུག"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
-msgstr "བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ གློག་འཕྲིན་ཐོག་ལས་ མགྲོན་བརྡ་གཏང་ཞིནམ་ལས་ ངོས་ལེན་འབད་བཅུག"
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ གློག་འཕྲིན་མགྲོན་བརྡ་གཏང་ནི་ཨིནམ་ལས་ ཁོང་ལུ་ལན་གསལ་གཏང་བཅུག"
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
@@ -4195,67 +4049,39 @@ msgstr "ཟླ་ཐོ་མངོན་གསལ་འབད་ནི་ལུ
 
 #: ../calendar/calendar.error.xml.h:34
 msgid "Error loading memo list"
-msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག་ མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ།"
+msgstr "བརྗེད་ཐོ་མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ།"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
 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 ""
-"ཁྱོད་ཀྱིས་ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་གིས་ ཇོར་ནཱལ་དེ་ བཏོན་བཏང་ཡོདཔ་མི་"
-"ཤེས།"
+msgid "If you do not send a cancelation notice, the other participants may not know the journal has been deleted."
+msgstr "ཁྱོད་ཀྱིས་ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་ གཞན་ཚུ་གིས་གསར་དེབ་དེ་ བཏོན་བཏང་ཡོདཔ་མི་ཤེས།"
 
 #: ../calendar/calendar.error.xml.h:37
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"ཁྱོད་ཀྱིས་ ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་གིས་ འཛོམས་འདུ་ཆ་མེད་བཏང་ཡོདཔ་"
-"མི་ཤེས།"
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgstr "ཁྱོད་ཀྱིས་ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་གིས་ འཛོམས་འདུ་དེ་ཆ་མེད་བཏང་ཡོདཔ་མི་ཤེས།"
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"ཁྱོད་ཀྱིས་ ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་ གཞན་ཚུ་གིས་ ལས་ཀ་དེ་ བཏོན་བཏང་ཡོདཔ་"
-"མི་ཤེས།"
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgstr "ཁྱོད་ཀྱིས་ ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་ གཞན་ཚུ་གིས་ ལས་ཀ་དེ་ བཏོན་བཏང་ཡོདཔ་མི་ཤེས།"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"དུས་མཐུན་གྱི་ བརྡ་དོན་གཏང་ནི་དེ་གིས་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་ལུ་ ཁོང་རའི་ཟླ་ཐོ་ཚུ་ དུས་མཐུན་སྦེ་ "
-"བཞག་ཚུགསཔ་ཨིན།"
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "དུས་མཐུན་གྱི་ བརྡ་དོན་གཏང་ནི་དེ་གིས་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་ལུ་ ཁོང་རའི་ཟླ་ཐོ་ཚུ་ དུས་མཐུན་སྦེ་ བཞག་ཚུགསཔ་ཨིན།"
 
 #: ../calendar/calendar.error.xml.h:40
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"དུས་མཐུན་གྱི་ བརྡ་དོན་གཏང་ནི་དེ་གིས་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་ལུ་ ཁོང་རའི་ལས་ཀའི་ཐོ་ཡིག་ཚུ་ དུས་"
-"མཐུན་སྦེ་ བཞག་ཚུགསཔ་ཨིན།"
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "དུས་མཐུན་གྱི་ བརྡ་དོན་གཏང་ནི་དེ་གིས་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་ལུ་ ཁོང་རའི་ལས་ཀའི་ཐོ་ཡིག་ཚུ་ དུས་མཐུན་སྦེ་ བཞག་ཚུགསཔ་ཨིན།"
 
 #: ../calendar/calendar.error.xml.h:41
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"མཉམ་སྦྲགས་དག་པ་ཅིག་ ཕབ་ལེན་འབད་དོ། ངོ་འཕྲད་དེ་སྲུང་བཞག་འབདཝ་ད་ མཉམ་སྦྲགས་དེ་ཚུ་ བརླག་སྟོར་ཞུགས་"
-"འོང་།"
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgstr "མཉམ་སྦྲགས་ལ་ལོ་ཅིག་ ཕབ་ལེན་འབད་དོ། ངོ་འཕྲད་དེ་སྲུང་བཞག་འབདཝ་ད་ མཉམ་སྦྲགས་འདི་ཚུ་ བརླག་སྟོར་ཞུགས་འོང་།"
 
 #: ../calendar/calendar.error.xml.h:42
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"མཉམ་སྦྲགས་དག་པ་ཅིག་ ཕབ་ལེན་འབད་དོ། ལས་ཀ་དེ་ སྲུང་བཞག་འབདཝ་ད་ མཉམ་སྦྲགས་ཚུ་དེ་ཚུ་ བརླག་སྟོར་"
-"ཞུགས་འོང་།"
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "མཉམ་སྦྲགས་དག་པ་ཅིག་ ཕབ་ལེན་འབད་དོ། ལས་ཀ་དེ་ སྲུང་བཞག་འབདཝ་ད་ མཉམ་སྦྲགས་འདི་ཚུ་བརླག་སྟོར་ཞུགས་འོང་།"
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
@@ -4271,19 +4097,19 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ལས་ཀ་དེ་ རེ�
 
 #: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
-msgstr "ཟླ་ཐོ་དེ་ ཨོཕ་ལ་ཡིན་ལག་ལེན་གྱི་དོན་ལུ་ རྟགས་མ་བཀལ་བས།"
+msgstr "ཟླ་ཐོ་དེ་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ རྟགས་མ་བཀལ་བས།"
 
 #: ../calendar/calendar.error.xml.h:47
 msgid "The calendar you have selected is read-only"
-msgstr "ཁྱོད་ཀྱིས་སེལ་འཐུ་འབད་མི་ཟླ་ཐོ་དེ་ ལྷག་ནི་ཙམ་ཨིན་པས།"
+msgstr "ཁྱོད་ཀྱིས་སེལ་འཐུ་འབད་མི་ཟླ་ཐོ་དེ་ལྷག་ནི་ཙམ་ཨིན་པས།"
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
-msgstr "བྲརྗེད་ཐོའི་ཐོ་ཡིག་དེ་ ཨོཕ་ལ་ཡིན་ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས།"
+msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག་དེ་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས།"
 
 #: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage."
-msgstr "ལས་ཀ་འདི་ ཨོཕ་ལ་ཡིན ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས།"
+msgstr "ལས་ཀའི་ཐོ་ཡིག་དེ་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས།"
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
@@ -4303,7 +4129,7 @@ msgstr "ཁྱོད་ཀྱིས་ ངོ་འཕྲད་འདི་ལ�
 
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this memo?"
-msgstr "ཁྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ བརྗེད་ཐོ་འདི་ནང་ བསྲུང་ནི་ཨིན་ན?"
+msgstr "ཁྱོད་ཀྱིས་བསྒྱུར་བཅོས་འབད་མི་ཚུ་ བརྗེད་ཐོ་འདི་ལུ་བསྲུང་ནི་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this task?"
@@ -4315,7 +4141,7 @@ msgstr "ཁྱོད་ཀྱིས་གསར་དེབ་ཐོ་བཀོ
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "ཁྱོད་ཀྱིས་ ཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་ཅིག་ གཏང་ནི་ཨིན་ན?"
+msgstr "ཁྱོད་ཀྱིས་བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་ཅིག་ གཏང་ནི་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
@@ -4334,26 +4160,20 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "ཁྱོད་ཀྱིས་ ལས་ཀ་འདི་ བཅའ་མར་གཏོགས་མི་ཚུ་ལུ་ གཏང་ནི་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:62
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"ཁྱོད་ཀྱིས་རྒྱབ་སྐྱོར་མེད་པའི་ སྡེ་རིམ་སར་བར་ཅིག་ལུ་ མཐུད་དོ་ཡོདཔ་ལས་ ཨི་བོ་ལུ་ཤཱན་ ལག་ལེན་འཐབ་ནི་ལུ་ "
-"དཀའ་ངལ་འབྱུང་འོང་། གྲུབ་འབྲས་ཡང་དག་འབྱུང་ཐབས་ལུ་ སར་བར་དེ་ རྒྱབ་སྐྱོར་ཡོད་པའི་ཐོན་རིམ་ཅིག་ལུ་ ཡར་"
-"སྐྱེད་འབད་དགོ"
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
+msgstr "ཁྱོད་ཀྱིས་རྒྱབ་སྐྱོར་མེད་པའི་ སྡེ་རིམ་སར་བར་ཅིག་ལུ་མཐུད་དོ་ཡོདཔ་ལས་ ཨི་བོ་ལུ་ཤཱན་ ལག་ལེན་འཐབ་ནི་ལུ་ དཀའ་ངལ་འབྱུང་འོང་། གྲུབ་འབྲས་ཡང་དག་འབྱུང་ཐབས་ལུ་ སར་བར་དེ་ རྒྱབ་སྐྱོར་ཡོད་པའི་ཐོན་རིམ་ཅིག་ལུ་ ཡར་བསྐྱེད་འབད་དགོ"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "ཁྱོད་ཀྱིས་ངོ་འཕྲད་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་མ་བསྲུངས་པས།"
+msgstr "ཁྱོད་ཀྱིས་ངོ་འཕྲད་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་སྲུང་བཞག་མ་འབད་བས།"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
-msgstr "ཁྱོད་ཀྱིས་ལས་ཀ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་མ་བསྲུངས་པས།"
+msgstr "ཁྱོད་ཀྱིས་ལས་ཀ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་སྲུང་བཞག་མ་འབད་བས།"
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "ཁྱོད་ཀྱིས་བརྗེད་ཐོ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་མ་བསྲུངས་པས།"
+msgstr "ཁྱོད་ཀྱིས་བརྗེད་ཐོ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་སྲུང་བཞག་མ་འབད་བས།"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
@@ -4366,9 +4186,10 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་མ་�
 #: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
-msgstr "བསྒྱུར་བཅོས་ཚུ་ བཏོན་བཀོག (_D)"
+msgstr "བསྒྱུར་བཅོས་ཚུ་བཏོན་བཀོག (_D)"
 
-#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69
+#: ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "སྲུངས། (_S)"
@@ -4378,7 +4199,8 @@ msgid "_Save Changes"
 msgstr "བསྒྱུར་བཅོས་ཚུ་སྲུངས།(_S)"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
+#: ../composer/mail-composer.error.xml.h:31
+#: ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "གཏང་། (_S)"
 
@@ -4390,7 +4212,8 @@ msgstr "བརྡ་བསྐུལ་གཏང་།(_S)"
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49
+#: ../calendar/gui/e-pub-utils.c:323
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "ཆོག་ཡིག་བཙུགས།"
@@ -4403,8 +4226,8 @@ msgstr "ཉིན་མོའི་སྣ་མང་བྱུང་ལས་ཚ
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ གནད་སྡུད་སར་བར་ འགོ་བཙུགས་མ་ཚུགས།"
 
@@ -4416,12 +4239,12 @@ msgstr "པའི་ལོཊི་གི་ ཟླ་ཐོའི་གློ�
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 msgid "Could not read pilot's Memo application block"
-msgstr "པའི་ལོཊི་གི་ བརྗེད་ཐོ་འཇུག་སྤྱོད་སྡེབ་ཚན་ ལྷག་མ་ཚུགས།"
+msgstr "པའི་ལོཊི་གི་ བརྗེད་ཐོ་གློག་རིམ་སྡེབ་ཚན་ ལྷག་མ་ཚུགས།"
 
 #: ../calendar/conduits/memo/memo-conduit.c:976
 #: ../calendar/conduits/memo/memo-conduit.c:979
 msgid "Could not write pilot's Memo application block"
-msgstr "པའི་ལོཊི་གི་ བརྗེད་ཐོ་འཇུག་སྤྱོད་སྡེབ་ཚན་ འབྲི་མ་ཚུགས།"
+msgstr "པའི་ལོཊི་གི་ བརྗེད་ཐོ་གློག་རིམ་སྡེབ་ཚན་ འབྲི་མ་ཚུགས།"
 
 #: ../calendar/conduits/todo/todo-conduit.c:239
 msgid "Default Priority:"
@@ -4435,15 +4258,15 @@ msgstr "པའི་ལོཊི་གི་ ཊུ་ཌུ གློག་ར�
 #: ../calendar/conduits/todo/todo-conduit.c:1151
 #: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
-msgstr "པའི་ལོཊི་གི་ ཊུ་ཌུ འཇུག་སྤྱོད་སྡེབ་ཚན་ འབྲི་མ་ཚུགས།"
+msgstr "པའི་ལོཊི་གི་ ཊུ་ཌུ གློག་རིམ་སྡེབ་ཚན་ འབྲི་མ་ཚུགས།"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "ཟླ་ཐོ་དང་ ལས་ཀ་ཚུ།"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1319
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "ཟླ་ཐོ་ཚུ།"
 
@@ -4473,7 +4296,7 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཟླ་ཐོའི་ཆ་�
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
-msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ བརྗེད་ཐོའི་ཆ་ཤས།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་བརྗེད་ཐོའི་ཆ་ཤས།"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
@@ -4484,19 +4307,24 @@ msgid "Memo_s"
 msgstr "བརྗེད་ཐོ་ཚུ།(_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/e-memo-table.c:274
+#: ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530
+#: ../calendar/gui/memos-component.c:997
 #: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "བརྗེད་ཐོ་ཚུ།"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525
+#: ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828
+#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012
+#: ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/exchange-operations/exchange-folder.c:592
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4516,25 +4344,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:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "སྐར་མ།"
 msgstr[1] "སྐར་མ་ཚུ།"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../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:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgid_plural "hours"
-msgstr[0] "ཆུ་ཚོད་ཚུ།"
+msgstr[0] "ཆུ་ཚོད།"
 msgstr[1] "ཆུ་ཚོད་ཚུ།"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "འགོ་བཙུགས་དུས་ཚོད།"
 
@@ -4545,10 +4374,10 @@ msgstr "ངོ་འཕྲད་ཚུ།"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "གནས་ཁོངས་:།"
 
@@ -4558,52 +4387,58 @@ 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:158
+#: ../filter/filter.glade.h:11
+#: ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:51
+#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:14
+#: ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution-subscribe.xml.h:10
+#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "ཞུན་དག (_E)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
-msgstr "ཉིན་གཉིད་ཁུག་ནི། (_S)"
+msgstr "སི་ནུཛི། (_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "ངོ་འཕྲད་ཀྱི་གནས་ཁོངས།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "བཅུད་དོན་མི་འཐོབ་པས།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "འགྲེལ་བཤད་མི་འཐོབ་པས།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "གནས་ཁོངས་ཀྱི་བརྡ་དོན་མི་འཐོབ་པས།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
-msgstr "འདི་ལུ་འཇིགས་བརྡ་%dའདུག"
+msgstr "ཁྱོད་ལུ་འཇིགས་བརྡ་%dའདུག"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "ཉེན་བརྡ།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4615,24 +4450,22 @@ msgstr ""
 "གཏང་ནིའི་དོན་ལུ་ རིམ་སྒྲིག་འབད་ནུག དེ་གི་ཚབ་ལུ་ ཨི་བོ་ལུ་ཤཱན་ \n"
 "དུས་རྒྱུན་གྱི་ ཌའི་ལོག་སྒྲོམ་ཅིག་ བཀྲམ་སྟོན་འབད་འོང་།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་ ཟླ་ཐོའི་དྲན་བསྐུལ་ཅིག་ འབྱུང་སག་ས་འབད་དོ། དྲན་བསྐུལ་འདི་ འོག་གི་ལས་རིམ་ཚུ་ གཡོག་བཀོལ་"
-"ནིའི་དོན་ལུ་ རིམ་སྒྲིག་འབད་དེ་ཡོད་:\n"
+"ཨི་བོ་ལུ་ཤཱན་ ཟླ་ཐོའི་དྲན་བསྐུལ་ཅིག་ འབྱུང་སག་ས་འབད་དོ། དྲན་བསྐུལ་འདི་ འོག་གི་ལས་རིམ་ཚུ་ གཡོག་བཀོལ་ནིའི་དོན་ལུ་ རིམ་སྒྲིག་འབད་དེ་ཡོད་:\n"
 "\n"
 "       %s\n"
 "\n"
 "ཁྱོད་ཀྱིས་ ལས་རིམ་འདི་ གཡོག་བཀོལ་ནི་ ངེས་ཏིག་ཨིན་ན།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "ང་ལུ་ ལས་རིམ་འདི་གི་སྐོར་ལས་ ལོག་སྟེ་མ་འདྲི།"
 
@@ -4649,7 +4482,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:408
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4658,7 +4492,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:414
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4669,7 +4504,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:420
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4698,8 +4534,7 @@ msgid "Calendars to run alarms for"
 msgstr "འཇིགས་བརྡ་གཡོག་བཀོལ་ནིའི་དོན་ལུ་ ཟླ་ཐོ་ཚུ།"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "ཆུ་ཚོད་ཕྲ་རིང་ནང་ མར་ཀཱསི་བཱེནསི་ ཐིག་འཐེན་ནིའི་ཚོས་གཞི།"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
@@ -4731,366 +4566,292 @@ msgid "Default reminder value"
 msgstr "སྔོན་སྒྲིག་དྲན་བསྐུལ་གྱི་བེ་ལུ།"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "བྱུང་ལས་ཀྱི་སྟེགས་རིས།"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "འབྱུང་ལས་ཀྱི་དྭངས་གསལ།"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
-msgstr "སར་བར་ཡུ་ཨར་ཨེལ་ དལཝ/ཁོམ་མེད།"
+msgstr "སར་བར་ ཡུ་ཨར་ཨེལ་ཨེསི་ དལཝ/ཁོམ་མེད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "ཊེམ་པེལེཊི་ ཡུ་ཨར་ཨེལ་ དལཝ/ཁོམ་མེད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "ཟླ་ཐོ་མཐོང་བྱེད་ནང་ བྱུང་ལས་ཀྱི་སྟེགས་རིས།"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "མཇུག་བསྡུ་ཚར་མི་ལས་ཀ་ཚུ་ སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "ལས་ཀའི་ཆ་ཕྲན་ཚུ་སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "ལས་ཀའི་བེ་ལུ་ སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "ཐད་སྙོམས་པེན་གྱི་གནས་ས།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "ཉིན་ལཱ་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ ཆུ་ཚོད་ཁལ་གཅིག་བཞི་གི་རྩ་སྒྲིག་ནང་ ༠ ལས་ ༢༣ སྦེ་བཟོ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ཉིན་ལཱ་འགོ་བཙུགས་པའི་ཆུ་ཚོད་ ཆུ་ཚོད་ཁལ་གཅིག་བཞི་གི་རྩ་སྒྲིག་ནང་ ༠ ལས་ ༢༣ སྦེ་བཟོ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"བར་མཚམས་ཚུ་ ཉིན་མའི་གྲངས་ནང་སྟོན་ཡོདཔ་དང་ ལཱ་གི་བདུན་ཕྲག་མཐོང་སྣང་ནང་ སྐར་མའི་གྲངས་ནང་སྟོན་ཡོད།"
+msgstr "བར་མཚམས་ཚུ་ ཉིན་མའི་གྲངས་ནང་སྟོན་ཡོདཔ་དང་ ལཱ་གི་བདུན་ཕྲག་མཐོང་སྣང་ནང་ སྐར་མའི་གྲངས་ནང་སྟོན་ཡོད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "འཇིགས་བརྡའི་ཆུ་ཚོད་མཇུག་མམ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
-msgstr "དལཝ་/ཁོམ་མེད་དཔེ་བསྐྲུན་གྱི་དོན་ལུ་ སར་བར་ཡུ་ཨར་ཨེལ་གྱི་ཐོ་ཡིག"
+msgstr "དཔེ་བསྐྲུན་དལཝ་/ཁོམ་མེད་ཀྱི་དོན་ལུ་ སར་བར་ ཡུ་ཨར་ཨེལ་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "མར་ཀཱསི་བཱེནསི་ཐིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "མར་ཀཱསི་བཱེནསི་ ཐིག་གི་ཚོས་གཞི་ - ཉིན་མའི་ཚོས་གཞི།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "མར་ཀཱསི་བཱེནསི་ ཐིག་གི་ཚོས་གཞི་ - ཆུ་ཚོད་ཕྲ་རིང་།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ཉིན་ལཱ་མཇུག་བསྡུ་བའི་སྐར་མ་ ༠ ལས་ ༥༩།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ཉིན་ལཱ་འགོ་བཙུགས་ཀྱི་སྐར་མ་ ༠ ལས་ ༥༩།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "ཐད་སྙོམས་པེན་གནས་སའི་ ཟླ་བའི་མཐོང་སྣང་།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "ཀེར་ཕྲང་པེན་གནས་སའི་ ཟླ་བའི་མཐོང་སྣང་།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
-msgstr "སྔོན་སྒྲིག་དྲན་བསྐུལ་ཅིག་ ཐག་བཅད་ནིའི་དོན་ལུ་ ཆ་ཕྲན་གྱི་གྱངས་ཁ།"
+msgstr "སྔོན་སྒྲིག་གི་དྲན་བསྐུལ་ཅིག་ཐག་གཅད་ནིའི་དོན་ལུ་ ཆ་ཕྲན་གྱི་གྱངས་ཁ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "ལས་ཀ་ཚུ་ ནམ་སྦ་བཞག་དགོཔ་ཨིན་ན་ བརྡ་སྟོན་ནིའི་དོན་ལུ་ ཆ་ཕྲན་གྱི་གྱངས་ཁ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "ཧེ་མ་ལས་རན་པའི་ ལས་ཀའི་ཚོས་གཞི།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
-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:39
-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:35
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "ཟླ་བའི་མཐོང་སྣང་ནང་མེན་པའི་སྐབས་ ཚེས་གྲངས་འགྲུལ་བསྐྱོད་པའི་ཟླ་ཐོ་དང་ ལས་ཀའི་ཐོ་ཡིག་གི་བར་ན་ ཐད་སྙོམས་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-#, fuzzy
-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:36
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "ཟླ་བའི་མཐོང་སྣང་ནང་ མཐོང་སྣང་དང་ ཚེས་གྲངས་འགྲུལ་བསྐྱོད་པའི་ཟླ་ཐོ་ དེ་ལས་ ལས་ཀའི་ཐོ་ཡིག་གི་བར་ན་ ཐད་སྙོམས་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 msgstr "ལས་ཀའི་ཐོ་ཡིག་དང་ ལས་ཀའི་སྔོན་ལྟ་པེན་གྱི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
-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:38
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "ཟླ་བའི་མཐོང་སྣང་ནང་ མཐོང་སྣང་དང་ ཚེས་གྲངས་འགྲུལ་བསྐྱོད་པའི་ཟླ་ཐོ་ དེ་ལས་ ལས་ཀའི་ཐོ་ཡིག་གི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-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:39
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "ཟླ་བའི་མཐོང་སྣང་ནང་ མཐོང་སྣང་དང་ ཚེས་གྲངས་འགྲུལ་བསྐྱོད་པའི་ཟླ་ཐོ་ དེ་ལས་ ལས་ཀའི་ཐོ་ཡིག་གི་བར་ན་ ཀེར་ཕྲང་པེན་གྱི་གནས་ས་ པིག་སེལ་ནང་། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "འཇིགས་བརྡ་གིས་ གཡོག་བཀོལ་ཆོག་པའི་ ལས་རིམ་ཚུ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ངོས་ལེན་གྱི་ས་སྒོ་སྟོན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ངོས་ལན་གྱི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ལས་འགན་གྱི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "བདུན་ཕྲག་དང་ ཟླ་བའི་མཐོང་སྣང་ཚུ་ནང་ ངོ་འཕྲད་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ཚུ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ལས་འགན་གྱི་ས་སྒོ་སྟོན།"
+msgstr "འབྱུང་ལས་/འཛོམས་འདུ/ལས་ཀའི་ཞུན་དགཔ་ནང་ དབྱེ་རིམ་གྱི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "བརྡ་བསྐུལ་ནང་ བཀྲམ་སྟོན་འཇིགས་བརྡ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ གནས་ཚད་ཀྱི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"Preview\" གི་པེན་དེ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"Preview\" གི་པེན་དེ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ཆུ་ཚོད་གླིང་སྡེའི་ས་སྒོ་སྟོན།"
+msgstr "འབྱུང་ལས་/་འདུའི་ཞུན་དགཔ་ནང་ ཆུ་ཚོད་གླིང་སྡེའི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ དབྱེ་བའི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "ཚེས་གྲངས་འགྲུལ་བསྐྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་ཚུ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "ད་རིས་རན་པའི་ ལས་ཀའི་ཚོས་གཞི།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "ལས་ཀའི་ཀེར་ཕྲང་ པེན་གྱི་གནས་ས།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"དལཝ་དང་ཁོམ་མེད་ གནད་སྡུད་ཀྱི་ གློ་བུར་རྒྱབ་ཐག་སྦེ་ ལག་ལེན་འཐབ་ནིའི་ ཡུ་ཨར་ཨེལ་ཊེམ་པེལེཊི། %uགི་ཚབ་"
-"ལུ་ ཡིག་འཕྲིན་ཁ་བྱང་ ལག་ལེན་པའི་ཡན་ལག་བཙུགས་ནི་དང་ %dགི་ཚབ་ལུ་ ཌོ་མེན་བཙུགས་ནི་ཨིན།"
+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:60
-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:56
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "ཟླ་ཐོའི་ནང་ ཨཱོལ་སེན་ ཆུ་ཚོད་གླིང་སྡེའི་ གནད་སྡུད་གཞི་རྟེན་གནས་ཁོངས་ དཔེར་ན་ \"America/New York\" བཟུམ་སྦེ་ སྐད་བསྒྱུར་མ་འབད་བར་ ཟླ་ཐོའི་ནང་ ཚེས་གྲངས་དང་ ཆུ་ཚོད་ཀྱི་དོན་ལུ་ ལག་ལེན་འཐབ་ནིའི་ སྔོན་སྒྲིག་ཆུ་ཚོད་ཀྱི་གླིང་སྡེ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "ཆུ་ཚོད་བགོ་བཀྲམ། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "མཐའ་མཇུག་འཇིགས་བརྡ་བྱིན་པའི་ཆུ་ཚོད་ ཆུ་ཚོད་ཊི་ནང་། (_t)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "ཆུ་ཚོད་གླིང་སྡེ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"ཟླ་ཐོའི་མཐོང་སྣང་ཚུ་ནང་ འབྱུང་ལས་ཚུ་གི་དྭངས་གསལ། (༠ དང་ ༡༠ གི་བར་ན་འབད་མི་བེ་ལུ་ཅིག སྔོན་སྒྲིག་ཐོག་"
-"ལས་དྭངས་སྒྲིབ་ཅན)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "ཆུ་ཚོད་ཁལ་གཅིག་བཞི་གི་ དུས་ཚོད་རྩ་་སྒྲིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"སྔོན་སྒྲིག་དྲན་བསྐུལ་པ་ཅིག་གི་དོན་ལུ་ ཆ་ཕྲན་ཚུ་ \"minutes\", \"hours\" ཡང་ན་ \"days\""
+msgstr "སྔོན་སྒྲིག་དྲན་བསྐུལ་པ་ཅིག་གི་དོན་ལུ་ ཆ་ཕྲན་ཚུ་ \"minutes\", \"hours\" ཡང་ན་ \"days\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
-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:62
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "ལས་ཀ་སྦ་བཞག་ནིའི་ བརྡ་སྟོན་གྱི་དོན་ལུ་ ཆ་ཕྲན་ཚུ་  \"minutes\", \"hours\" ཡང་ན་ \"days\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "བདུན་ཕྲག་འགོ་བཙུགས།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "བདུན་ཕྲག་འགོ་བཙུགས་ཀྱི་ཉིནམ་ གཟའ་ཟླཝ་(༠)ལས་ གཟའ་ཉིམ་(༦)།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "འཇིགས་བསྐུལ་བཀྲམ་སྟོན་གྱི་དོན་ལུ་ བརྡ་བསྐུལ་སྣོད་ ལག་ལེན་འཐབ་ནི་ཨིན་ན་མེན། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ངོ་འཕྲད་དམ་ ལས་ཀ་ཅིག་ བཏོན་བཏང་བའི་སྐབས་ ངེས་གཏན་སྦེ་ འདྲི་དགོཔ་ཨིན་ན། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ངོ་འཕྲད་དམ་ ལས་ཀ་ཚུ་ རྩ་མེད་བཏང་བའི་སྐབས་ ངེས་གཏན་སྦེ་ འདྲི་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
-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:69
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr "གཟའ་ཉིམ་དང་ཟླཝ་གཉིས་ བདུན་ཕྲག་གི་ ཉིནམ་གཅིག་གི་ ས་སྟོང་ནང་བཙུགས་ནིའི་དོན་ལུ་ བདུན་མཐའ་ཚུ་ ཟླ་བའི་མཐོང་སྣང་ནང་ ཨེབ་བཙུགས་འབད་དགོཔ་ཨིན་ན། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"བྱུང་ལས་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་དེ་ བདུན་ཕྲག་དང་ ཟླ་བའི་མཐོང་སྣང་ཚུ་ནང་ བཀྲམ་སྟོན་འབད་དགོཔ་ཨིན་ན།"
+msgstr "བྱུང་ལས་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་དེ་ བདུན་ཕྲག་དང་ ཟླ་བའི་མཐོང་སྣང་ཚུ་ནང་ བཀྲམ་སྟོན་འབད་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "ཟླ་ཐོའི་ནང་ མར་ཀཱསི་བཱེནསི་ཐིག་(ད་ལྟོའི་ཆུ་ཚོད་ཀྱི་ཐིག་) འཐེན་ནི་ཨིན་ཨིན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "མཇུག་བསྡུ་བའི་ལས་ཀ་ཚུ་ ལས་ཀའི་མཐོང་སྣང་ནང་ སྦ་བཞག་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "ངོ་འཕྲད་ཚུ་གི་དོན་ལས་ སྔོན་སྒྲིག་བརྡ་བསྐུལ་པ་ཅིག་ གཞི་སྒྲིག་འབད་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ངོས་ལེན་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ ངོས་ལན་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ དབྱེ་ཁག་ཚུ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ དབྱེ་ཁག་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ལས་འགན་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ ལས་འགན་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ གནས་ཚད་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ གནས་ཚད་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "སྔ་ཆ་/ཕྱི་ཆའི་ཚབ་ལུ་ དུས་ཚོད་ཚུ་ ཆུ་ཚོད་ཁལ་གཅིག་བཞི་གི་ རྩ་སྒྲིག་ནང་ སྟོན་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "འབྱུང་ལས་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ཆུ་ཚོད་གླིང་སྡེ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ ཆུ་ཚོད་གླིང་སྡེའི་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ དབྱེ་བའི་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ དབྱེ་བའི་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "ཚེས་གྲངས་འགྲུལ་བསྐྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་གྲངས་ཚུ་ སྟོན་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "ལཱ་གི་ཉིནམ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "ལཱ་གི་ཉིནམ་ མཇུག་བསྡུ་བའི་ཆུ་ཚོད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "ལཱ་གི་ཉིནམ་ མཇུག་བསྡུ་བའི་སྐར་མ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "ལཱ་གི་ཉིནམ་ འགོ་བཙུགས་ཀྱི་ཆུ་ཚོད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "ལཱ་གི་ཉིནམ་ འགོ་བཙུགས་ཀྱི་སྐར་མ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "ཉིན་མདངས་སྲུང་བཞག་དུས་ཚོད།"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "བཅུད་དོན་ནང་ཡོདཔ།"
@@ -5099,30 +4860,33 @@ msgstr "བཅུད་དོན་ནང་ཡོདཔ།"
 msgid "Description contains"
 msgstr "འགྲེལ་བཤད་ནང་ཡོདཔ།"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "བསམ་བཀོད་ནང་ཡོདཔ།"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "གནས་ཁོངས་ནང་ཡོདཔ།"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 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
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/print.c:2509
+#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "དཔར་བསྐྲུན།"
 
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:727
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2099
-#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
@@ -5133,13 +4897,8 @@ msgid "Calendar"
 msgstr "ཟླ་ཐོ།"
 
 #: ../calendar/gui/calendar-commands.c:348
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"བཀོལ་སྤྱོད་འདི་གིས་ སེལ་འཐུ་འབད་བའི་ དུས་ཚོད་ལས་རྒས་པའི་ བྱུང་ལས་ཚུ་ཆ་མཉམ་ རྟག་བརྟན་སྦེ་ ཀྲེག་བཏང་"
-"འོང་། ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་བ་ཅིན་ བྱུང་ལས་དེ་ཚུ་ སོར་ཆུད་འབད་མི་ཚུགས།"
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "བཀོལ་སྤྱོད་འདི་གིས་ སེལ་འཐུ་འབད་བའི་ དུས་ཚོད་ལས་རྒས་པའི་ བྱུང་ལས་ཚུ་ཆ་མཉམ་ རྟག་བརྟན་སྦེ་ ཀྲེག་བཏང་འོང་། ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་བ་ཅིན་ བྱུང་ལས་དེ་ཚུ་ སོར་ཆུད་འབད་མི་ཚུགས།"
 
 #: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
@@ -5148,9 +4907,10 @@ msgstr "དེ་ལས་རྒས་པའི་ བྱུང་ལས་ཚ�
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
+#: ../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
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "གཟའ།"
 
@@ -5158,89 +4918,92 @@ msgstr "གཟའ།"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:253
-#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
-#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221
+#: ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594
+#: ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "ཝེབ་གུ།"
 
-#: ../calendar/gui/calendar-component.c:271 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253
+#: ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "སྐྱེས་ཚེས་དང་ ལོ་བསྟར་དུས་དྲན་ཚུ།"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:277
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "གནམ་གཤིས།"
 
-#: ../calendar/gui/calendar-component.c:554
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "ཟླ་ཐོ་གསརཔ།(_N)"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "ཟླ་ཐོ་ཚུ་ དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བསྐྲུན་དོན་ལུ་ ཟླ་ཐོ་'%s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../calendar/gui/calendar-component.c:1173
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བསྐྲུན་དོན་ལུ་ ཟླ་ཐོ་འཐོབ་མི་ཚུགས་པས།"
 
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "ཟླ་ཐོའི་འབྱུང་ཁུངས་སེལ་བྱེད།"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "ངོ་འཕྲད་གསརཔ།"
 
-#: ../calendar/gui/calendar-component.c:1490
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "ངོ་འཕྲད། (_A)"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "ངོ་འཕྲད་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "འཛོམས་འདུ་གསརཔ།"
 
-#: ../calendar/gui/calendar-component.c:1498
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
-msgstr "འཛོམས་འདུ་། (_e)"
+msgstr "འཛོམས་འདུ། (_e)"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "འཛོམས་འདུ་གསར་པའི་ཞུ་བ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "ཉིནམ་གང་གི་ངོ་འཕྲད་ གསརཔ་བཟོ།"
 
-#: ../calendar/gui/calendar-component.c:1506
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "ཉིནམ་གང་གི་ངོ་འཕྲད། (_p)"
 
-#: ../calendar/gui/calendar-component.c:1507
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "ཉིནམ་གང་གི་ ངོ་འཕྲད་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "ཟླ་ཐོ་གསརཔ།"
 
-#: ../calendar/gui/calendar-component.c:1514
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "ཟླ་ཐོ། (_n)"
 
-#: ../calendar/gui/calendar-component.c:1515
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "ཟླ་ཐོ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
@@ -5272,11 +5035,12 @@ msgstr "ཟླ་ཐོ་ཁ་ཕྱེ་བའི་སྐབས་ལུ་
 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:439
+#: ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "མ་ཤེས་པའི་འཛོལ་བ།"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "འཇིགས་བརྡ་ཞུན་དག་རྐྱབས།"
 
@@ -5306,7 +5070,7 @@ msgstr "སྲོལ་སྒྲིག་འཇིགས་བརྡའི་ས
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
-msgstr "འཕྲིན་དོན་: (_s)"
+msgstr "འཕྲིན་དོན: (_s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 #: ../calendar/gui/e-alarm-list.c:446
@@ -5338,7 +5102,7 @@ msgstr "སྒྲུབ་རྟགས་ཚུ: (_A)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
-msgstr "ལས་རིམ: (_P)"
+msgstr "ལས་རིམ་: (_P)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
@@ -5392,25 +5156,55 @@ msgid "A_dd"
 msgstr "ཁ་སྐོང་རྐྱབས། (_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "འཇིགས་བརྡ་ཚུ།"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "མཉམ་སྦྲགས་རང་བཞིན་བཀྲམ་སྟོན་གྱི་ བསམ་འཆར་བཀོད།(_S)"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "མཉམ་སྦྲགས་རང་བཞིན་གྱིས་ བཀྲམ་སྟོན་འབད་ནིའི་ བསམ་འཆར་བཀོད།"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "ཡིག་སྣོད་(ཚུ)མཉམ་སྦྲགས་འབད།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "མཉམ་སྦྲགས་ཀྱི་རྒྱུ་དངོས་ཚུ།"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "འགྲེལ་བཤད:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "File name:"
+msgstr "ཡིག་སྣོད་མིང་:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "MIME type:"
+msgstr "མ་ཡིམ་གྱི་དབྱེ་བ:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "འཇིགས་བརྡའི་དོན་ལུ་ སེལ་འཐུ་འབད་མི་ཟླ་ཐོ་ཚུ།"
 
@@ -5430,21 +5224,20 @@ 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
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\"> དྲན་བརྡ་</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">སྔོན་སྒྲིག་སར་བར་དལཝ་/ཁོམ་མེད་</span>"
+msgstr "<span weight=\"bold\">སྔོན་སྒྲིག་དལཝ་/ཁོམ་མེད་སར་བར་</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ཡོངས་ཁྱབ་</span>"
@@ -5459,33 +5252,29 @@ msgstr "<span weight=\"bold\"> ཆུ་ཚོད་</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">ལཱ་གི་བདུན་ཕྲག</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "ཉིན་མདངས་སྲུང་བཞག་དུས་ཚོད་ཀྱི་བདེ་སྒྲིག་འབད།(_v)"
+msgstr "<span weight=\"bold\">ལཱ་གཡོག་བདུན་ཕྲག་</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
-msgstr "ཉིནམ་རྫོགས་པ: (_e)"
+msgstr "ཉིནམ་རྫོགསཔ་ཨིན་: (_e)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "བཀྲམ་སྟོན།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "དལཝ/ཁོམ་མེད།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "སྤེན་པ།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5493,15 +5282,15 @@ msgid ""
 msgstr ""
 "སྐར་མ།\n"
 "ཆུ་ཚོད།\n"
-"ཉིནམ།"
+"ཉིན་གྲངས།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "མིག་དམར།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5515,199 +5304,193 @@ msgstr ""
 "ལྷག་པ།\n"
 "ཕུར་བུ།\n"
 "པ་སངས།\n"
-"སྤེན་པ།"
+"སྤེན་པ།\n"
+"ཉི་མ།\n"
+"ཟླ་བ།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "ཚོས་གཞི་ཅིག་འཐུ།"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
-msgstr "ཟླ་བ། (_u)"
+msgstr "ཉི་མ། (_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "ཉི་མ།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
-msgstr "འཇིགས་བརྡའི་བརྡ་བསྐུལ་དོན་ལུ་ ཟླ་ཐོ་ཚུ་སེལ་འཐུ་འབད།"
+msgstr "འཇིགས་བརྡའི་བརྡ་བསྐུལ་དོན་ལུ་ ཟླ་ཐོ་དེ་ཚུ་སེལ་འཐུ་འབད།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "དྲན་བསྐུལ་སྟོན། (_o)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "ཚེས་གྲངས་འགྲུལ་བསྐྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་གྲངས་སྟོན།(_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "ཟླ་བ།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
-msgstr "ད་རིས་རན་པའི་ལས་ཀ(_a)"
+msgstr "ད་རིས་རན་པའི་ལས་ཀ།"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "སངས། (_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "ཊེམ་པེལེཊི།:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "པ་སངས།"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "ཆུ་ཚོད་ཀྱི་གླིང་སྡེ་: (_z) "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "ཆུ་ཚོད་ཀྱི་རྩ་སྒྲིག:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "ལྷག"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "ཕུར་བུ།"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
-msgstr "བདུན་ཕྲག་འགོ་བཙུགས་ཚེས་:(_k)"
+msgstr "བདུན་ཕྲག་འགོ་བཙུགསཔ་ཨིན་:(_k)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "ལཱ་གཡོག་གི་ཉིནམ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "ཆུ་ཚོད་༡༢ (སྔ་ཆ་/ཕྱི་ཆ)། (_12)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
-msgstr "ཆུ་ཚོད་ ༢༤། (_2)"
+msgstr "ཆུ་ཚོད་ ༢༤། (_12)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "རྣམ་གྲངས་ཚུ་ བཏོན་གཏངམ་ད་ ངེས་གཏན་སྦེ་དྲིས། (_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "ཟླ་བའི་མཐོང་སྣང་ནང་ བདུན་མཐའ་ཚུ་ ཨེབ་བཙུགས་འབད། (_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "ཉིནམ་འགོ་བཙུགསཔ་ཨིན: (_D)"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "སྤེན། (_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
-msgstr "འདི་གི་ཤུལ་ལས་ མཇུག་བསྡུ་བའི་ལས་ཀ་ཚུ་ སྦ་བཞག (_H)"
+msgstr "འདི་གི་ཤུལ་ལས་ མཇུག་བསྡུ་བའི་ལས་ཀ་ཚུ་སྦ་བཞག (_H)"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "མིག (_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
-msgstr "ཧེ་མ་ལས་རན་པའི་ལས་ཀ་: (_O)"
+msgstr "ཧེ་མ་ལས་རན་པའི་ལས་ཀ་ཚུ་: (_O)"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "ཉི། (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
-msgstr "བདུན་ཕྲག་དང་ ཟླ་བའི་མཐོང་སྣང་ནང་ ངོ་འཕྲད་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ཚུ་སྟོན། (_S)"
+msgstr "བདུན་ཕྲག་དང་ ཟླ་བའི་མཐོང་སྣང་ནང་ ངོ་འཕྲད་མཇུག་བསྡུ་བའི་ ཆུ་ཚོད་ཚུ་སྟོན། (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
-msgstr "ཆུ་ཚོད་ཀྱི་སྡེ་ཚན། (_T)"
+msgstr "ཆུ་ཚོད་ཀྱི་སྡེ་ཚན་: (_T)"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "ལྷག (_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "ཕུར། (_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "ངོ་འཕྲད་ཡོད་ཚད་གཅིག་གི་ཧེ་མར།"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ཟླ་ཐོའི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་འདྲ་བཤུས་རྐྱབས།(_y)"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ཟླ་ཐོའི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr ""
-"ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ལས་ཀའི་ཐོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།(_y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ལས་ཀའི་ཐོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr ""
-"ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ བརྗེད་ཐོའི་ཐོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།(_y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ བརྗེད་ཐོའི་་ཐོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
-msgstr "ཚོས་གཞི: (_o)"
+msgstr "ཚོས་གཞི་: (_o)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "ལས་ཀའི་ཐོ་ཡིག"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "བརྗེད་ཐོའི་་ཐོ་ཡིག"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "ཟླ་ཐོའི་རྒྱུ་དངོས།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "ཟླ་ཐོ་གསརཔ།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "ལས་ཀའི་ཐོ་ཡིག་གི་རྒྱུ་དངོས།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
-msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག་གསརཔ།"
+msgstr "བརྗེད་ཐོ་ཐོ་ཡིག་གསརཔ།"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
@@ -5729,16 +5512,17 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་ཁ་སྐོང་རྐྱ
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
-msgstr "ཡང་སེལ་འཐུ་འབད: (_R)"
+msgstr "ཡང་སེལ་འབད: (_R)"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
-msgstr "ཡུ་ཨར་ཨེལ: (_U)"
+msgstr "ཡུ་ཨར་ཨེལ་: (_U)"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
+#: ../filter/filter.glade.h:21
+#: ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "བདུན་ཕྲག་ཚུ།"
@@ -5792,57 +5576,70 @@ msgstr "%s ཁྱོད་ཀྱིས་བསྒྱུར་བཅོས་མ
 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:187
+#: ../calendar/gui/print.c:2267
 msgid " to "
 msgstr "ལུ་།"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191
+#: ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr "(མཇུག་བསྡུ་ཡོདཔ།"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "མཇུག་བསྡུ་ཡོདཔ།"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198
+#: ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr "(རན་པ།"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200
+#: ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "རན་པ།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "མཉམ་སྦྲགས་འཕྲིན་དོན་-- %s།"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:382
+#: ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "མཉམ་སྦྲགས་འཕྲིན་དོན།"
 msgstr[1] "མཉམ་སྦྲགས་འཕྲིན་དོན་%d།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../calendar/gui/dialogs/comp-editor.c:446
+#: ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973
+#: ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "སྤོ་བཤུད་འབད། (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:448
+#: ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982
+#: ../mail/message-list.c:1727
 msgid "Cancel _Drag"
-msgstr "འདྲུད་ནི་ཆ་མེད་གཏང་། (_D)"
+msgstr "འཐེན་འདྲུད་ཆ་མེད་གཏང་། (_D)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "དངོས་པོ་དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5851,99 +5648,104 @@ msgstr[1] "མཉམ་སྦྲགས་<b>%d</b>"
 
 #: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
-msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ་བཞག(_B)"
+msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ།(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན།(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "རྩ་བསྐྲད་གཏང་། (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+#: ../composer/e-msg-composer.c:3620
+#: ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "རྒྱུ་དངོས་ཚུ།(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "མཉམ་སྦྲགས་ཁ་སྐོང་རྐྱབས་...(_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2262
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "མཉམ་སྦྲགས་ཚུ་སྟོན།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་ སོར་སྟོན་འབད་ནིའི་དོན་ལུ་ བར་སྟོང་ལྡེ་མིག་ཨེབ།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "ངོ་འཕྲད་ཞུན་དག་རྐྱབས།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "འཛོམས་འདུ་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "ངོ་འཕྲད་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "འགན་སྤྲོད་ལས་ཀ་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "ལས་ཀ་- %s\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "གསར་དེབ་ཐོ་བཀོད་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "བཅུད་དོན་མིན་འདུག"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307
+#: ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535
+#: ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "མཉམ་སྦྲགས།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "དུས་མཐུན་ཅིག་བྱུང་པ་ཅིན་ རྣམ་གྲངས་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་མི་ཚུ་ བཏོན་བཀོག་འོང་།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "ད་ལྟོའི་ཐོན་རིམ་དེ་ ལག་ལེན་འཐབ་མི་ཚུགས་པས།"
 
@@ -5959,10 +5761,6 @@ msgstr "འགྲོ་ཡུལ་ཁ་ཕྱེ་མི་ཚུགས་པ
 msgid "Destination is read only"
 msgstr "འགྲོ་ཡུལ་དེ་ ལྷག་ནི་ཙམ་ཅིག་ཨིན་པས།"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "ལེན་མཁན་གཞན་ཆ་མཉམ་གྱི་ ཡིག་སྒྲོམ་ནང་ལས་ རྣམ་གྲངས་འདི་ཚུ་བཏོན་གཏང་།(_D)"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "ཀོར་བའི་འཛོལ་བ་ཅིག་ལུ་བརྟེན་ཏེ་ བྱུང་ལས་འདི་ བཏོན་བཏང་མ་ཚུགས།"
@@ -6024,124 +5822,144 @@ msgstr "བགོ་སྤེལ་འབད་ས་:"
 msgid "Enter Delegate"
 msgstr "བགོ་སྤེལ་བཙུགས།"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "ངོ་འཕྲད།(_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "སླར་འབྱུང་།"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "འབྱུང་ལས་འདི་ལུ་འཇིགས་བརྡ་འདུག"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "ཟླ་ཐོ: (_n)"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "འགོ་འདྲེན་པ་: (_g)"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "བགོ་སྤེལ་བྱ་ཡུལ།(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "ངོ་འཛོམས་པ་ཚུ།(_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "འགོ་བཙུགས་ཚེས་གྲངས་མེད་པའི་བྱུང་ལས།"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "མཇུག་བསྡུ་བའི་ཚེས་གྲངས་མེད་པའི་བྱུང་ལས།"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "འགོ་བཙུགས་ཚེས་གྲངས་ཕྱི་འགྱུར་ཨིན་པས།"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "མཇུག་བསྡུ་བའི་ཚེས་གྲངས་ཕྱི་འགྱུར་ཨིན་པས།"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "འགོ་བཙུགས་ཆུ་ཚོད་ཕྱི་འགྱུར་ཨིན་པས།"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ཕྱི་འགྱུར་ཨིན་པས།"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "སེལ་འཐུ་འབད་མི་ འགོ་འདྲེན་པ་དེ་ལུ་ རྩིས་ཐོ་མིན་འདུག"
 
-#: ../calendar/gui/dialogs/event-page.c:1459
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "འགོ་འདྲེན་པ་ཅིག་དགོ་པས།"
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "ཉུང་མཐའ་ལུ་ ངོ་འཛོམས་པ་ཅིག་དགོ་པས།"
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "ཁ་སྐོང་རྐྱབས། (_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ཟླ་ཐོ་'%s'ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ངོ་འཕྲད་ཀྱི་ ཉིནམ་%d གི་ཧེ་མར། "
 msgstr[1] "ངོ་འཕྲད་ཀྱི་ ཉིནམ་%dགི་ཧེ་མར། "
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ངོ་འཕྲད་ཀྱི་ ཆུ་ཚོད་%dགི་ཧེ་མར།"
 msgstr[1] "ངོ་འཕྲད་ཀྱི་ ཆུ་ཚོད་%dགི་ཧེ་མར། "
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ངོ་འཕྲད་ཀྱི་ སྐར་མ་%dགི་ཧེ་མར།"
 msgstr[1] "ངོ་འཕྲད་ཀྱི་ སྐར་མ%dགི་ཧེ་མར།"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "སྲོལ་སྒྲིག་འབད།"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
+#: ../calendar/gui/e-itip-control.c:1099
+#: ../composer/e-msg-composer.c:2271
+#: ../filter/filter-rule.c:889
+#: ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1388
+#: ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249
+#: ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505
+#: ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "ཅི་མེད།"
 
@@ -6158,33 +5976,38 @@ msgid "15 minutes before appointment"
 msgstr "ངོ་འཕྲད་ཀྱི་ སྐར་མ་ ༡༥གི་ཧེ་མར།"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "ངོ་འཛོམས་པ་ཚུ་...(_s)"
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "ངོ་འཛོམས་པ་ཚུ་...(_n)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "དབྱེ་རིམ་ཚུ་...(_t)"
+msgstr "དབྱེ་རིམ་ཚུ།...(_t)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "སྲོལ་སྒྲིག་འཇིགས་བརྡ་:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "འགྲེལ་བཤད་: (_D)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "བྱུང་ལས་ཀྱི་འགྲེལ་བཤད།"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "གནས་ཁོངས: (_i)"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
-msgstr "བཅུད་དོན་: (_m)"
+msgstr "བཅུད་དོན: (_m)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "འཇིགས་བརྡ། (_A)"
 
@@ -6206,6 +6029,14 @@ msgstr "དོན་ལུ།"
 msgid "until"
 msgstr "ཚུན་ཚོད།"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "བགོ་སྤེལ་བྱ་ཡུལ།(_g)"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "ལས:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6239,7 +6070,7 @@ msgstr "སྐད་ཡིག"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:7
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
-msgstr "འཐུས་མི།"
+msgstr "ཚོགས་འཐུས།"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
@@ -6251,8 +6082,9 @@ 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
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "གནས་ཚད།"
 
@@ -6273,18 +6105,19 @@ msgid "Organizer"
 msgstr "འགོ་འདྲེན་པ།"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "འགོ་འདྲེན་པ་:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219
+#: ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "བརྗེད་ཐོ།"
 
 #: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "'%s'ནང་ལུ་ བརྗེད་ཐོ་ཚུ་ཁ་ཕྱེ་མ་ཚུགས།"
+msgstr "'%s'ནང་ལུ་ བརྗེད་ཐོ་ཚུ་ ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
@@ -6334,20 +6167,19 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་མིང་།"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་བྱུང་ལས་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
+msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གི་ བྱུང་ལས་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་དགོ་མནོཝ་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་བྱུང་ལས་ཅིག་ བགོ་སྤེལ་འབད་དོ་ ག་ཅི་བགོ་སྤེལ་འབད་ནི་སྨོ?"
+msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གི་ བྱུང་ལས་ཅིག་ བགོ་སྤེལ་འབད་དོ་ ག་ཅི་བགོ་སྤེལ་འབད་དགོ་མནོཝ་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་ལས་ཀ་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
+msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གི་ ལས་ཀ་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་དགོ་མནོཝ་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གསར་དེབ་ཐོ་བཀོད་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
+msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གི་ གསར་དེབ་ཐོ་བཀོད་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་དགོ་མནོཝ་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6432,7 +6264,7 @@ msgstr "ཚེས་གྲངས་གཞན།"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
-msgstr "དང་པ་ལས་ ༡༠ པ་ཚུན།"
+msgstr "༡ པ་ ལས་ ༡༠ པ།"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -6440,7 +6272,7 @@ msgstr "དང་པ་ལས་ ༡༠ པ་ཚུན།"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
-msgstr "༡༡ པ་ལས་ ༢༠ པ་ཚུན།"
+msgstr "༡༡ པ་ ལས་ ༢༠ པ།"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -6448,7 +6280,7 @@ msgstr "༡༡ པ་ལས་ ༢༠ པ་ཚུན།"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
-msgstr "༢༡ པ་ལས་ ༣༡ པ་ཚུན།"
+msgstr "༢༡ པ་ ལས་ ༣༡ པ།"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "day"
@@ -6474,7 +6306,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>"
 
@@ -6492,7 +6324,7 @@ msgstr "རེར།"
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "This appointment rec_urs"
-msgstr "ངོ་འཕྲད་འདི་ སླར་འབྱུངམ་ཨིན།(_u)"
+msgstr "ངོ་འཕྲད་འདི་ སླར་འབྱུངམ་ཨིན།"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
@@ -6539,15 +6371,19 @@ msgstr "<span weight=\"bold\">གནས་ཚད་</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461
+#: ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "མཇུག་བསྡུ་ཡོདཔ།"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:386
+#: ../mail/message-list.c:1012
 msgid "High"
 msgstr "མཐོ།"
 
@@ -6556,20 +6392,23 @@ msgstr "མཐོ།"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460
+#: ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "ཡར་འཕེལ་འགྱོ་བའི་བསྒང་།"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1027
+#: ../calendar/gui/e-calendar-table.c:388
+#: ../mail/message-list.c:1010
 msgid "Low"
 msgstr "དམའ།"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918
+#: ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "སྤྱིར་བཏང་།"
 
@@ -6577,7 +6416,8 @@ msgstr "སྤྱིར་བཏང་།"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459
+#: ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "འགོ་མ་བཙུགསཔ།"
 
@@ -6587,19 +6427,19 @@ msgstr "བརྒྱ་ཆ་མཇུག་བསྡུ་: (_e)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Stat_us:"
-msgstr "གནས་ཚད་:(_u)"
+msgstr "གནས་ཚད:(_u)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "ངེས་འཛིན་མ་འབདཝ།"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
-msgstr "ཚེས་གྲངས་མཇུག་བསྡུ་ཡོདཔ: (_D)"
+msgstr "ཚེས་གྲངས་མཇུག་བསྡུ་ཡོདཔ་: (_D)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "གཙོ་རིམ: (_P)"
 
@@ -6607,12 +6447,12 @@ msgstr "གཙོ་རིམ: (_P)"
 msgid "_Web Page:"
 msgstr "ཝེབ་ཤོག་ལེབ: (_W)"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
-msgstr "ལས་ཀ། (_T)"
+msgstr "ལས་ཀ (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "ལས་ཀའི་རྒྱས་བཤད།"
 
@@ -6625,10 +6465,6 @@ msgstr "རན་པའི་ཚེས་གྲངས་ ཕྱི་འགྱ�
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'ནང་ལུ་ ལས་ཀ་ཚུ་ ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "ངོ་འཛོམས་པ་ཚུ་...(_n)"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "དབྱེ་རིམ་ཚུ།...(_i)"
@@ -6659,7 +6495,7 @@ msgstr "<b>དཔེ་བསྐྲུན་གྱི་འབྱུང་ཐེ
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
-msgstr "<b>དཔེ་བསྐྲུན་གྱི་གནས་ཁོངས་</b> (_L)"
+msgstr "<b>དཔེ་བསྐྲུན་གནས་ཁོངས་</b> (_L)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
@@ -6769,7 +6605,8 @@ 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:2862
+#: ../calendar/gui/e-cal-component-preview.c:70
+#: ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ཁ་ཕྱེ་ནི་ལུ་ ཨེབ་གཏང་འབད།"
@@ -6783,13 +6620,14 @@ msgstr "བརྗེད་ཐོ་:"
 msgid "Web Page:"
 msgstr "ཝེབ་ཤོག་ལེབ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-preview.c:155
+#: ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "མགོ་མིང་མ་བཏགསཔ།"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "བཅུད་དོན:"
 
@@ -6807,7 +6645,7 @@ msgstr "རན་པའི་ཚེས་གྲངས:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "གནས་ཚད:"
 
@@ -6815,26 +6653,22 @@ msgstr "གནས་ཚད:"
 msgid "Priority:"
 msgstr "གཙོ་རིམ:"
 
-#: ../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:3
-msgid "Description:"
-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
+#: ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321
+#: ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "མི་མང་གི།"
 
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:256
+#: ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "སྒེར་དོན།"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-cal-list-view.c:257
+#: ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "གསང་བ།"
 
@@ -6848,19 +6682,20 @@ 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
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "བཅུད་དོན།"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "ཁོམ་མེད།"
 
@@ -6874,65 +6709,81 @@ msgstr ""
 "\n"
 "༤༥.༤༣༦༨༤༥,༡༢༥.༨༦༢༥༠༡"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005
+#: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ཨིན།"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005
+#: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "མེན།"
 
 #. 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-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:1329
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221
+#: ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "མ་ཤེསཔ།"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "སླར་འབྱུང་།"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "འགན་སྤྲོད་།"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177
+#: ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "དེ་སྦེ་སྲུངས་..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2110
+#: ../calendar/gui/e-cal-popup.c:193
+#: ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "སེལ་འཐུ་འབད་མི་ མཉམ་སྦྲགས་ཚུ་ བསྲུང་ནི་འི་དོན་ལུ་ སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222
+#: ../mail/em-popup.c:437
 #, 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:846
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596
+#: ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087
+#: ../mail/em-popup.c:554
+#: ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "དེ་སྦེ་སྲུངས་...(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277
+#: ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "རྒྱབ་གཞི་བཟུམ་སྦེ་གཞི་སྒྲིག་འབད། (_B)"
@@ -6941,137 +6792,141 @@ msgstr "རྒྱབ་གཞི་བཟུམ་སྦེ་གཞི་སྒ
 msgid "_Save Selected"
 msgstr "སེལ་འཐུ་འབད་མི་སྲུངས།(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400
+#: ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "%sནང་ལུ་ ཁ་ཕྱེ།..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "%༠"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "%༡༠"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "%༢༠"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "%༣༠"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "%༤༠"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "%༥༠"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "%༦༠"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "%༧༠"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "%༨༠"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "%༩༠"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "%༡༠༠"
 
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
+#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-view.c:675
+#: ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "སེལ་འཐུ་འབད་མི་དངོས་པོ་ བཏོན་བཏང་དོ།"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803
+#: ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "དངོས་པོ་དུས་མཐུན་བཟོ་དོ།"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138
+#: ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "དེ་སྦེ་སྲུངས་..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "ལས་ཀ་གསརཔ།(_T)"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "ཝེབ་ཤོག་ལེབ་ཁ་ཕྱེ། (_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597
+#: ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-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:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
-#: ../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:1181
+#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-memo-table.c:859
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1
+#: ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "བཏོག (_C)"
 
-#: ../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:853
-#: ../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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603
+#: ../calendar/gui/e-memo-table.c:861
+#: ../ui/evolution-addressbook.xml.h:57
+#: ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:15
+#: ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19
+#: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "སྦྱར། (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ལས་ཀ་འགན་སྤྲོད་འབད། (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188
+#: ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
-msgstr "ཨའི་ཟླ་ཐོ་བཟུམ་སྦེ་ གདོང་བསྐྱོད་འབད། (_F)"
+msgstr "ཨའི་ཟླ་ཐོ་སྦེ་ གདོང་བསྐྱོད་འབད། (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
-msgstr "མཇུག་བསྡུཝ་སྦེ་ རྟགས་བཀལ། (_M)"
+msgstr "མཇུག་བསྡུཝ་སྦེ་རྟགས་བཀལ། (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
-msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་ མཇུག་བསྡུཝ་སྦེ་ རྟགས་བཀལ། (_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "མཇུག་མ་བསྡུཝ་སྦེ་ རྟགས་བཀལ། (_M)"
+msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་ མཇུག་བསྡུཝ་སྦེ་རྟགས་བཀལ། (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་ མཇུག་མ་བསྡུཝ་སྦེ་ རྟགས་བཀལ། (_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་བཏོན་གཏང་། (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ལས་ཀ་ཅིག་ ཁ་སྐོང་བརྐྱབ་ནི་ལུ་ ཨེབ་གཏང་འབད།"
@@ -7081,7 +6936,8 @@ msgstr "ལས་ཀ་ཅིག་ ཁ་སྐོང་བརྐྱབ་ན�
 msgid "% Complete"
 msgstr "%མཇུག་བསྡུ།"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+#: ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "མཇུག་བསྡུ།"
 
@@ -7106,101 +6962,109 @@ msgstr "འགོ་བཙུགས་ཚེས་གྲངས།"
 msgid "Task sort"
 msgstr "ལས་ཀའི་དབྱེ་སེལ།"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "འགུལ་བསྐྱོད་འབད་མི་རྣམ་གྲངས།"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "རྣམ་གྲངས་ཚུ་ འདྲ་བཤུས་རྐྱབ་དོ།"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "ངོ་འཕྲད་གསརཔ་...(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
-msgstr "ཉིནམ་གང་གི་ བྱུང་ལས་གསརཔ།(_E)"
+msgstr "ཉིནམ་གང་གི་བྱུང་ལས་གསརཔ།(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "འཛོམས་འདུ་གསརཔ།(_M)"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "ལས་ཀ་གསརཔ།(_T)"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "ད་ལྟོའི་མཐོང་སྣང་། (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
-msgstr "ད་རིས་ སེལ་འཐུ་འབད། (_o)"
+msgstr "ད་རིས་སེལ་འཐུ་འབད། (_o)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "ཚེས་གྲངས་སེལ་འཐུ་འབད་...(_S)"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "ཟླ་ཐོ་ལུ་འདྲ་བཤུས་རྐྱབས་...(_y)"
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "ཟླ་ཐོ་ལུ་སྤོ་བཤུད་འབད་... (_v)"
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "འཛོམས་འདུ་བགོ་སྤེལ་འབད་...(_D)"
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "འཛོམས་འདུའི་འཆར་རིམ་བཀོད་...(_S)"
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "ཨའི་ཟླ་ཐོ་བཟུམ་སྦེ་ གདོང་བསྐྱོད་འབད་...(_F)"
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "ལན་གསལ།(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1613
+#: ../mail/em-folder-view.c:1082
+#: ../mail/em-popup.c:559
+#: ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "ཆ་མཉམ་ལུ་ལན་གསལ་གཏང་། (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "འབྱུང་བ་འདི་ སྤོ་བཤུད་འབད་བཏུབ་བཟོ། (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
-msgstr "འབྱུང་བ་འདི་ བཏོན་གཏང་། (_O)"
+msgstr "འབྱུང་བ་འདི་བཏོན་གཏང་། (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "འབྱུང་བ་ཆ་མཉམ་བཏོན་གཏང་། (_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "འགོ་འདྲེན་པ་:%s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "འགོ་འདྲེན་པ་:%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053
+#: ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "གནས་ཁོངས་:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "ཆུ་ཚོད་:%s %s"
@@ -7230,7 +7094,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i སྐར་མའི་སྡེ་ཚན།"
@@ -7241,22 +7105,24 @@ 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:1463
-#: ../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:707
+#: ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312
+#: ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744
+#: ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "སྔ་ཆ།"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747
+#: ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "ཕྱི་ཆ།"
 
@@ -7337,7 +7203,8 @@ msgstr "མཇུག་བསྡུཝ་ཨིན།"
 msgid "Due"
 msgstr "རན་ནི།"
 
-#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
+#: ../calendar/gui/e-itip-control.c:944
+#: ../calendar/gui/e-itip-control.c:1001
 msgid "iCalendar Information"
 msgstr "ཨའི་ཟླ་ཐོའི་བརྡ་དོན།"
 
@@ -7346,8 +7213,10 @@ msgstr "ཨའི་ཟླ་ཐོའི་བརྡ་དོན།"
 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
+#: ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:1077
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7357,43 +7226,40 @@ msgstr "ངོ་མ་ཤེས་པའི་གང་ཟག་ཅིག"
 
 #. Describe what the user can do
 #: ../calendar/gui/e-itip-control.c:1084
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> འོག་གི་བརྡ་དོན་ཚུ་ བསྐྱར་ཞིབ་འབད་ཞིནམ་ལས་ འོག་གི་དཀར་ཆག་ནང་ལས་ བྱ་བ་ཅིག་སེལ་འཐུ་འབད་"
-"གནང་།"
+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/e-meeting-store.c:185
+#: ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "དང་ལེན་འབད་ཡི།"
 
-#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/itip-utils.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད་ཡི།"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/itip-utils.c:675
+#: ../calendar/gui/itip-utils.c:704
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "དང་ལེན་མ་འབད།"
 
 #: ../calendar/gui/e-itip-control.c:1224
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "འཛོམས་འདུ་དེ་ ཆ་མེད་བཏང་ཡོད་རུང་ ཁྱོད་ཀྱི་ཟླ་ཐོ་ཚུ་ནང་ ཐོབ་མ་ཚུགས།"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "ལས་ཀ་དེ་ ཆ་མེད་བཏང་ཡོད་རུང་ ཁྱོད་ཀྱི་ལས་ཀའི་ཐོ་ཡིག་ཚུ་ནང་ ཐོབ་མ་ཚུགས།"
 
 #: ../calendar/gui/e-itip-control.c:1305
@@ -7456,7 +7322,8 @@ msgstr "<b>%s</b> གིས་ འཛོམས་འདུ་ཅིག་ ཆ་
 msgid "Meeting Cancelation"
 msgstr "འཛོམས་འདུ་ཆ་མེད།"
 
-#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1430
 #: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
@@ -7598,15 +7465,17 @@ msgid "Attendee status updated\n"
 msgstr "ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མཐུན་བཟོ་ཡི།\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "རྣམ་གྲངས་དེ་ གནས་ཏེ་མེདཔ་ལས་ ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མཐུན་བཟོ་མི་ཚུགས།"
 
-#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
+#: ../calendar/gui/e-itip-control.c:1998
+#: ../calendar/gui/e-itip-control.c:2046
 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:2000
+#: ../calendar/gui/e-itip-control.c:2050
 msgid "The item could not be sent!\n"
 msgstr "རྣམ་གྲངས་དེ་ བཏང་མ་ཚུགས!\n"
 
@@ -7644,36 +7513,51 @@ msgstr "ལན་བཀོད་པའི་གནས་ཚད་ དུས་�
 msgid "Send Latest Information"
 msgstr "མཐའ་མཇུག་གི་བརྡ་དོན་བཏང་།"
 
-#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../calendar/gui/e-itip-control.c:2345
+#: ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423
+#: ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ཆ་མེད།"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "-- ལུ་--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "ཟླ་ཐོའི་འཕྲིན་དོན།"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "ཚེས་གྲངས།"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "ཟླ་ཐོ་མངོན་གསལ་འབད་དོ།"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "ཟླ་ཐོ་མངོན་གསལ་འབད་དོ་...།"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "སར་བར་གྱི་འཕྲིན་དོན།"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "ཚེས་གྲངས་མཇུག"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "ཚེས་གྲངས་འགོ་བཙུགས།"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "ཁྲི་འཛིན།"
@@ -7692,81 +7576,93 @@ msgid "Resources"
 msgstr "ཐོན་ཁུངས་ཚུ།"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98
+#: ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "ངོ་རྐྱང་།"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100
+#: ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "སྡེ་ཚན།"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "ཐོན་ཁུངས།"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "ཁང་མིག"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "རྐང་ཁྲི།"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "དགོ་པའི་བཅའ་མར་གཏོགས་མི།"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "གདམ་ཁ་ཅན་གྱི་ བཅའ་མར་གཏོགས་མི།"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "བཅའ་མར་མ་གཏོགས་མི།"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "བྱ་བ་དགོཔ།"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "ངེས་མེད།"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "བགོ་སྤེལ་འབད་ཡོདཔ།"
 
 #. The extra space is just a hack to occupy more space for Attendee
 #: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
-msgstr "ངོ་འཛོམས་པ།"
+msgstr "འཛོམས་མི།"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "ལས་སྦྱོར་འབད་བའི་བསྒང་།"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7774,95 +7670,98 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "ཡིག་ཚང་གི་ཕྱི་ཁར།"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "བརྡ་དོན་མིན་འདུག"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "ངོ་འཛོམས་པ་ཚུ་...(_t)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "གདམ་ཁ་ཚུ། (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
-msgstr "ལཱ་འབད་ནིའི་ཆུ་ཚོད་རྐྱངམ་གཅིག་སྟོན། (_o)"
+msgstr "ལཱ་འབད་ནིའི་་ཆུ་ཚོད་རྐྱངམ་གཅིག་སྟོན། (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
-msgstr "ནང་ཟུམ་འབད་ཡོདཔ་སྟོན། (_z)"
+msgstr "ནང་ཟུམ་སྟོན། (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "དལཝ/ཁོམ་མེད་ དུས་མཐུན་བཟོ། (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
-msgstr "_<< (_<)"
+msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "རང་བཞིན་འཐུ་བ། (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
-msgstr ">_>  (_>)"
+msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "མི་མང་དང་ཐོན་ཁུངས་ཆ་མཉམ། (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
-msgstr "མི་མང་ཆ་མཉམ་དང་ ཐོན་ཁུངས་གཅིག (_p)"
+msgstr "མི་་མང་ཆ་མཉམ་དང་ ཐོན་ཁུངས་གཅིག (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "དགོ་པའི་མི་མང་། (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "དགོ་པའི་མི་མང་དང་ ཐོན་ཁུངས་གཅིག (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "འགོ་བཙུགས་ཆུ་ཚོད་: (_S)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "མཇུག་བསྡུ་བའི་ཆུ་ཚོད་: (_E)"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་ཐོ་ཚུ་བཏོན་གཏང་། (_D)"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
-msgstr "བརྗེད་ཐོ་ཅིག་ ཁ་སྐོང་བརྐྱབ་ནི་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "བརྗེད་ཐོ་ཅིག་ཁ་སྐོང་བརྐྱབ་ནི་ལུ་ ཨེབ་གཏང་འབད།"
 
 #: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Memo sort"
-msgstr "བརྗེད་ཐོ་དབྱེ་སེལ།"
+msgstr "བརྗེད་ཐོའི་དབྱེ་སེལ།"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2543
+#: ../calendar/gui/e-memos.c:724
+#: ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7873,14 +7772,15 @@ msgstr ""
 
 #: ../calendar/gui/e-memos.c:772
 msgid "Loading memos"
-msgstr "བརྗེད་ཐོ་ཚུ་མངོན་གསལ་འབད་དོ།"
+msgstr "བརྗེད་ཐོ་ཚུ་ མངོན་གསལ་འབད་དོ།"
 
 #: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
-msgstr "%sལུ་ བརྗེད་ཐོ་ཚུ་ཁ་ཕྱེ་དོ།"
+msgstr "%sལུ་ བརྗེད་ཐོ་ཚུ་ ཁ་ཕྱེ་དོ།"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026
+#: ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "སེལ་འཐུ་ཅན་གྱི་ དངོས་པོ་ཚུ་ བཏོན་བཏང་དོ།"
 
@@ -7889,67 +7789,67 @@ msgstr "སེལ་འཐུ་ཅན་གྱི་ དངོས་པོ་�
 msgid "Enter the password for %s"
 msgstr "%sགི་དོན་ལས་ ཆོག་ཡིག་བཙུགས།"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "ལས་ཀ་ཚུ་ མངོན་གསལ་འབད་དོ།"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%sལུ་ ལས་ཀ་ཚུ་ ཁ་ཕྱེ་དོ།"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "ལས་ཀ་ཚུ་ མཇུག་བསྡུ་དོ།"
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "ཕྱིར་བསྐྲད་བཏང་དོ།"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "དུས་ཚོད་གླིང་སྡེ་སེལ་འཐུ་འབད།"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329
+#: ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:781
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "འདྲི་དཔྱད་དུས་མཐུན་བཟོ་དོ།"
 
-#: ../calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "སྲོལ་སྒྲིག་མཐོང་སྣང་།(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2223
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "སྲོལ་སྒྲིག་མཐོང་སྣང་སྲུངས།(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2228
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "མཐོང་སྣང་ངེས་འཛིན་འབད་...(_D)"
 
-#: ../calendar/gui/gnome-cal.c:2388
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%sལུ་ ངོ་འཕྲད་ཚུ་ མངོན་གསལ་འབད་དོ།"
 
-#: ../calendar/gui/gnome-cal.c:2407
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%sལུ་ ལས་ཀ་ཚུ་ མངོན་གསལ་འབད་དོ།"
 
-#: ../calendar/gui/gnome-cal.c:2511
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "%sཁ་ཕྱེ་དོ།"
 
-#: ../calendar/gui/gnome-cal.c:3384
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "ཕྱིར་བསྐྲད་བཏང་དོ།"
 
@@ -8007,9 +7907,10 @@ msgstr "སྤྱི་ཟླ་དགུ་པ།"
 
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
-msgstr "ད་རིས་ སེལ་འཐུ་འབད། (_S)"
+msgstr "ད་རིས་སེལ་འཐུ་འབད། (_S)"
 
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:412
+#: ../calendar/gui/itip-utils.c:461
 #: ../calendar/gui/itip-utils.c:563
 msgid "An organizer must be set."
 msgstr "འགོ་འདྲེན་པ་ཅིག་ གཞི་སྒྲིག་འབད་དགོ"
@@ -8018,19 +7919,23 @@ msgstr "འགོ་འདྲེན་པ་ཅིག་ གཞི་སྒྲ�
 msgid "At least one attendee is necessary"
 msgstr "ཉུང་མཐའ་ལུ་ ངོ་འཛོམས་པ་གཅིག་དགོ"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:631
+#: ../calendar/gui/itip-utils.c:754
 msgid "Event information"
 msgstr "བྱུང་ལས་ཀྱི་བརྡ་དོན།"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
+#: ../calendar/gui/itip-utils.c:633
+#: ../calendar/gui/itip-utils.c:756
 msgid "Task information"
 msgstr "ལས་ཀའི་བརྡ་དོན།"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
+#: ../calendar/gui/itip-utils.c:635
+#: ../calendar/gui/itip-utils.c:758
 msgid "Journal information"
 msgstr "གསར་དེབ་ཀྱི་བརྡ་དོན།"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:637
+#: ../calendar/gui/itip-utils.c:776
 msgid "Free/Busy information"
 msgstr "དལཝ/ཁོམ་མེད་ཀྱི་བརྡ་དོན།"
 
@@ -8063,18 +7968,15 @@ msgstr "ཁྱོད་ བྱུང་ལས་དེ་གི་ ངོ་འ�
 msgid "You must be an attendee of the event."
 msgstr "ཨའི་ཟླ་ཐོའི་བརྡ་དོན།"
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག་གསརཔ།(_N)"
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
-msgstr[0] "བརྗེད་ཐོ་%d"
-msgstr[1] "བརྗེད་ཐོ་%d"
+msgstr[0] "བརྗེད་ཐོ་%d།"
+msgstr[1] "བརྗེད་ཐོ་%d།"
 
-#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528
+#: ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8089,11 +7991,11 @@ msgstr "བརྗེད་ཐོ་ཚུ་ ཡར་བསྐྱེད་འ�
 #: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བསྐྲུན་གྱི་དོན་ལུ་ བརྗེད་ཐོའི་་ཐོ་ཡིག་'%s' ཁ་ཕྱེ་མ་ཚུགས།"
+msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བསྐྲུན་འབད་ནིའི་དོན་ལུ་ བརྗེད་ཐོ་ཐོ་ཡིག་'%s' ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
-msgstr "བརྗེད་ཐོ་ཚུ་ གསར་བསྐྲུན་གྱི་དོན་ལུ་ ཟླ་ཐོ་འཐོབ་མི་ཚུགས་པས།"
+msgstr "བརྗེད་ཐོ་ཚུ་ གསར་བསྐྲུན་འབད་ནིའི་དོན་ལུ་ ཟླ་ཐོ་འཐོབ་མི་ཚུགས་པས།"
 
 #: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
@@ -8104,20 +8006,20 @@ msgid "New memo"
 msgstr "བརྗེད་ཐོ་གསརཔ།"
 
 #: ../calendar/gui/memos-component.c:1156
-msgid "Mem_o"
-msgstr "བརྗེད་ཐོ།(_o)"
+msgid "_Memo"
+msgstr "བརྗེད་ཐོ།(_M)"
 
 #: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
-msgstr "བརྗེད་ཐོ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
+msgstr "བརྗེད་ཐོ་གསརཔ་ཅིག་གསར་བསྐྲུན་འབད།"
 
 #: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "བརྗེད་ཐོ་གསར་པའི་ཐོ་ཡིག"
 
 #: ../calendar/gui/memos-component.c:1164
-msgid "Memo li_st"
-msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག(_s)"
+msgid "Memo l_ist"
+msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག(_i)"
 
 #: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
@@ -8129,30 +8031,27 @@ msgstr "བརྗེད་ཐོ་ཚུ་དཔར་བསྐྲུན་འ
 
 #: ../calendar/gui/migration.c:162
 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 ""
-"ཨི་བོ་ལུ་ཤཱན་ 1.x.ལས་ཚུར་ ཨི་བོ་ལུ་ཤཱན་ ལས་ཀའི་སྣོད་འཛིན་ཚུ་གི་ གནས་ཁོངས་དང་ སྡེ་རིམ་ཚུ་ གྱུར་བ་སོང་"
-"ནུག\n"
+"ཨི་བོ་ལུ་ཤཱན་ 1.x.ལས་ཚུར་ ཨི་བོ་ལུ་ཤཱན་ ལས་ཀའི་སྣོད་འཛིན་ཚུ་གི་ གནས་ཁོངས་དང་ སྡེ་རིམ་ཚུ་ གྱུར་བ་སོང་ནུག\n"
 "\n"
 "\"ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་འབད་བའི་རིང་ བཟོད་པ་བསྒོམ་གནང་།"
 
 #: ../calendar/gui/migration.c:166
 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 ""
-"ཨི་བོ་ལུ་ཤཱན་ 1.x.ལས་ཚུར་ ཨི་བོ་ལུ་ཤཱན་ ཟླ་ཐོའི་སྣོད་འཛིན་ཚུ་གི་ གནས་ཁོངས་དང་ སྡེ་རིམ་ཚུ་ གྱུར་བ་སོང་"
-"ནུག\n"
+"ཨི་བོ་ལུ་ཤཱན་ 1.x.ལས་ཚུར་ ཨི་བོ་ལུ་ཤཱན་ ཟླ་ཐོའི་སྣོད་འཛིན་ཚུ་གི་ གནས་ཁོངས་དང་ སྡེ་རིམ་ཚུ་ གྱུར་བ་སོང་ནུག\n"
 "\"\"\n"
 "\"ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་འབད་བའི་རིང་ བཟོད་པ་བསྒོམ་གནང་།"
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
+#: ../calendar/gui/migration.c:765
+#: ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "ཨི་བོ་ལུ་ཤཱན་/ཀཱོན་ཕིག་.ཨེགསི་ཨེམ་ཨེལ་ཌི་བི་ནང་ལས་ གཞི་སྒྲིག་རྙིངམ་ཚུ་ གཞིས་སྤོ་འབད་མ་ཚུགས།"
 
@@ -8168,240 +8067,244 @@ msgstr "ཟླ་ཐོ་`%sགཞིས་སྤོ་འབད་མ་ཚུ
 msgid "Unable to migrate tasks `%s'"
 msgstr "ལས་ཀ་`%sགཞིས་སྤོ་འབད་མ་ཚུགས།"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "༡པ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "༢པ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "༣པ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "༤པ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "༥པ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "༦པ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "༧པ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "༨པ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "༩པ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "༡༠པ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "༡༡པ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "༡༢པ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "༡༣པ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "༡༤པ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "༡༥པ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "༡༦པ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "༡༧པ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "༡༨པ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "༡༩པ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "༢༠པ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "༢༡པ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "༢༢པ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "༢༣པ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "༢༤པ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "༢༥པ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "༢༦པ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "༢༧པ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "༢༨པ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "༢༩པ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "༣༠པ"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "༣༡པ"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "ཟླ།"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "མིག"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "ལྷག"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "ཕུར།"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "སངས།"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "སྤེན།"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "ཉི།"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "སེལ་འཐུ་འབད་མི་གཟའ། (%a %b %d %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948
+#: ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953
+#: ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "སེལ་འཐུ་འབད་མི་བདུན་ཕྲག(%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "སེལ་འཐུ་འབད་མི་ཟླཝ།(%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "སེལ་འཐུ་འབད་མི་ལོ།(%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "ངོ་འཕྲད།"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "ལས་ཀ།"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "བཅུད་དོན:%s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "གནས་ཚད་%s།"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "གཙོ་རིམ་: %s། "
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "བརྒྱ་ཆ་མཇུག་བསྡུ་ཡོདཔ་: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "ཡུ་ཨར་ཨེལ་: %s།"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "དབྱེ་རིམ་: %s།"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 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
+#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799
+#: ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "དཔར་བསྐྲུན་སྔོན་ལྟ།"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "དཔར་བསྐྲུན་རྣམ་གྲངས།"
 
@@ -8458,30 +8361,28 @@ msgid "New task list"
 msgstr "ལས་ཀ་གསར་པའི་ཐོ་ཡིག"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
-msgstr "ལས་ཀའི་ཐོ་ཡིག  (_k)"
+msgid "Task l_ist"
+msgstr "ལས་ཀའི་ཐོ་ཡིག  (_i)"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "ལས་ཀ་གསར་པའི་ཐོ་ཡིག་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"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"
-"ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་པ་ཅིན་ ལས་ཀ་འདི་ཚུ་ སོར་ཆུད་འབད་མི་ཚུགས། ལས་ཀ་འདི་ཚུ་ ཐད་རི་འབད་རི་ ཀྲེག་གཏང་"
-"ནི་ཨིན་ན?"
+"ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་པ་ཅིན་ ལས་ཀ་འདི་ཚུ་ སོར་ཆུད་འབད་མི་ཚུགས། ལས་ཀ་འདི་ཚུ་ ཐད་རི་འབད་རི་ ཀྲེག་གཏང་ནི་ཨིན་ན?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "ང་ལུ་ ལོག་སྟེ་མ་འདྲི།"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "ལས་ཀ་ཚུ་ དཔར་བསྐྲུན་འབད།"
 
@@ -8542,7 +8443,7 @@ msgstr "ཨཕ་རི་ཀ/ཨེཀ་ར།"
 
 #: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
-msgstr "ཨཕ་རི་ཀ/ཨ་ཌིསི་ ཨ་བ་བ།  (_A)"
+msgstr "ཨཕ་རི་ཀ/ཨ་ཌིསི་_ཨ་བ་བ།  (_A)"
 
 #: ../calendar/zones.h:10
 msgid "Africa/Algiers"
@@ -8602,7 +8503,7 @@ msgstr "ཨཕ་རི་ཀ/ཌ་ཀར།"
 
 #: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
-msgstr "ཨཕ་རི་ཀ/ད་རེསི་ས་ལམ། "
+msgstr "ཨཕ་རི་ཀ/ད་རེསི་ ས་ལམ། "
 
 #: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
@@ -8614,7 +8515,7 @@ msgstr "ཨཕ་རི་ཀ/དོ་ཝ་ལ།"
 
 #: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
-msgstr "ཨཕ་རི་ཀ/ཨིལ་ཨ་ཡུན། (_A)"
+msgstr "ཨཕ་རི་ཀ/ཨེལ་ ཨའི་ཡུན། (_A)"
 
 #: ../calendar/zones.h:28
 msgid "Africa/Freetown"
@@ -8798,7 +8699,7 @@ msgstr "ཨ་མི་རི་ཀ/བུས་ནོསི་ཨེ་རེ�
 
 #: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
-msgstr "ཨ་མི་རི་ཀ/ཀེམ་བིརིཇི་ བཱེ།(_B)"
+msgstr "ཨ་མི་རི་ཀ/ཀེམ་བིརིཇི་བཱེ།(_B)"
 
 #: ../calendar/zones.h:74
 msgid "America/Cancun"
@@ -8878,7 +8779,7 @@ msgstr "ཨ་མི་རི་ཀ/ཨི་རུ་ནེ་པི།"
 
 #: ../calendar/zones.h:93
 msgid "America/El_Salvador"
-msgstr "ཨ་མི་རི་ཀ/ཨེལ་ སེལ་བེ་ཌོར།(_S)"
+msgstr "ཨ་མི་རི་ཀ/ཨེལ་སེལ་བེ་ཌོར།(_S)"
 
 #: ../calendar/zones.h:94
 msgid "America/Fortaleza"
@@ -8886,7 +8787,7 @@ msgstr "ཨ་མི་རི་ཀ/ཕོར་ཊ་ལི་ཛ།"
 
 #: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
-msgstr "ཨ་མི་རི་ཀ/གེལེསི་ བཱེ།(_B)"
+msgstr "ཨ་མི་རི་ཀ/གེལེསི་བཱེ།(_B)"
 
 #: ../calendar/zones.h:96
 msgid "America/Godthab"
@@ -8894,11 +8795,11 @@ msgstr "ཨ་མི་རི་ཀ/གོཌི་ཐབ།"
 
 #: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
-msgstr "ཨ་མི་རི་ཀ/གུསི་ བཱེ།(_B)"
+msgstr "ཨ་མི་རི་ཀ/གུསི་བཱེ།(_B)"
 
 #: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
-msgstr "ཨ་མི་རི་ཀ/གེརེནཌི་ ཊརཀ(_T)"
+msgstr "ཨ་མི་རི་ཀ/གེརེནཌི་ཊརཀ(_T)"
 
 #: ../calendar/zones.h:99
 msgid "America/Grenada"
@@ -8982,7 +8883,7 @@ msgstr "ཨ་མི་རི་ཀ/ཀེན་ཊ་ཀི/མཱོན་ཊ�
 
 #: ../calendar/zones.h:119
 msgid "America/La_Paz"
-msgstr "ཨ་མི་རི་ཀ/ལཱ་ པཱཛ། (_P)"
+msgstr "ཨ་མི་རི་ཀ/ལཱ་པཱཛ། (_P)"
 
 #: ../calendar/zones.h:120
 msgid "America/Lima"
@@ -9059,7 +8960,7 @@ msgstr "ཨ་མི་རི་ཀ/ན་སའོ།"
 #: ../calendar/zones.h:138
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
-msgstr "ཨ་མི་རི་ཀ/ནིའུ་ཡོརཀ། (_Y)"
+msgstr "ཨ་མི་རི་ཀ/ནིའུ་ཡོརོཀ(_Y)"
 
 #: ../calendar/zones.h:139
 msgid "America/Nipigon"
@@ -9107,7 +9008,7 @@ msgstr "ཨ་མི་རི་ཀ/པོར་ཊོ་བེ་ལྷོ།(_
 
 #: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
-msgstr "ཨ་མི་རི་ཀ/པུར་ཊོ་རི་ཀོ(_R)"
+msgstr "ཨ་མི་རི་ཀ/པུར་ཊོ་རི་ཀོ།(_R)"
 
 #: ../calendar/zones.h:151
 msgid "America/Rainy_River"
@@ -9159,7 +9060,7 @@ msgstr "ཨ་མི་རི་ཀ/སེནཊི་ཇཱོནསི།(_J)"
 
 #: ../calendar/zones.h:163
 msgid "America/St_Kitts"
-msgstr "ཨ་མི་རི་ཀ/སེན་ཊི་ཀིཊིསི།(_K)"
+msgstr "ཨ་མི་རི་ཀ/སེནཊི་ཀིཊིསི།(_K)"
 
 #: ../calendar/zones.h:164
 msgid "America/St_Lucia"
@@ -9603,11 +9504,11 @@ msgstr "ཨེཊི་ལེན་ཊིཀ་/རེག་ཇ་བིཀ།"
 
 #: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/སའུཐ་ཇོར་ཇི་ཡ།(_G)"
+msgstr "ཨེཊི་ལེན་ཊིཀ་/སའུཐ་-ཇོར་ཇི་ཡ།(_G)"
 
 #: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/ཨེནཊི་ཧེ་ལི་ན།(_H)"
+msgstr "ཨེཊི་ལེན་ཊིཀ་/སེནཊི་ཧེ་ལི་ན།(_H)"
 
 #: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
@@ -10076,7 +9977,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་།"
 
@@ -10084,43 +9985,31 @@ msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་།"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238
+#: ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441
+#: ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ཡིག་སྣོད་%s: %sམཉམ་སྦྲགས་འབད་མ་ཚུགས།"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246
+#: ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ཡིག་སྣོད་%s: མཉམ་སྦྲགས་འབད་མི་ཚུགས་པས། དུས་རྒྱུན་གྱི་ཡིག་སྣོད་ཅིག་མེན་པས།"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "མཉམ་སྦྲགས་ཀྱི་རྒྱུ་དངོས་ཚུ།"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "ཡིག་སྣོད་མིང་:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "མ་ཡིམ་གྱི་དབྱེ་བ:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "གནས་བསྐྱོད་འགྲོ་ཡུལ།"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "འཕྲིན་དོན་གནས་བསྐྱོད་ཀྱི་དོན་ལས་ སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་དོན་ལས་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
@@ -10131,64 +10020,60 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་དོན་ལས་
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "ལན་གསལ་གཏང་ཡུལ་:(_R)"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
-msgstr "ལས་:(_o)"
+msgstr "ལས:(_o)"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "དོན་ཚན་:(_u)"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
-msgstr "ལུ་: (_T)"
+msgstr "ལུ: (_T)"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "འཕྲིན་དོན་ལེན་མཁན་བཙུགས།"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
-msgstr "ཤོག་ནང་འདྲ་བཤུས་: (_C)"
+msgstr "ཤོག་གནག་འདྲ་བཤུས་: (_C)"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "འཕྲིན་དོན་གྱི་ཤོག་གནག་འདྲ་བཤུས་ཅིག་འཐོབ་ནིའི་ ཁ་བྱང་ཚུ་བཙུགས།"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
-msgstr "མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་: (_B)"
+msgstr "མ་མཐོང་བའི་ཤོག་གནག་འདྲ་བཤུས་: (_C)"
 
-#: ../composer/e-msg-composer-hdrs.c:656
-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:651
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+msgstr "འཕྲིད་དོན་ལེན་མཁན་གྱི་ ཐོ་ཡིག་ནང་མ་ཐོན་པར་ འཕྲིན་དོན་གྱི་ ཤོག་གནག་འདྲ་བཤུས་ཅིག་འཐོབ་ནིའི་ ཁ་བྱང་ཚུ་བཙུགས།"
 
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
-msgstr "གནས་བསྐྱོད་ཡུལ་: (_P)"
+msgstr "གནས་བསྐྱོད་ཡུལ། (_P)"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "གནས་བསྐྱོད་འབད་ནིའི་ ཡིག་སྣོད་ཚུ་སེལ་འཐུ་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "གནས་བསྐྱོད་ཡུལ:"
 
@@ -10196,114 +10081,98 @@ msgstr "གནས་བསྐྱོད་ཡུལ:"
 msgid "A_ttach"
 msgstr "མཉམ་སྦྲགས་འབད།(_t)"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
-msgstr "མཉམ་སྦྲགསབཙུགས།"
+msgstr "མཉམ་སྦྲགས་བཙུགས།"
 
-#: ../composer/e-msg-composer.c:827
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"ཕྱིར་གཏང་འཕྲིན་དོན་ལུ་ མིང་རྟགས་བཀོད་མི་ཚུགས་པས། རྩིས་ཐོ་འདི་གི་དོན་ལས་ མིང་རྟགས་ལག་ཁྱེར་ གཞི་སྒྲིག་མ་"
-"འབད་བས།"
+#: ../composer/e-msg-composer.c:828
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "ཕྱིར་གཏང་འཕྲིན་དོན་ལུ་ མིང་རྟགས་བཀོད་མི་ཚུགས་པས། རྩིས་ཐོ་འདི་གི་དོན་ལས་ མིང་རྟགས་ལག་ཁྱེར་ གཞི་སྒྲིག་མ་འབད་བས།"
 
-#: ../composer/e-msg-composer.c:834
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"ཕྱིར་གཏང་འཕྲིན་དོན་ གསང་བ་བཟོ་མི་ཚུགས་པས། རྩིས་ཐོ་འདི་གི་དོན་ལས་ གསང་བཟོའི་ལག་ཁྱེར་ གཞི་སྒྲིག་མ་"
-"འབད་བས།"
+#: ../composer/e-msg-composer.c:835
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "ཕྱིར་གཏང་འཕྲིན་དོན་ གསང་བ་བཟོ་མི་ཚུགས་པས། རྩིས་ཐོ་འདི་གི་དོན་ལས་ གསང་བཟོའི་ལག་ཁྱེར་ གཞི་སྒྲིག་མ་འབད་བས།"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295
+#: ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
-msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ་བཞག(_A)"
+msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ།(_A)"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298
+#: ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
-msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན།(_A)"
+msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན་།(_A)"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330
+#: ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "རྒྱུ་མཚན་ཧ་མ་གོ"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "ཞུན་དགཔ་ལས་ འཕྲིན་དོན་སླར་འདྲེན་འབད་མི་ཚུགས་པས།"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "མགོ་མིང་མ་བཏགས་པའི་འཕྲིན་དོན།"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 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
+#: ../composer/e-msg-composer.c:2151
+#: ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "རང་བཞིན་གྱིས་བཟོ་བསྐྲུན་འབད་ཡོདཔ།"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 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:2522
+#: ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
-msgstr "འཕྲིན་དོན་བརྩམས།"
+msgstr "འཕྲིན་དོན་བརྩམ།"
 
-#: ../composer/e-msg-composer.c:5006
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(རྩོམ་མཁན་ལུ་ ཚིག་ཡིག་མེན་པའི་ འཕྲིན་དོན་མ་གཟུགས་ཅིག་ཡོད་མི་དེ་ ཞུན་དག་འབད་མི་བཏུབ་པས)། <b>"
+#: ../composer/e-msg-composer.c:4974
+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?"
-msgstr ""
-"ཁྱོད་ཀྱིས་བརྩམ་པའི་བསྒང་ཡོད་མི་ འཕྲིད་དོན་མགོ་མིང་'{0}'འབད་མི་དེ་ བཏོན་བཀོག་ནི་ ངེས་ཏིག་ཨིན་ན?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+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;ལུ་བརྟེན་ཏེ་ ཁྱོད་ཀྱིས་ཡིག་འཕྲིན་གྱི་གདམ་ཁ་སོ་སོ་ཚུ་ སེལ་འཐུ་འབད་དགོཔ་འོང་།"
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
+#: ../composer/mail-composer.error.xml.h:5
+#: ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr " &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."
@@ -10342,32 +10211,22 @@ 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 "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "ཡིག་སྣོད་`{0}' དེ་ དུས་རྒྱུན་གྱི་ཡིག་སྣོད་ཅིག་མེནམ་ལས་ འཕྲིན་དོན་ཅིག་ནང་ གཏང་མི་ཚུགས། "
 
 #: ../composer/mail-composer.error.xml.h:18
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"སྣོད་ཐོ་འདི་ནང་གི་ ནང་དོན་ཚུ་ མཉམ་སྦྲགས་གཏང་ནིའི་དོན་ལུ་ སྣོད་ཐོ་འདི་ནང་གི་ ཡིག་སྣོད་ཚུ་ རེ་རེ་སྦེ་ "
-"མཉམ་སྦྲགས་གཏང་དགོཔ་ད་ ཡང་ཅིན་ སྣོད་ཐོ་དེ་གི་ ཡིག་མཛོད་ཅིག་ གསར་བསྐྲུན་འབད་ཞིནམ་ལས་ མཉམ་སྦྲགས་"
-"གཏང་དགོ "
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr "སྣོད་ཐོ་འདི་ནང་གི་ ནང་དོན་ཚུ་ མཉམ་སྦྲགས་གཏང་ནིའི་དོན་ལུ་ སྣོད་ཐོ་འདི་ནང་གི་ ཡིག་སྣོད་ཚུ་ རེ་རེ་སྦེ་ མཉམ་སྦྲགས་གཏང་དགོཔ་ད་ ཡང་ཅིན་ སྣོད་ཐོ་དེ་གི་ ཡིག་མཛོད་ཅིག་ གསར་བསྐྲུན་འབད་ཞིནམ་ལས་ མཉམ་སྦྲགས་གཏང་དགོ "
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཞུན་དག་པའི་ཚད་འཛིན་ ཤུགས་ལྡན་བཟོ་མ་ཚུགས།.\n"
 "\n"
@@ -10395,7 +10254,7 @@ msgstr "ཁྱོད་ཀྱིས་ ཡིག་འཕྲིན་མ་བ�
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "_Do not Recover"
-msgstr "སླར་སོར་མ་འབད།(_D)"
+msgstr "སླར་གསོ་མ་འབད།(_D)"
 
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Recover"
@@ -10407,17 +10266,18 @@ msgstr "འཕྲིན་དོན་སྲུངས། (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "ཨི་བོ་ལུ་ཤཱན།"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+#: ../data/evolution.desktop.in.in.h:2
+#: ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "གུ་རུབ་ཝེར་ སུཊི།"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "The Evolution PIM and Email Client"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ པི་ཨའི་ཨེམ་དང་ ཡིག་འཕྲིན་ཞབས་ཏོ་སྤྱོད་མི།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ པི་ཨའི་ཨེམ་དང་ གློག་འཕྲིན་ཞབས་ཏོག་སྤྱོད་མི།"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10447,8 +10307,7 @@ msgstr "<b>གནས་ཚད་:</b>"
 
 #: ../designs/OOA/ooa.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"
@@ -10464,7 +10323,7 @@ msgstr "ད་ལྟོ་ང་ ཡིག་ཚང་གི་ཕྱི་ཁ�
 
 #: ../designs/OOA/ooa.glade.h:10
 msgid "No, Do not Change Status"
-msgstr "མེན། གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད།"
+msgstr "མི་བཏུབ་ གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད།"
 
 #: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
@@ -10475,57 +10334,52 @@ msgid "Yes, Change Status"
 msgstr "བཏུབ་ གནས་ཚད་བསྒྱུར་བཅོས་འབད།"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "    "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>གློག་འཕྲིན་ཐོབ་དོ།</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>གློག་འཕྲིན་གཏང་དོ།</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"ཤོག་ལེབ་འདི་གིས་ ཁྱོད་ཀྱིས་བཏང་མི་འཕྲིན་དོན་དེ་ལྷག་པའི་སྐབས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་བརྒྱུད་དེ་ ཁྱོད་ལུ་བརྡ་"
-"དོན་འབད་ནིའི་ གདམ་ཁ་བརྐྱབ་ཚུགས་ནི་དང་ གཞན་མི་གཅིག་གིས་ ཁྱོད་ལས་འབྱོར་རྟགས་དགོ་པའི་ཞུ་བ་འབདཝ་ད་ "
-"ཨི་བོ་ལུ་ཤཱན་གྱིས་ ག་ཅི་འབད་དགོཔ་ཨིན་ན་ གསལ་བཀོད་འབད་ཚུགས།"
+"<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
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "ཨ་རྟག་རང་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཅིག་ལོག་སྐྱེལ་།"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "ང་ལུ་ ལྷག་ཡོད་པའི་ འབྱོར་རྟགས་ཅིག་ གཏང་དགོ་ག་མི་དགོ་དྲིས།"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "ནམ་ཡང་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ལོག་མ་གཏང་།"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "འབྱོར་རྟགས་ཚུ་ལྷག"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "ང་གིས་བསྐྱལ་མི་ འཕྲིན་དོན་ཆ་མཉམ་གྱི་དོན་ལས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་ཅིག་སྐྱེལ་གནང་།"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "འཕྲིད་དོན་དེ་ འཕྲིན་སྐྱེལ་ཐོ་ཡིག་ཅིག་ནང་ བཏངམ་མ་གཏོགས ང་རང་ལུ་དངོས་སུ་མེན་པ་ཅིན།"
 
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr ""
-"ཁྱོད་ཀྱིས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་དགོ་པའི་ ཞུ་བ་དང་སྦྲགས་ཏེ་ འཕྲིད་དོན་ཅིག་ཐོབ་པའི་སྐབས ཨི་བོ་ལུ་ཤཱན་"
-"གྱིས་ ག་ཅི་འབད་དགོཔ་ཨིན་ན?"
+#: ../designs/read_receipts/read.glade.h:12
+msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgstr "ཁྱོད་ཀྱིས་ ལྷག་ཡོད་པའི་འབྱོར་རྟགས་དགོ་པའི་ ཞུ་བ་དང་སྦྲགས་ཏེ་ འཕྲིད་དོན་ཅིག་ཐོབ་པའི་སྐབས ཨི་བོ་ལུ་ཤཱན་གྱིས་ ག་ཅི་འབད་དགོཔ་ཨིན་ན?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10533,31 +10387,36 @@ msgstr ""
 "མིང་དེ་ཡོད་མི་ ཡིག་སྣོད་ཅིག་ ཧེ་མ་ལས་རང་འདུག.\n"
 "ཚབ་སྲུང་འབད་ནི་ཨིན་ན?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "ཡིག་སྣོད་སླར་བསྲུང་འབད་ནི་ཨིན་ན?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84
+#: ../e-util/e-error.c:85
+#: ../e-util/e-error.c:127
 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:86
+#: ../e-util/e-error.c:87
+#: ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ཉེན་བརྡ།"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་བརྡ་དོན།"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་འདྲི་དཔྱད།"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
-msgstr "ནང་འཁོད་ཀྱི་འཛོལ་བ་ མ་ཤེས་པའི་འཛོལ་བ་ '%s' ཞུ་བ་འབད་ཡོདཔ།"
+msgstr "ནང་འཁོད་ཀྱི་འཛོལ་བ། མ་ཤེས་པའི་འཛོལ་བ་ '%s' གི་ཞུ་བ་འབད་ནུག"
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10575,7 +10434,8 @@ msgstr "ཚབ་སྲུང་འབད་ནིའི་ རེ་འདོ�
 msgid "File exists &quot;{0}&quot;."
 msgstr "ཡིག་སྣོད་&quot;{0}&quot;འདུག"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "ཚབ་སྲུང་འབད། (_O)"
 
@@ -10636,7 +10496,8 @@ msgstr[1] "ལོ་%d གི་ཧེ་མ།"
 msgid "<click here to select a date>"
 msgstr "ཚེས་གྲངས་སེལ་འཐུ་འབད་ནིའི་དོན་ལུ་ ནཱ་ལུ་ ཨེབ་གཏང་འབད།"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:299
 msgid "now"
 msgstr "ད་ལྟོ་།"
 
@@ -10649,28 +10510,33 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "ག་བསྡུར་བརྐྱབ་ནིའི་དོན་ལས་ དུས་ཚོད་ཅིག་སེལ་འཐུ་འབད།"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "ཡིག་སྣོད་ཅིག་ གདམ་ཁ་རྐྱབས།"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../filter/filter-label.c:121
+#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1052
+#: ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "གལ་ཅན།"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124
+#: ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "ཊུ་ཌུ"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125
+#: ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "ཤུལ་ལས།"
 
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "བརྟག་ཞིབ།"
 
@@ -10680,7 +10546,7 @@ msgstr "མིང་འཚོལ་ཞིབ་འབད་: (_S)"
 
 #: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
-msgstr "འོག་གི་ཁྱད་ཚད་ཚང་མི་ རྣམ་གྲངས་ཚུ་འཚོལ།"
+msgstr "འོག་གི་ཁྱད་ཚད་ཚང་མི་རྣམ་གྲངས་ཚུ་འཚོལ།"
 
 #: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
@@ -10688,7 +10554,7 @@ msgstr "ཁྱད་ཚད་ཆ་མཉམ་ཚང་པ་ཅིན།"
 
 #: ../filter/filter-rule.c:866
 msgid "If any criteria are met"
-msgstr "ཁྱད་ཚད་གང་རུང་ཚང་པ་ཅིན།"
+msgstr "ཁྱད་ཚད་གང་རུང་ཅིག་ཚང་པ་ཅིན།"
 
 #: ../filter/filter-rule.c:868
 msgid "Find items:"
@@ -10708,18 +10574,20 @@ msgstr "ལན་གསལ་ཚུ་དང་ རྩ་ལག་ཚུ།"
 
 #: ../filter/filter-rule.c:889
 msgid "No reply or parent"
-msgstr "ལན་གསལ་ ཡང་ན་ མ་ལག་མིན་འདུག"
+msgstr "ལན་གསལ་ ཡང་ན་ རྩ་ལག་མིན་འདུག"
 
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr "ཐེརེཌི་གྲངས་སུ་བཙུགས།"
 
-#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../filter/filter-rule.c:986
+#: ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "ནང་འབྱོར།"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986
+#: ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "ཕྱིར་གཏང་།"
 
@@ -10743,7 +10611,8 @@ msgstr "ཚེས་གྲངས་བརླག་སྟོར།"
 msgid "Missing file name."
 msgstr "ཡིག་སྣོད་ཀྱི་མིང་བརླག་སྟོར།"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "མིང་བརླག་སྟོར།"
 
@@ -10815,7 +10684,8 @@ msgstr "ཧེ་མ།"
 msgid "months"
 msgstr "ཟླཝ།"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18
+#: ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "སྐར་ཆ།"
 
@@ -10848,8 +10718,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
@@ -10884,22 +10753,25 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཡིག་འཕྲིན་�
 msgid "Evolution Mail preferences control"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཡིག་འཕྲིན་གྱི་ དགའ་གདམ་ཚད་འཛིན།"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/importers/pine-importer.c:387
+#: ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579
+#: ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "ཡིག་འཕྲིན།"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "ཡིག་འཕྲིན་རྩིས་ཐོ།"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "ཡིག་འཕྲིན་གྱི་དགའ་གདམ"
 
@@ -10925,8 +10797,9 @@ msgstr ""
 "%s གི་དོན་ལས་ ཆོག་ཐམ་གན་འཛིན་དེ་ \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:482
+#: ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
@@ -10934,11 +10807,13 @@ msgstr "སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 msgid "Ask for each message"
 msgstr "འཕྲིན་དོན་རེ་རེའི་དོན་ལུ་དྲིས།"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780
+#: ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "ངོ་རྟགས།"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829
+#: ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "གློག་འཕྲིན་འཐོབ་དོ།"
 
@@ -10946,43 +10821,52 @@ msgstr "གློག་འཕྲིན་འཐོབ་དོ།"
 msgid "Automatically check for _new mail every"
 msgstr "ཡིག་འཕྲིན་གསརཔ་ ཡོད་ཚད་གཅིགཔ་ རང་བཞིན་གྱིས་ ཞིབ་དཔྱད་འབད།(_n)"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194
+#: ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "གློག་འཕྲིན་གཏང་དོ།"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253
+#: ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "སྔོན་སྒྲིག"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2319
+#: ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "སྲུང་སྐྱོབ།"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
+#: ../mail/em-account-editor.c:2356
+#: ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "གདམ་ཁ་འཐོབ་དོ།"
 
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2357
+#: ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "ཡིག་འཕྲིན་གསརཔ་ཡོད་མེད་ ཞིབ་དཔྱད་རྐྱབ་དོ།"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "རྩིས་ཐོའི་ཞུན་དགཔ།"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795
+#: ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ རྩིས་ཐོའི་ལས་རོགས།"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c: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:331
+#: ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:411
 msgid "Enable"
 msgstr "ལྕོགས་ཅན་བཟོ།"
@@ -10993,22 +10877,24 @@ msgid "[Default]"
 msgstr "[སྔོན་སྒྲིག]།"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518
+#: ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "ལྕོགས་ཅན།"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "རྩིས་ཐོའི་མིང་།"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "གནད་སྤེལ་ལམ་ལུགས།"
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/em-composer-prefs.c:311
+#: ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "མིང་མ་བཏགསཔ།"
 
@@ -11024,7 +10910,8 @@ msgstr "མིང་རྟགས་ཡིག་ཚུགས་ ཁ་སྐོ�
 msgid "Signature(s)"
 msgstr "མིང་རྟགས(ཚུ)"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874
+#: ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-----གདོང་བསྐྱོད་འབད་ཡོད་པའི་འཕྲིན་དོན་-----"
 
@@ -11036,16 +10923,12 @@ 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:1712
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"$ལུ་ (ཨེབ་བིརིབ་ ཝིཀ་ཌེ་ ནེམ) $(ལོ)-$(ཟླཝ)-$(གཟའ) $ ལུ(ཆུ་ཚོད་༢༤): $(སྐར་མ)།$(ཆུ་ཚོད་གླིང་སྡེ)་"
-"$(སྐྱེལ་མི) བྲིས་ཡོདཔ་:"
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "$ལུ་ (ཨེབ་བིརིབ་ ཝིཀ་ཌེ་ ནེམ) $(ལོ)-$(ཟླཝ)-$(གཟའ) $ ལུ(ཆུ་ཚོད་༢༤): $(སྐར་མ)།$(ཆུ་ཚོད་གླིང་སྡེ)་$(སྐྱེལ་མི) བྲིས་ཡོདཔ་:"
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
-msgstr "བཙག་ནིའི་ལམ་ལུགས། (_F)"
+msgstr "ཚགས་མའི་ལམ་ལུགས། (_F)"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11084,9 +10967,12 @@ msgstr "ཚེས་གྲངས་ཐོབ་ཡོད།"
 msgid "Date sent"
 msgstr "ཚེས་གྲངས་བཏང་ཡོད།"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
+#: ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "བཏོན་གཏང་།"
 
@@ -11178,7 +11064,8 @@ msgstr "མེན།"
 msgid "is not Flagged"
 msgstr "ཟུར་རྟགས་མ་བཀལ་བས།"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35
+#: ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "མཁོ་མེད།"
@@ -11187,7 +11074,8 @@ msgstr "མཁོ་མེད།"
 msgid "Junk Test"
 msgstr "མཁོ་མེད་བརྟག་ཞིབ།"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ཁ་ཡིག"
 
@@ -11227,11 +11115,12 @@ msgstr "ལས་རིམ་ལུ་མཐུད།"
 msgid "Play Sound"
 msgstr "སྒྲ་སྐད་གཏང་།"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#: ../mail/em-filter-i18n.h:47
+#: ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "ལྷག"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "ལེན་མཁན།"
 
@@ -11259,11 +11148,12 @@ msgstr "ལས་ཉུངམ་སྦེ་ སླར་ལོགཔ་ཨི�
 msgid "Run Program"
 msgstr "ལས་རིམ་གཡོག་བཀོལ།"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "སྐུགས་གྲངས།"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "གཏང་མི།"
 
@@ -11295,9 +11185,12 @@ msgstr "ཐོག་ལས་་འགོ་བཙུགསཔ་ཨིན།"
 msgid "Stop Processing"
 msgstr "ལས་སྦྱོར་བཀག"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-format-html.c:1584
+#: ../mail/em-format-quote.c:313
+#: ../mail/em-format.c:849
+#: ../mail/em-mailer-prefs.c:90
+#: ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11313,42 +11206,10 @@ msgstr "གནས་ཚད་སྒྲིག་བཤོལ་འབད།"
 msgid "<b>Then</b>"
 msgstr "<b>དེ་ལས་</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "འཚོལ་ཞིབ་ནང་ལས་ འཚོལ་ཞིབ་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད།(_r)"
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "འཕྲིན་དོན་ཆ་མཉམ།"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ།"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "ཁ་ཡིག་མིན་འདུག།"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "ལྷག་ཚར་མི་ འཕྲིན་དོན་ཚུ།"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "འཕྲལ་གྱི་འཕྲིན་དོན་ཚུ།"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "འདས་པའི་ཉིནམ་ ༥ གི་འཕྲིན་དོན་ཚུ།"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "མཉམ་སྦྲགས་དང་བཅས་པའི་འཕྲིན་དོན་ཚུ།"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "མཁོ་མེད་མེན་པའི་འཕྲིན་དོན་ཚུ།"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
@@ -11361,7 +11222,7 @@ msgstr[1] "འཕྲིན་དོན་བསྡོམས་: "
 #: ../mail/em-folder-properties.c:163
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ་:"
+msgstr[0] "མ་ལྷག་པའི་འཕྲིན་དོན་:"
 msgstr[1] "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ་:"
 
 #: ../mail/em-folder-properties.c:316
@@ -11381,109 +11242,127 @@ msgstr "གསར་བསྐྲུན་འབད"
 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:203
+#: ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:938
+#: ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "སྣོད་འཛིན་ཚུ་འཚོལ་ཞིབ་འབད།"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:211
 msgid "UNMATCHED"
 msgstr "མཐུན་མིན།"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
+#: ../mail/em-folder-tree-model.c:484
+#: ../mail/mail-component.c:151
 msgid "Drafts"
 msgstr "ཟིན་བྲིས་ཚུ།"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:487
+#: ../mail/mail-component.c:150
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "ཨིན་བོགསི།"
 
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:490
+#: ../mail/mail-component.c:152
 msgid "Outbox"
 msgstr "ཨའུཊི་བོགསི"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:492
+#: ../mail/mail-component.c:153
 msgid "Sent"
 msgstr "བཏང་ཡོད།"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:514
+#: ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "མངོན་གསལ་འབད་དོ་...།"
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "ཡིག་འཕྲིན་སྣོད་འཛིན་གྱི་རྩ་འབྲེལ།"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "འགུལ་བསྐྱོད་འབད་མི་སྣོད་འཛིན་%s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "སྣོད་འཛིན་%sའདྲ་བཤུས་རྐྱབ་དོ།"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863
+#: ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་%sནང་ལུ་ སྤོ་བཤུད་འབད་དོ།"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865
+#: ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་%sནང་ལུ་ འདྲ་བཤུས་རྐྱབ་དོ།"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "འཕྲིན་དོན་(ཚུ)ཆེ་རིམ་མཛོད་ཁང་ནང་ བཀོག་བཞག་མི་ཚུགས་པས།"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "སྣོད་འཛིན་ལུ་ འདྲ་བཤུས་རྐྱབས། (_C)"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "སྣོད་འཛིན་ལུ་ སྤོ་བཤུད་འབད། (_M)"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683
+#: ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "སྣོད་འཛིན་ཚུ་\"%s\"ནང་ལུ་ ཞིབ་ལྟ་འབད་དོ།"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042
+#: ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "མཐོང་སྣང་། (_V)"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
-msgstr "ཝིན་ཌོ་གསར་པའི་ནང་ཁ་ཕྱེ། (_N)"
+msgstr "སྒོ་སྒྲིག་གསར་པའི་ནང་ཁ་ཕྱེ། (_N)"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "འདྲ་བཤུས་...(_C)"
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
-msgstr "སྤོ་བཤུད་འབད་...(_M)"
+msgstr "སྤོ་བཤུད་...(_M)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "སྣོད་འཛིན་གསརཔ་...(_N)"
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "བསྐྱར་མིང་བཏགས་...(_R)"
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060
+#: ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_ཕྱགས་ཧོད་སྟོངམ་བཏོན། (_E)"
 
@@ -11492,14 +11371,16 @@ msgstr "_ཕྱགས་ཧོད་སྟོངམ་བཏོན། (_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "`%s'ལས་`%s'ལུ་ འདྲ་བཤུས་རྐྱབ་དོ"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "འདྲ་བཤུས། (_o)"
 
@@ -11521,323 +11402,298 @@ msgstr "སྣོད་འཛིན་གསར་བསྐྲུན་འབད
 msgid "Specify where to create the folder:"
 msgstr "སྣོད་འཛིན་ག་ཏེ་ལུ་ གསར་བསྐྲུན་འབད་ནི་ཨིན་ན་ གསལ་བཀོད་འབད།"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "གཏང་མི་ལུ་ལན་གསལ་གཏང་། (_R)"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083
+#: ../mail/em-popup.c:561
+#: ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "གདོང་བསྐྱོད། (_F)"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
-msgstr "འཕྲིན་དོན་གསརཔ་སྦེ་ ཞུན་དག་རྐྱབས། (_E)"
+msgstr "འཕྲིན་དོན་གསརཔ་སྦེ་ ཞུན་དག་རྐྱབས་...(_E)"
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "བཏོན་བཤོལ། (_n)"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
-msgstr "སྣོད་འཛིན་ལུ་སྤོ་བཤུད་འབད་...(_M)"
+msgstr "སྣོད་འཛིན་ལུ་སྤོ་བཤུད་...(_M)"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
-msgstr "སྣོད་འཛིན་ལུ་ འདྲ་བཤུས་རྐྱབས་...(_C)"
+msgstr "སྣོད་འཛིན་ལུ་འདྲ་བཤུས་རྐྱབས་...(_C)"
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
-msgstr "ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ། (_k)"
+msgstr "ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ། (_k)"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
-msgstr "མ་ལྷགཔ་སྦེ་ རྟགས་བཀལ། (_U)"
+msgstr "མ་ལྷགཔ་སྦེ་རྟགས་བཀལ། (_U)"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
-msgstr "གལ་ཅན་སྦེ་ རྟགས་བཀལ། (_I)"
+msgstr "གལ་ཅན་སྦེ་རྟགས་བཀལ། (_I)"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
-msgstr "གལ་ཅན་མེནམ་སྦེ་ རྟགས་བཀལ། (_i)"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr "གལ་ཅན་མེནམ་སྦེ་རྟགས་བཀལ། (_M)"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
-msgstr "མཁོ་མེད་སྦེ་ རྟགས་བཀལ། (_J)"
+msgstr "མཁོ་མེད་སྦེ་རྟགས་བཀལ། (_J)"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
-msgstr "མཁོ་མེད་མེནམ་སྦེ་ རྟགས་བཀལ། (_N)"
+msgstr "མཁོ་མེད་མེནམ་སྦེ་རྟགས་བཀལ། (_N)"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
-msgstr "ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་ རྟགས་བཀལ་...(_w)"
+msgstr "ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་རྟགས་བཀལ་...(_w)"
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "ཅི་མེད།(_N)"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "ཟུར་རྟགས་མཇུག་བསྡུ་ཡོད། (_g)"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "ཟུར་རྟགས་བསལ། (_e)"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "འཕྲིན་དོན་ནང་ལས་ ལམ་ལུགས་གསར་བསྐྲུན་འབད། (_t)"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "དོན་ཚན་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད། (_S)"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "གཏང་མི་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད། (_n)"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "ལེན་མཁན་ཚུ་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད། (_R)"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "འཕྲིན་གཏང་ཐོ་ཡིག་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད། (_L) "
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "དོན་ཚན་ལུ་བཙགས། (_j)"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "གཏང་མི་ལུ་བཙགས། (_d)"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "ལེན་མཁན་ཚུ་ལུ་བཙགས། (_c)"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "འཕྲིན་གཏང་ཐོ་ཡིག་ལུ་བཙགས། (_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "འཕྲིན་དོན་དཔར་བསྐྲུན་འབད།"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "འཕྲིན་དོན་སླར་འདྲེན་འབད་མི་ཚུགས་པས།"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "འབྲེལ་ལམ་གནས་ཁོངས་ འདྲ་བཤུས་རྐྱབས། (_C)"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད།(_S)"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "ཁ་བྱང་འདི་ནང་ལས། (_F)"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "ཁ་བྱང་འདི་ནང་ལུ། (_T)"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "ཡིག་འཕྲིན་%sལུ་ ཨེབ་གཏང་འབད།"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "ཁ་བྱང་ཚུ་སྦ་ནི་/སྦ་བཤོལ་འབད་ནི་ལུ་ ཨེབ་གཏང་འབད།"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:502
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "%d མཐུན་པས།"
 
-#: ../mail/em-format-html-display.c:645
-msgid "Find:"
-msgstr "འཚོལ་: "
-
-#: ../mail/em-format-html-display.c:676
-msgid "M_atch case"
-msgstr "ཡི་གུ་མཐུན་སྒྲིག་འབད།(_a)"
-
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "མིང་རྟགས་མ་བཀོདཔ།"
 
-#: ../mail/em-format-html-display.c:924
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"འཕྲིན་དོན་འདི་ལུ་ མིང་རྟགས་མ་བཀོདཔ་ལས་ འཕྲིན་དོན་འདི་ བདེན་པ་ཨིན་པའི་ ཉེན་ལེན་འབད་མི་ཚུགས།"
+#: ../mail/em-format-html-display.c:756
+msgid "This message is not signed. There is no guarantee that this message is authentic."
+msgstr "འཕྲིན་དོན་འདི་ལུ་ མིང་རྟགས་མ་བཀོདཔ་ལས་ འཕྲིན་དོན་འདི་ བདེན་པ་ཨིན་པའི་ ཉེན་ལེན་འབད་མི་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "ནུས་ཅན་མིང་རྟགས།"
 
-#: ../mail/em-format-html-display.c:925
-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:757
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "འཕྲིན་དོན་འདི་ལུ་ མིང་རྟགས་བཀོད་དེ་ ནུས་ཅན་ཨིནམ་ལས་ འཕྲིན་དོན་འདི་ ངེས་བདེན་འོང་ནི་མས།"
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758
+#: ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "ནུས་མེད་མིང་རྟགས།"
 
-#: ../mail/em-format-html-display.c:926
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"འཕྲིན་དོན་འདི་གི་ མིང་རྟགས་འདི་ བདེན་སྦྱོར་འབད་མི་ཚུགས་པས། གཏོང་ལེན་ནང་ལུ་ མེདཔ་བཏང་གདའཔ་འོང་ནི་"
-"མས།"
+#: ../mail/em-format-html-display.c:758
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "འཕྲིན་དོན་འདི་གི་ མིང་རྟགས་འདི་ བདེན་སྦྱོར་འབད་མི་ཚུགས་པས། གཏོང་ལེན་ནང་ལུ་ མེདཔ་བཏང་གདའཔ་འོང་ནི་མས།"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "མིང་རྟགས་ནུས་ཅན་ཨིན་པས། དེ་འབདཝ་ད་ གཏང་མི་བདེན་སྦྱོར་འབད་མི་ཚུགས་པས།"
 
-#: ../mail/em-format-html-display.c:927
-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:759
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "འཕྲིན་དོན་འདི་ལུ་ ནུས་ཅན་མིང་རྟགས་ཅིག་བཀོད་ནུག དེ་འབདཝ་ད་ འཕྲིན་དོན་གཏང་མི་དེ་ བདེན་སྦྱོར་འབད་མི་ཚུགས་པས།"
 
-#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "གསང་བ་མ་བཟོཝ།"
 
-#: ../mail/em-format-html-display.c:933
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"འཕྲིན་དོན་འདི་ གསང་བ་མ་བཟོཝ་ལས་ འདི་གི་ནང་དོན་ཚུ་ ཨིན་ཊར་ནེཊི་བརྒྱུད་དེ་ གཏོང་ལེན་འབད་བའི་སྐབས་"
-"མཐོང་འོང་།"
+#: ../mail/em-format-html-display.c:765
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+msgstr "འཕྲིན་དོན་འདི་ གསང་བ་མ་བཟོཝ་ལས་ འདི་གི་ནང་དོན་ཚུ་ ཨིན་ཊར་ནེཊི་བརྒྱུད་དེ་ གཏོང་ལེན་འབད་བའི་སྐབས་མཐོང་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766
+#: ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "གསང་བཟོ་ལེགས་ཤོམ་མ་འགྱོ་བས།"
 
-#: ../mail/em-format-html-display.c:934
-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:766
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "འཕྲིན་དོན་འདི་ གསང་བཟོ་བའི་ ཨཱལ་གོ་རི་དམ་ ཤུགས་མེད་ཅིག་གི་ཐོག་ལས་ གསང་བ་བཟོ་ནུག ཕྱི་མི་ཅིག་གིས་ འཕྲིན་དོན་འདི་གི་ནང་དོན་ཚུ་ མཐོང་ཚུགས་པར་ ལཱ་ཁག་མཚམས་ཅིག་ཡོད་རུང་ དུས་ཡུན་རན་ཏོག་ཏོ་ཅིག་ནང་ མཐོང་མ་ཚུགསཔ་མེད།"
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767
+#: ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "གསང་བ་བཟོ་ནུག"
 
-#: ../mail/em-format-html-display.c:935
-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:767
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "འཕྲིན་དོན་འདི་ གསང་བ་བཟོ་ཡོདཔ་ལས་ འདི་གི་ནང་དོན་ཚུ་ ཕྱི་མི་ཅིག་གིས་ མཐོང་མི་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "སྒྲིང་སྒྲིང་སྦེ་ གསང་བ་བཟོ་ནུག"
 
-#: ../mail/em-format-html-display.c:936
-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:768
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr "འཕྲིན་དོན་འདི་ གསང་བཟོ་བའི་ ཨཱལ་གོ་རི་དམ་ སྒྲིང་སྒྲིང་ཅིག་གི་ཐོག་ལས་ གསང་བ་བཟོ་ནུག ཕྱི་མི་ཅིག་གིས་ དུས་ཡུན་རན་ཏོག་ཏོ་ཅིག་ནང་ འཕྲིན་དོན་འདི་གི་ནང་དོན་ཚུ་ མཐོང་ཚུགས་པར་ ལཱ་ཁག་ཨིན།"
 
-#: ../mail/em-format-html-display.c:1037 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
-msgstr "ལག་ཁྱེར་ལུ་སྟོན། (_V)"
+msgstr "ལག་ཁྱེར་སྟོན། (_V)"
 
-#: ../mail/em-format-html-display.c:1052
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "ལག་ཁྱེར་འདི་ མཐོང་མི་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ལུ་མཇུག་བསྡུ་ཡོད།"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "ཧེ་མ་ལས་རན་ཡོདཔ།"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %pལས།"
 
-#: ../mail/em-format-html-display.c:1442
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
-msgstr "ཨིན་ལའིན་ལུ་སྟོན། (_V)"
+msgstr "ཨིན་ལའིན་སྟོན། (_V)"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "སྦ་བཞག (_H)"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "རྒྱ་ཚད་ལུ་ཚུད་སྒྲིག་འབད།(_F)"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
-msgstr "ཐོག་མའི་་ཚད་སྟོན། (_O)"
+msgstr "ཐོག་མའི་ཚད་སྟོན། (_O)"
 
-#: ../mail/em-format-html-display.c:1864 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667
+#: ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "མཉམ་སྦྲགས།"
 
-#: ../mail/em-format-html-display.c:2071
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "མཉམ་སྦྲགས་ཆ་མཉམ་བསྲུང་ནིའི་དོན་ལུ་ སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
-msgstr "སེལ་འཐུ་འབད་མི་་སྲུངས་...(_S)"
+msgstr "སེལ་འཐུ་འབད་མི་སྲུངས་...(_S)"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2185
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
-msgstr[0] "མཉམ་སྦྲགས་%d། (_n)"
-msgstr[1] "མཉམ་སྦྲགས་%d།(-nt)"
+msgstr[0] "མཉམ་སྦྲགས་%d།(_n)"
+msgstr[1] "མཉམ་སྦྲགས་%d།(_n)"
 
-#: ../mail/em-format-html-display.c:2192 ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:1995
+#: ../mail/em-format-html-display.c:2071
 msgid "S_ave"
-msgstr "སྲུངས། (_a)"
+msgstr "སྲུངས།(_a)"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "ཆ་མཉམ་སྲུངས།(_a)"
 
-#: ../mail/em-format-html-display.c:2264
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "མཉམ་སྦྲགས་མིན་འདུག"
 
@@ -11846,99 +11702,116 @@ msgstr "མཉམ་སྦྲགས་མིན་འདུག"
 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:483
+#: ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s'སླར་འདྲེན་འབད་དོ།"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "མིང་རྟགས་ནུས་ཅན་ཨིན་རུང་ གཏང་མི་བདེན་སྦྱོར་འབད་མི་ཚུགས་པས།"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "ཕྱིའི་མ་གཟུགས་ཡན་ལག་གི་ བཟོ་རྣམ་གྱུར་སོང་ནུག"
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "ཨེཕ་ཊི་པི་་ས་ཁོངས་(%s)ལུ་ དཔག་བྱེད།"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ས་ཁོངས་\"%s\"ལུ་ ནུས་ཅན་ཨིན་མི་ ཉེ་གནས་ཀྱི་ཡིག་སྣོད་(%s)ལུ་དཔག་བྱེད།"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ཉེ་གནས་ཀྱི་ཡིག་སྣོད་(%s)ལུ་དཔག་བྱེད།"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ཐག་རིང་གི་གནད་སྡུད་(%s)ལུ་དཔག་བྱེད།"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "མ་ཤེས་པའི་ ཕྱི་ཁའི་གནད་སྡུད་ (དབྱེ་བ་\"%s\" ལུ)དཔག་བྱེད།"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "འཕྲིན་དོན་རྩ་སྒྲིག་འབད་དོ།"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
+#: ../mail/em-format-html.c:1476
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844
+#: ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "ལས།"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1476
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845
+#: ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "ལན་གསལ་གཏང་ཡུལ།"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/em-format-html.c:1476
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846
+#: ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "ལུ།"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1476
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847
+#: ../mail/em-mailer-prefs.c:88
 msgid "Cc"
-msgstr "ཤོག་ནག་འདྲ་བཤུས།"
+msgstr "སི་སི"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1476
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848
+#: ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
-msgstr "མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས།"
+msgstr "བི་སི་སི"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588
+#: ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "སྦྲག་སྣོད"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../mail/em-format-html.c:1628
+#: ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850
+#: ../mail/em-mailer-prefs.c:91
+#: ../mail/message-list.etspec.h:2
+#: ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "ཚེས་གྲངས།"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651
+#: ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "གནས་ཚུལ་སྡེ་ཚན།"
@@ -11948,11 +11821,14 @@ msgstr "གནས་ཚུལ་སྡེ་ཚན།"
 msgid "%s attachment"
 msgstr "%s མཉམ་སྦྲགས།"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1141
+#: ../mail/em-format.c:1289
+#: ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ཨེསི་/མ་ཡིམ་ འཕྲིན་དོན་ལུ་ མིང་དཔྱད་འབད་མ་ཚུགས: མ་ཤེས་པའི་འཛོལ་བ།"
 
-#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
+#: ../mail/em-format.c:1271
+#: ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "མ་ཡིམ་འཕྲིན་དོན་ལུ་ མིང་དཔྱད་འབད་མ་ཚུགས། འབྱུང་ཁུངས་བཟུམ་ཅིག་སྦེ་ བཀྲམ་སྟོན་འབད་དོ།"
 
@@ -11964,11 +11840,13 @@ msgstr "ཡན་ལག་སྣ་ཚོགས/གསང་བ་བཟོས�
 msgid "Unsupported signature format"
 msgstr "རྒྱབ་སྐྱོར་མེད་པའི་ མིང་རྟགས་ཀྱི་རྩ་སྒྲིག"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454
+#: ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་འཛོལ་བ།"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454
+#: ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་ མ་ཤེས་པའི་འཛོལ་བ།"
 
@@ -11988,80 +11866,79 @@ msgstr "བདུན་ཕྲག་རེ་ཚར་རེ།"
 msgid "Once per month"
 msgstr "ཟླཝ་རེ་ཚར་རེ།"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"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"
+"ཨི་བོ་ལུ་ཤཱན་ 1.x.་ལས་ཚུར་ ཨི་བོ་ལུ་ཤཱན་འཕྲིན་སྒྲོམ་གྱི་སྣོད་འཛིན་ཚུ་གི་ གནས་ཁོངས་དང་ སྡེ་རིམ་ཚུ་གྱུར་སོང་ནུག.\n"
 "\n"
 "ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་འབད་བའི་རིང་ བཟོད་པ་བསྒོམ་གནང་།"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "སྣོད་འཛིན་གསརཔ་`%s': %sབཟོ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "སྣོད་འཛིན་`%s' ལས་`%s': %sལུ་ འདྲ་བཤུས་བརྐྱབ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s': %sལུ་ ཡོད་བཞིན་པའི་ འཕྲིན་སྒྲོམ་ཚུ་གི་དོན་ལས་ ཞིབ་ལྟ་འབད་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr " སར་བར་གནད་སྡུད་%s': %s གུ་བཞག་མི་ པོཔ་་རྙིངམ་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"སར་བར་གནད་སྡུད་སྣོད་ཐོ་ `%s': %s གུ་བཞག་མི་ པོཔ་༣ འདྲ་བཤུས་བརྐྱབ་མ་ཚུགས་ གསར་བསྐྲུན་འབད་མ་"
-"ཚུགས།"
+msgstr "སར་བར་གནད་སྡུད་སྣོད་ཐོ་ `%s': %s གུ་བཞག་མི་ པོཔ་༣ འདྲ་བཤུས་བརྐྱབ་མ་ཚུགས་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "སར་བར་གནད་སྡུད་`%s': %s གུ་བཞག་མི་ པོཔ་༣ འདྲ་བཤུས་བརྐྱབ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577
+#: ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ཉེ་གནས་ཀྱི་ཡིག་འཕྲིན་ བསག་མཛོད་`%s': %sབཟོ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s': %sལུ་ ཉེ་གནས་ཀྱི་ ཡིག་འཕྲིན་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2732
-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:2731
+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:557
+#: ../mail/em-popup.c:568
 msgid "_Reply to sender"
 msgstr "གཏང་མི་ལུ་ ལན་གསལ་གཏང་། (_R)"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:558
+#: ../mail/em-popup.c:569
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "ཐོ་ཡིག་ལུ་ ལན་གསལ་གཏང་། (_L)"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "བརའུ་ཟར་ནང་ལུ་ འབྲེལ་ལམ་ཁ་ཕྱེ། (_O)"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
-msgstr "འཕྲིན་དོན་གསརཔ་....ལུ་གཏང་། (_S)"
+msgstr "འཕྲིན་དོན་གསརཔ་གཏང་ཡུལ་... (_S)"
 
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
@@ -12069,48 +11946,48 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ལུ་ ཁ་སྐོང་�
 
 #: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
-"མཛོད་ཁང་འདི་གིས་ མཁོ་མངགས་ལུ་ རྒྱབ་སྐྱོར་མི་འབད་བས། ཡང་ཅིན་ དེ་ཚུ་ལྕོགས་ཅན་མེནམ་འོང་ནི་མས།"
+msgstr "མཛོད་ཁང་འདི་གིས་ མཁོ་མངགས་ལུ་ རྒྱབ་སྐྱོར་མི་འབད་བས། ཡང་ཅིན་ དེ་ཚུ་ལྕོགས་ཅན་མེནམ་འོང་ནི་མས།"
 
-#: ../mail/em-subscribe-editor.c:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "མཁོ་མངགས་འབད་ཡོདཔ།"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "སྣོད་འཛིན། "
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "སར་བར་ཅིག་ སེལ་འཐུ་འབད་གནང་།"
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "སར་བར་གཅིག་ཡང་ སེལ་འཐུ་མ་འབད་བས།"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "འཕྲིན་དོན་འདི་ ལོག་སྟེ་མ་སྟོན།"
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
-msgstr "འཕྲིན་དོན་ཚགས་མ་ཚུ།"
+msgstr "འཕྲིན་དོན་གྱི་ཚགས་མ་ཚུ།"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496
+#: ../mail/em-utils.c:533
 msgid "message"
 msgstr "འཕྲིན་དོན།"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "འཕྲིན་དོན་སྲུངས་..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "ཁ་བྱང་ཁ་སྐོང་རྐྱབས།"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "%sནང་ལས་ འཕྲིན་དོན་ཚུ།"
@@ -12119,7 +11996,7 @@ msgstr "%sནང་ལས་ འཕྲིན་དོན་ཚུ།"
 msgid "Search _Folders"
 msgstr "སྣོད་འཛིན་ཚུ་འཚོལ་ཞིབ་འབད།(_F)"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "སྣོད་འཛིན་གྱི་འབྱུང་ཁུངས་ འཚོལ་ཞིབ་འབད།"
 
@@ -12152,526 +12029,400 @@ msgid "Composer Window default width"
 msgstr "རྩོམ་མཁན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་རྒྱ་ཚད།"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
-"གཏང་ཡུལ་/ཤོག་ནག་འདྲ་བཤུས་/མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ནང་ལུ་ ཁ་བྱང་ཚུ་གི་བཀྲམ་སྟོན་ཨེབ་བཙུགས་འབད།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"ཁ་བྱང་གྲངས་རྩིས་ནང་ལུ་ གསལ་བཀོད་འབད་མི་ཨང་གྲངས་ནང་ གཏང་ཡུལ་/ཤོག་ནག་འདྲ་བཤུས་/མཐོང་མེད་ཤོག་"
-"ནག་འདྲ་བཤུས་ནང་ལུ་ ཁ་བྱང་ཚུ་གི་བཀྲམ་སྟོན་ཨེབ་བཙུགས་འབད།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "འཕྲིན་དོན་ཚུ་བརྩམ་ནིའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "འཕྲིན་དོན་ཚུ་བརྩམ་ནིའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "འཕྲིན་དོན་ཚུ་ བཀྲམ་སྟོན་འབད་ནིའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "འཕྲིན་དོན་ཚུ་ བཀྲམ་སྟོན་འབད་ནིའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "གདོང་བསྐྱོད་བཟོ་རྣམ་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "རྩོམ་མཁན་གྱི་ སྒོ་སྒྲིག་་མཐོ་ཚད་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "འཕྲིན་དོན་གྱི་ སྒོ་སྒྲིག་་མཐོ་ཚད་ སྔོན་སྒྲིག་འབད"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "མཁོ་མངགས་ ཌའི་དྲན་དེབ་མཐོ་ཚད་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "ལན་གསལ་བཟོ་རྣམ་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "རྩོམ་མཁན་གྱི་ སྒོ་སྒྲིག་་རྒྱ་ཚད་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "འཕྲིན་དོན་གྱི་སྒོ་སྒྲིག་རྒྱ་ཚད་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "མཁོ་མངགས་ཌའི་དྲན་དེབ་རྒྱ་ཚད་ སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ཁྱོད་ཀྱིས་ ཡིག་དཔར་བརྐྱབས་མི་ མིང་ཚིག་ཚུ་ལུ་ ཡིག་སྡེབ་འཛོལ་བའི་བརྡ་སྟོན་པ་འབྲི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "ཕྱིར་ཐོན་སྐབས་ ཕྱགས་ཧོད་སྣོད་འཛིན་ཚུ་ སྟོངམ་བཏོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཕྱིར་ཐོན་སྐབས་ ཕྱགས་ཧོད་སྣོད་འཛིན་ ཆ་མཉམ་སྟོངམ་བཏོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"ཀེ་རེཊི་ཐབས་ལམ་ ལྕོགས་ཅན་བཟོ། དེ་ལས་ཁྱོད་ཀྱིས་ ཡིག་འཕྲིན་ལྷག་པའི་སྐབས་ འོད་རྟགས་ཅིག་མཐོང་ཚུགས།"
+msgstr "ཀེ་རེཊི་ཐབས་ལམ་ ལྕོགས་ཅན་བཟོ། དེ་ལས་ཁྱོད་ཀྱིས་ ཡིག་འཕྲིན་ལྷག་པའི་སྐབས་ འོད་རྟགས་ཅིག་མཐོང་ཚུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "ཁྱད་རྣམ་འཚོལ་ཞིབ་མ་འབད་བའི་གོང་ལུ་ དབྱེ་བ་ལྕོགས་ཅན་བཟོ་ ཡང་ན་ ལྕོགས་མིན་བཟོ།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"ཟུར་ཁའི་ཕྲ་རིང་འཚོལ་ཞིབ་ཁྱད་རྣམ་དེ་ལྕོགས་ཅན་བཟོ། དེ་ལས་ཁྱོད་ཀྱིས་ཚིག་ཡིག་ཡིག་དཔར་བརྐྱབས་ཐོག་ལས་ ཕན་"
-"ཚུན་འབྲེལ་བའི་འཚོལ་ཞིབ་ འགོ་བཙུགས་ཚུགས། ལག་ལེན་དེ་ཡང་ ཁྱོད་ཀྱིས་སྣོད་འཛིན་གྱི་མིང་དེ་ ཡིག་དཔར་བརྐྱབས་"
-"དང་ སྣོད་འཛིན་གྱི་མིང་དེ་ ཟུར་ཁའི་ཕྲ་རིང་ནང་ འཇམ་ཏོང་ཏོ་སྦེ་འཚོལ་འཐོབ་ནི་དི་ སེལ་འཐུ་དེ་གིས་ རང་བཞིན་"
-"གྱིས་སྣོད་འཛིན་དེ་ཁར་ མཆོང་འགྱོཝ་ཨིན།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "ཀེ་རེཊི་ཐབས་ལམ་ ལྕོགས་ཅན་བཟོ/ལྕོགས་མིན་བཟོ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་པེན་གྱི་མཐོ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་པེན་གྱི་ མཐོ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
-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:32
-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:33
-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:27
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgstr "ལག་ལེན་པ་ཅིག་གིས་ དུས་གཅིག་ལུ་ འཕྲིན་དོན་༡༠ ཡང་ན་ དེ་ལས་ལྷག་སྟེ་ ཁ་ཕྱེ་ཐབས་འབད་བ་ཅིན་ ལག་ལེན་པ་དེ་ལུ་ ངེས་པར་དུ་ དེ་སྦེ་འབད་དགོཔ་ཨིན་ན་དྲིས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "དེ་གིས་སྣ་མང་འཕྲིན་དོན་ལུ་ རྟགས་བཀལ་བའི་སྐབས་ ནུས་སྤེལ་ལྕོགས་ཅན་/ལྕོགས་མིན་བཟོཝ་ཨིན།"
+#: ../mail/evolution-mail.schemas.in.in.h:28
+msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
+msgstr "ཨི་བོ་ལུ་ཤཱན་ནང་ མ་ཡིམ་དབྱེ་བ་སོ་སོའི་དོན་ལུ་ ནང་བསྒྲིགས་མཐོང་བྱེད་མེད་པ་ཅིན་ ནང་དོན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཇི་ནོམ་གྱི་ མ་ཡིམ་དབྱེ་བ་གི་ གནད་སྡུད་གཞི་རྟེན་གྱི་ ཐོ་ཡིག་ནང་ བོ་ནོ་བོ་ཆ་ཤས་ནང་ཐོན་མི་ མ་ཡིམ་དབྱེ་བ་ག་ཅི་ཨིན་རུང་ ལག་ལེན་འཐབ་ཚུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "མཐའ་མཇུག་ཕྱགས་ཧོད་སྟོངམ་ བཏོན་པའི་དུས་ཚོད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "ཁ་ཡིག་ཚུ་གི་ཐོ་ཡིག་དང་ དེ་ཚུ་དང་འབྲེལ་བའི་ཚོས་གཞི་ཚུ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "དང་ལེན་འབད་མི་ ཆོག་ཐམ་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "རྩིས་ཐོ་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
-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:33
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "ཨི་བོ་ལུ་ཤཱན་ འཕྲིན་དོན་ཆ་ཤས་ཀྱིས་ ཧ་གོ་བའི་ རྩིས་ཐོའི་ཐོ་ཡིག ཐོ་ཡིག་དེ་ནང་ གློག་རིམ་/ཨི་བོ་ལུ་ཤཱན་/ཡིག་འཕྲིན་/རྩིས་ཐོ་ཚུ་དང་འབྲེལ་བའི་ ཡན་ལག་སྣོད་ཐོ་ཚུ་གི་ ཡིག་རྒྱུན་ཚུ་ཡོད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "སྲོལ་སྒྲིག་མགོ་ཡིག་གི་ ཐོ་ཡིག་དང་ དེ་ཚུ་ལྕོགས་ཅན་ཨིནམ་མེནམ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
-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:35
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "ཨི་བོ་ལུ་ཤཱན་ འཕྲིན་དོན་ཆ་ཤས་ཀྱིས་ ཧ་གོ་བའི་ ཁ་བྱང་ཐོ་ཡིག ཐོ་ཡིག་དེ་ནང་ ཚོས་གཞི་གིས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཧེགསི་ ཨིན་ཀོ་ཌིང་ ལག་ལེན་འཐབ་སའི་ ཚོས་གཞི་མིང་གི་ ཡིག་རྒྱུན་ཚུ་ཡོད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "བོ་ནོ་བོ་གི་ཆ་ཤས་ མཐོང་བྱེད་ཡོད་མེད་ ཞིབ་དཔྱད་འབད་ནིའི་ མ་ཡིམ་གྱི་ དབྱེ་བ་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "ཆོག་ཐམ་དང་ལེན་འབད་ཡོད་པའི་ གནད་སྤེལ་ལམ་ལུགས་ཀྱི་ མིང་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "ཨེཆ་ཊི་ཊི་པི་གུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་གྱི་དོན་ལུ་ གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
-msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
-"load images off the net"
-msgstr ""
-"ཨེཆ་ཊི་ཊི་པི་ཚུ་གུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་གྱི་དོན་ལུ་ འཕྲིན་དོན་ཚུ་མངོན་གསལ་འབད། སྲིད་པའིང་བེ་ལུསི་ཚུ་:༠-ནམ་"
-"ཡང་ནེཊི་གི་ཕྱི་ཁར་ གཟུགས་བརྙན་ཚུ་མངོན་གསལ་མ་འབད། ༡-འབྲེལ་ས་ཚུ་ནང་ལས་ ཡཔག་འཕྲིན་ནང་ གཟུགས་"
-"བརྙན་མངོན་གསལ་འབད། ༢-ཨ་རྟག་ར་ ནེཊི་གི་ཕྱི་ཁར་ གཟུགས་བརྙན་མངོན་གསལ་འབད།"
+#: ../mail/evolution-mail.schemas.in.in.h:39
+msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
+msgstr "ཨེཆ་ཊི་ཊི་པི་ཚུ་གུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་གྱི་དོན་ལུ་ འཕྲིན་དོན་ཚུ་མངོན་གསལ་འབད། སྲིད་པའིང་བེ་ལུསི་ཚུ་:༠-ནམ་ཡང་ནེཊི་གི་ཕྱི་ཁར་ གཟུགས་བརྙན་ཚུ་མངོན་གསལ་མ་འབད། ༡-འབྲེལ་ས་ཚུ་ནང་ལས་ ཡཔག་འཕྲིན་ནང་ གཟུགས་བརྙན་མངོན་གསལ་འབད། ༢-ཨ་རྟག་ར་ ནེཊི་གི་ཕྱི་ཁར་ གཟུགས་བརྙན་མངོན་གསལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "གསལ་བཀོད་འབད་མི་ དྲན་དེབ་སྣོད་འཛིན་ལུ་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "དྲན་དེབ་སྣོད་འཛིན་ལས་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ་ལུ །"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "དྲན་དེབ་སྣོད་འཛིན་ལས་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ་ལུ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "གསལ་བཀོད་འབད་མི་ ངལ་མཚམས་མཐོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "གསལ་བཀོད་འབད་མི་ ངལ་མཚམས་མཐོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "འཕྲིན་དོན་གྱི་ \"Preview\" ནང་ལུ་ འདྲེན་ཚིག་ཚུ་ལུ་ རྟགས་བཀལ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "འཕྲིན་དོན་གྱི་ \"Preview\" ནང་ལུ་ འདྲེན་ཚིག་ཚུ་ལུ་ རྟགས་བཀལ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "འཕྲིན་དོན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་མཐོ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "འཕྲིན་དོན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་རྒྱ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "འཕྲིན་དོན་བཀྲམ་སྟོན་གྱི་བཟོ་རྣམ།(\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ཕྱིར་ཐོན་སྐབས་ ཕྱགས་ཧོད་སྟོངམ་བཏོན་པའི་ བར་ན་གི་ ཉིན་གྲངས་ཉུང་མཐའ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ཕྱིར་ཐོན་སྐབས་ ཕྱགས་ཧོད་སྟོངམ་བཏོན་པའི་ བར་ན་གི་ དུས་ཚོད་ཉུང་མཐའ་ ཉིན་གྲངས་ནང་།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བསྐུལ་གྱི་སྒྲ་སྐད་ཡིག་སྣོད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བསྐུལ་གྱི་དབྱེ་བ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr ""
-"གཏང་ཡུལ་/ཤོག་ནག་འདྲ་བཤུས་/མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ནང་ལུ་ བཀྲམ་སྟོན་འབད་ནིའི་ཁ་བྱང་གི་གྱངས་ཁ།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "དོན་ཚན་སྟོངམ་ལུ་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ལག་ལེན་པ་ ཁོའམ་མོ་གིས་ སྣོད་འཛིན་ཅིག་ རྩ་མེད་གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"ལག་ལེན་པ་ ཁོའམ་མོ་གིས་ དོན་ཚན་མེད་པའི་ འཕྲིན་དོན་ཅིག་ གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ནུས་སྤེལ་"
-"འབད།"
+#: ../mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgstr "ལག་ལེན་པ་ ཁོའམ་མོ་གིས་ དོན་ཚན་མེད་པའི་ འཕྲིན་དོན་ཅིག་ གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "ལག་ལེན་པ་གིས་ ཕྱིར་བསྐྲད་འབདཝ་ད་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
-msgstr "ལག་ལེན་པ་གིས་ མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་རྐྱངམ་གཅིག་བཀང་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
+msgstr "ལག་ལེན་པ་གིས་ མ་མཐོང་བའི་ཤོག་ནག་འདྲ་བཤུས་ རྐྱངམ་གཅིག་བཀང་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-"ལག་ལེན་པ་གིས་ དུས་གཅིག་ལུ་ འཕྲིན་དོན་ ༡༠ པའམ་ དེ་ལས་མངམ་ ཁ་ཕྱེ་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ ནུས་"
-"སྤེལ་འབད།"
+msgstr "ལག་ལེན་པ་གིས་ དུས་གཅིག་ལུ་ འཕྲིན་དོན་ ༡༠ པའམ་ དེ་ལས་མངམ་ ཁ་ཕྱེ་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
-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:61
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgstr "ལག་ལེན་པ་གིས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཡིག་འཕྲིན་འཐོབ་འདོད་མེད་མི་ཚུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ འཕྲིན་དོན་གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"ལག་ལེན་པ་གིས་ གཏོང་ཡུལ་ ཡང་ ཤོག་ནག་འདྲ་བཤུས་ དེ་ལུ་ཟེར་མེད་པའི་ འཕྲིན་དོན་གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་"
-"པའི་སྐབས་ ནུས་སྤེལ་འབད།"
+msgstr "ལག་ལེན་པ་ཅིག་གིས་ ལེན་མཁན་ག་ལུའམ་ འདྲ་དེ་ལུ་ཟེརཝ་མེད་པའི་ འཕྲིན་དོན་གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ལག་ལེན་པ་གིས་ མ་དགོ་པའི་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "སྣ་མང་འཕྲིན་དོན་ཚུ་ལུ་ རྟགས་བཀལ་བའི་སྐབས་ ནུས་སྤེལ་འབད།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "ཚིག་ཡིག་ཚུ་ནང་ འབྲེལ་ལམ་ངོས་འཛིན་འབད་དེ་ ཚབ་མ་བཙུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "ཚིག་ཡིག་ནང་ སིམའི་ལིསི་ ངོས་འཛིན་འབད་དེ་ དེ་ཚུ་གི་ཚབ་ལུ་ གཟུགས་བརྙན་བཙུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "ནང་འབྱོར་ཡིག་འཕྲིན་ཚུ་ལུ་ མཁོ་མེད་ཀྱི་བརྟག་ཞིབ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ སྔོན་སྒྲིག་ཐོག་ལས་གཏང་། "
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ སྔོན་སྒྲིག་ཐོག་ལས་གཏང་།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "བསྒུལ་པར་སྟོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "བསྒུལ་པར་གཟུགས་བརྙན་ཚུ་ བསྒུལ་པར་བཟུམ་སྦེ་སྟོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "བཏོན་གཏང་མི་ འཕྲིན་དོན་ཚུ་ འཕྲིན་དོན་ཐོ་ཡིག་ནང་ (སྦུག་འབྲེག་དང་བཅསཔ་སྦེ)སྟོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 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.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "ཡིག་འཕྲིན་གསརཔ་ལྷོདཔ་ད་ གཏང་ནིའི་སྒྲ་སྐད་ཡིག་སྣོད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
-"ལག་ལེན་པ་གིས་ ལག་ལེན་འཐབ་འདོད་ཡོད་མི་ ཡིག་འཕྲིན་བརྡ་བསྐུལ་གསར་པའི་དབྱེ་བ་དེ་ གསལ་བཀོད་འབད།"
+msgstr "ལག་ལེན་པ་གིས་ ལག་ལེན་འཐབ་འདོད་ཡོད་མི་ ཡིག་འཕྲིན་བརྡ་བསྐུལ་གསར་པའི་དབྱེ་བ་དེ་ གསལ་བཀོད་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "ཡིག་སྡེབ་ཞིབ་དཔྱད་ཀྱི་ ཨིན་ལའིན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "ཌའི་ལོག་སྔོན་སྒྲིག་གི་མཐོ་ཚད་ མཁོ་མངགས་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "ཌའི་ལོག་སྔོན་སྒྲིག་གི་རྒྱ་ཚད་ མཁོ་མངགས་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "ཊར་མི་ནཱལ་ ཡིག་གཟུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "གལ་ཅན་དུས་ཚོད་ལས་ཚུར་ ཕྱགས་ཧོད་སྟོངམ་སྟོན་པའི་ མཐའ་མཇུག་གི་དུས་ཚོད་ ཉིན་གྲངས་ནང་།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཊར་མི་ནཱལ་ཡིག་གཟུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཡིག་གཟུགས་རྒྱ་ཚད་ཀྱི་འགྱུར་བ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
-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:95
-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:84
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "ལྡེ་མིག་འདི་ནང་ ཨེགསི་ཨེམ་ཨེལ་གྱི་ གཞི་བཀོད་ཀྱི་ཐོ་ཡིག་ཅིག་ཡོད་དགོཔ་ད་ དེ་གིས་སྲོལ་སྒྲིག་མགོ་ཡིག་ཚུ་དང་ དེ་ཚུ་བཀྲམ་སྟོན་ འབད་དགོ་ག་མིན་དགོ་ཚུ་ གསལ་བཀོད་འབདཝ་ཨིན། ཨེགསི་ཨེམ་ཨེལ་ གཞི་བཀོད་ཀྱི་རྩ་སྒྲིག་དེ་ &lt;header enabled&gtཨིན། ཡིག་འཕྲིན་མཐོང་སྣང་ནང་ མགོ་ཡིག་བཀྲམ་སྟོན་ འབད་དགོ་པ་ཅིན་ ལྕོགས་ཅན་བཟོ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་ ཐེ་རེཌི་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་ ཐེ་རེཌི་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "དོན་ཚན་ལུ་ གཞི་བཞག་སྟེ་ འཕྲིན་དོན་ཐོ་ཡིག་ ཐེ་རེཌི་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "འཕྲིན་དོན་མཐོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནིའི་དུས་ཚོད་ཀྱི་ ངལ་མཚམས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "འཕྲིན་དོན་མཐོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནིའི་དུས་ཚོད་ཀྱི་ ངལ་མཚམས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "སྔོན་སྒྲིག་རྩིས་ཐོའི་ ཡུ་ཨའི་ཌི་ ཡིག་རྒྱུན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "སི་པ་མ་ས་སིན་ ཌེ་མཱོན་དང་ ཞབས་ཏོག་སྤྱོད་མི་ ལག་ལེན་འཐབ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "སི་པ་མ་ས་སིན་ ཌེ་མཱོན་དང་ ཞབས་ཏོག་སྤྱོད་མི་ ལག་ལེན་འཐབ།(ཨེསི་པི་ཨེ་ཨེམ་སི/ཨེསི་པི་ཨེ་ཨེམ་ཌི)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "སྲོལ་སྒྲིག་ཡིག་གཟུགས་ ལག་ལེན་འཐབ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་འབད་ནིའི་དོན་ལུ་ སྲོལ་སྒྲིག་ཡིག་གཟུགས་ ལག་ལེན་འཐབ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "ཉེ་གནས་ཀྱི་ སི་པམ་ བརྟག་ཞིབ་རྐྱངམ་གཅིག་ ལག་ལེན་འཐབ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ཉེ་གནས་ཀྱི་ སི་པམ་བརྟག་ཞིབ་རྐྱངམ་གཅིག་ ལག་ལེན་འཐབ། (ཌི་ཨེན་ཨེསི་ ལག་ལེན་མ་འཐབ)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "ཟུར་ཁར་ ཡང་ན་ རྒྱ་ཅན་སྒྲིག་བཀོད་ ལག་ལེན་འཐབ།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "འགྱུར་བའི་ཡིག་གཟུགས་ཀྱི་རྒྱ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
-msgstr "མཐོང་སྣང་/མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།"
+msgstr "མཐོང་སྣང་/བི་སི་སི་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
-msgstr "མཐོང་སྣང་/མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།"
+msgstr "མཐོང་སྣང་/བི་སི་སི་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
-msgstr "མཐོང་སྣང་/ཤོག་ནག་འདྲ་བཤུས་དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།།"
+msgstr "མཐོང་སྣང་/སི་སི་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
-msgstr "མཐོང་སྣང་/ཤོག་ནག་འདྲ་བཤུས་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།།"
+msgstr "མཐོང་སྣང་/སི་སི་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "དཀར་ཆག་རྣམ་གྲངས་ནང་ལས་ སྟོན་ནི་ཞིབ་དཔྱད་འབད་ཡི།།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "དཀར་ཆག་རྣམ་གྲངས་ནང་ལས་ སྟོན་ནི་ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "མཐོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ གནས་བསྐྱོད་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "མཐོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ གནས་བསྐྱོད་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "མཐོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ ལན་གསལ་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "མཐོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ ལན་གསལ་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
-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:121
-msgid "Width of the message-list pane"
-msgstr "འཕྲིན་དོན་ཐོ་ཡིག་པེན་གྱི་རྒྱ་ཚད།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "འཕྲིན་དོན་ཐོ་ཡིག་པེན་གྱི་མཐོ་ཚད།"
+#: ../mail/evolution-mail.schemas.in.in.h:108
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "འཕྲིན་དོན་ཚུ་ནང་ དེ་གི་ལན་ལུ་བའམ་ འབྲེལ་གཏུགས་ཀྱི་མགོ་ཡིག་ བཀོད་བཀོདཔ་མེད་པའི་སྐབས་ དོན་ཚན་བཞིན་དུ་སྦེ་ གློ་བུར་རྒྱབ་ཐག་ལུ་ ཐེ་རེཌི་འབད་དགོཔ་ཨིན་ན་མེན།"
 
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
@@ -12704,15 +12455,16 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "བར་ཀེ་ལེ་ཡིག་སྒྲོམ་ རྩ་སྒྲིག་གི་སྣོད་འཛིན་ཚུ་གི་ནང་འདྲེན་པ།"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233
+#: ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%sནང་འདྲེན་འབད་དོ།"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "བསྒུག་སྡོད་གནང་།"
 
@@ -12824,7 +12576,8 @@ msgstr "རྒྱུད་དུང་ནང་ལས་ ཡིག་འཕྲ�
 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 ལས་ ཡིག་འཕྲིན།"
@@ -12892,31 +12645,31 @@ msgid_plural ", %d unread"
 msgstr[0] ",%dམ་ལྷག"
 msgstr[1] ", %dམ་ལྷགཔ།"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "ཡིག་འཕྲིན་གསར་པའི་འཕྲིན་དོན།"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "ཡིག་འཕྲིན་གྱི་འཕྲིན་དོན། (_M)"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "ཡིག་འཕྲིན་གྱི་ འཕྲིན་དོན་གསརཔ་ཅིག་བརྩམ།"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "ཡིག་འཕྲིན་གྱི་སྣོད་འཛིན་གསརཔ།"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "ཡིག་འཕྲིན་གྱི་སྣོད་འཛིན། (_F)"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "ཡིག་འཕྲིན་གྱི་སྣོད་འཛིན་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ཡིག་འཕྲིན་གྱི་ སྒྲིག་སྟངས་སམ་ སྣོད་འཛིན་ཚུ་  ཡར་བསྐྱེད་འབད་མ་ཚུགས།"
 
@@ -12945,219 +12698,226 @@ msgid "_Later"
 msgstr "ཤུལ་ལས།(_L)"
 
 #: ../mail/mail-config.glade.h:1
+#: ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
-msgstr "རྒྱབ་སྐྱོར་ཡོད་པའི་དབྱེ་བའི་དོན་ལུ་་ཞིབ་དཔྱད་འབད། (_e)"
+msgstr "རྒྱབ་སྐྱོར་ཡོད་པའི་དབྱེ་བའི་དོན་ལུ་ཞིབ་དཔྱད་འབད། (_e)"
 
-#: ../mail/mail-config.glade.h:3
+#: ../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>Sig_natures</b>"
-msgstr " <b>མིང་རྟགས་ཚུ་</b> (_n)"
+msgstr " <b>མིང་རྟགས་ཚུ་</b> "
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr " <b>སྐད་ཡིག་ཚུ་</b> (_L)"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 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:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\"> རྩིས་ཐོའི་བརྡ་དོན་</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 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
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">བཀྲམ་སྟོན་འབད་མི་ ཡིག་འཕྲིན་མགོ་ཡིག་</span>(_H)"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">ཚགས་མའི་གདམ་ཁ་</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">ཁ་ཡིག་དང་ཚོས་གཞི་</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">གཟུགས་བརྙན་མངོན་གསལ་</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">འཕྲིན་དོན་བཀྲམ་སྟོན་</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">འཕྲིན་དོན་ཡིག་གཟུགས་</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">འཕྲིན་དོན་འབྱོར་རྟགས་ཚུ་</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">ཡིག་འཕྲིན་གྱི་བརྡ་དོན་གསརཔ་</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../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:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">གདམ་ཁ་ཚུ་</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">གསང་བ་ཧ་ཅང་གིས་ལེགས་ཤོམ་(པི་ཇི་པི་/ཇི་པི་ཇི)</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">དཔར་བསྐྲུན་འབད་མི་ཡིག་གཟུགས་</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">དགོ་པའི་བརྡ་དོན་</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">མཐའ་བཙན་ལྡན་པའི་མ་ཡིམ་(ཨེསི་/མ་ཡིམ)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">སྲུང་སྐྱོབ་</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">འཕྲིན་དོན་བཏང་བཏངམ་དང་ཟིན་བྲིས་</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</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 "མིང་རྟགས་གསརཔ་ཁ་སྐོང་རྐྱབས་...(_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 mail"
 msgstr "གསང་བཟོས་འཕྲིན་དོན་ གཏང་བའི་སྐབས་ རང་ཉིད་ལུ་ཡང་ གསང་བ་བཟོ། (_f)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "ཨ་རྟག་ར་ ཤོག་གནག་འདྲ་བཤུས་གཏང་ཡུལ་:།(_s)"
+msgstr "ཨ་རྟག་ར་ཤོག་གནག་འདྲ་བཤུས་(སི་སི)གཏང་ཡུལ་:\"(_s)"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ཨ་རྟག་ར་ མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་གཏང་ཡུལ་: (_b)"
+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 mail"
 msgstr "ཨ་རྟག་ར་ གསང་བཟོས་འཕྲིན་དོན་ཚུ་ བཏང་བའི་སྐབས་རང་ཉིད་ལུ་ གསང་བ་བཟོ། ((_m)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "འཕྲིན་དོན་འདྲ་དང་པ་ མཉམ་སྦྲགས་འབད།"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
-msgstr "རང་བཞིན་གྱིས་ སི་མའི་ལི་གཟུགས་བརྙན་ཚུ་བཙུགས། (_s)"
+msgstr "རང་བཞིན་གྱིས་ སི་མའི་ལི་གཟུགས་བརྙན་ཚུ་བཙུགསཔ་ཨིན། (_s)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "བཱལ་ཊིཀ་(ཨའི་ཨེསི་ཨོ་-༨༨༥༩-༡༣)།"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "བཱལ་ཊིཀ་(ཨའི་ཨེསི་ཨོ་-༨༨༥༩-༤)།"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "འཕྲིན་དོན་གསརཔ་ འབྱོར་བའི་སྐབས་ བརྡ་སྐད་རྐྱབས། (_h)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "ཡིག་འབྲུའི་ཆ་ཚན: (_h)"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "རྒྱབ་སྐྱོར་ལྡན་པའི་དབྱེ་བ་ཡོད་མེད་ ཞིབ་དཔྱད་འབད། (_e)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "ནང་འབྱོར་འཕྲིན་དོན་ མཁོ་མེད་ཨིནམ་མེནམ་ ཞིབ་དཔྱད་འབད། (_c)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../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 "བསལ། (_r)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
-msgstr "སྡེབ་འཛོལ་མི་ མིང་ཚིག་ཚུ་གི་དོན་ལུ་ཚོས་གཞི་: (_m)"
+msgstr "ཡིག་སྡེབ་འཛོལ་མི་ མིང་ཚིག་ཚུ་གི་དོན་ལུ་ཚོས་གཞི་: (_m)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "ཚོས་གཞི་ཚུ།"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
-msgstr "སྣོད་འཛིན་ཅིག་ རྩ་མེད་བཏང་བའི་སྐབས་ ངེས་གཏན་སྦེ་དྲིས། (_w)"
+msgstr "སྣོད་འཛིན་ཅིག་ རྩ་མེད་བཏང་བའི་སྐབས་ ངེས་དཔྱད་འབད། (_w)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13173,134 +12933,132 @@ msgstr ""
 "\n"
 "ཁྱོད་རའི་སྒྲིག་སྟངས་ཚུ་ བསྲུང་ནི་ལུ་ \"Apply\" ལུ་ ཨེབ་གཏང་འབད།"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "སྔོན་སྒྲིག་འབད། (_f)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "ཡིག་འབྲུའི་ཨིན་ཀོ་ཌིང་ སྔོན་སྒྲིག་འབད་: (_n)"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "ཕྱིར་གཏང་འཕྲིན་དོན་ཚུ་ལུ་ ཌི་ཇི་ཊཱལ་གྱི་ཐོག་ལས་ མིང་རྟགས་བཀོད། (སྔོན་སྒྲིག་ཐོག་ལས)(_s) "
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "འགོ་ཐོག་འཕྲིན་དོན་ལུ་ འདྲེན་རྟགས་མ་བཀལ།"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "འབད་ཚར།"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་: (_F)"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "ལྕོགས་ཅན་བཟོ། (_n)"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "གློག་འཕྲིན་རྩིས་ཐོ།"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "གློག་འཕྲིན་ཁ་བྱང་: (_A)།"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "ཕྱིར་ཐོན་སྐབས་ ཕྱགས་ཧོད་སྟོངམ་བཏོན། (_x)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "གསང་བཟོ་བའི་ལག་ཁྱེར་: (_p)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
-msgstr "ཕྱིར་གཏང་འཕྲིན་དོན་ཚུ་གསང་བ་བཟོ། (སྔོན་སྒྲིག་ཐོག་ལས) (_g)"
+msgstr "ཕྱིར་གཏང་འཕྲིན་དོན་ཚུ་ གསང་བ་བཟོ། (སྔོན་སྒྲིག་ཐོག་ལས) (_g)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "རྒྱ་ཚད་གཏན་བཟོས་ཡིག་གཟུགས་: (_x)"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
-msgstr "གཏན་བཟོས་རྒྱ་ཚད་: (_x)"
+msgstr "གཏན་བཟོས་-རྒྱ་ཚད་: (_x)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "ཡིག་གཟུགས་ཀྱི་རྒྱུ་དངོས།"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ནང་ འཕྲིན་དོན་ཚུ་རྩ་སྒྲིག་འབད། (_H"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "མིང་ཆ་ཚང་: (_e)"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཕྲིན་དོན།"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "མགོ་ཡིག་ཚུ།"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "འདྲེན་ཚིག་ཚུ་འདི་གི་ཐོག་ལས་ གཙོ་དམིགས་འབད། (_q)"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "ཐག་རིང་གི་བརྟག་ཞིབ་ཚུ་ གྲངས་སུ་བཙུགས། (_n)"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "ཨིན་ལའིན།"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "སྐད་ཡིག་ཚུ་གི་ཐིག་ཁྲམ།"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "ཡིག་འཕྲིན་རིམ་སྒྲིག"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "ཡིག་འཕྲིན་མགོ་ཡིག་ཚུ་གི་ཐིག་ཁྲམ།"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "ཡིག་སྒྲོམ་གནས་ཁོངས།"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "འཕྲིན་དོན་རྩོམ་མཁན།"
 
-#: ../mail/mail-config.glade.h:101
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+#: ../mail/mail-config.glade.h:102
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr "དྲན་འཛིན་: ཁྱོད་ཀྱིས་ཐེངས་དང་པ་ མ་མཐུད་ཚུན་ཚོད་ ཁྱོད་ལུ་ཆོག་ཡིག་གི་ ནུས་སྤེལ་མི་འཐོབ།"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "ལས་སྡེ་: (_g)"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "པི་ཇི་པི་/ཇི་པི་ཇི་ལྡེ་མིག་གི་ཨའི་ཌི་: (_K)"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "འཕྲིན་དོན་གསརཔ་འབྱོརཝ་ད་ སྒྲ་སྐད་ཡིག་སྣོད་གཏང་། (_v)"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13308,142 +13066,127 @@ msgstr ""
 "འོག་གི་བར་སྟོང་ནང་ལུ་ རྩིས་ཐོ་འདི་གི་དོན་ལས་ འགྲེལ་བཤད་ཅན་གྱི་ མིང་ཅིག་བཙུགས།\n"
 "མིང་འདི་ བཀྲམ་སྟོན་གྱི་དགོས་དོན་ལུ་རྐྱངམ་གཅིག་ ལག་ལེན་འཐབ་ནི་ཨིན།"
 
-#: ../mail/mail-config.glade.h:109
-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
-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\" ས་སྒོ་དེ་ བཀང་མི་དགོ"
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "ཡིག་འཕྲིན་གཏང་ཐངས་ཀྱི་སྐོར་ལས་ བརྡ་དོན་བཙུགས། ཁྱོད་ཀྱིས་གཏན་གཏན་མ་ཤེས་པ་ཅིན་ ཁྱོད་རའི་རིམ་ལུགས་ བདག་སྐྱོང་པའམ་ ཨིན་ཊར་ནེཊི་གི་ ཞབས་ཏོག་སྤེལ་མི་ལུ་འདྲི་གནང་།"
 
 #: ../mail/mail-config.glade.h:111
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "ཁྱོད་རའི་མིང་དང་ གློག་འཕྲིན་ཁ་བྱང་ཚུ་ འོག་ལུ་བཙུགས། ཁྱོད་ཀྱིས་གཏང་མི་ ཡིག་འཕྲིན་ནང་ བཙུགས་འདོད་ཡོད་ན་མ་གཏོགས་ དེ་མིན་འོག་ལུ་ཡོད་མི་ \"optional\" ས་སྒོ་དེ་ བཀང་མི་དགོ"
+
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "འོག་གི་གདམ་ཁ་ཚུ་གི་གྲས་ལས་སེལ་འཐུ་འབད་གནང་།"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"མཐོང་མེད་ཤོག་གནག་འདྲ་བཤུས་ ལེན་མཁན་ཚུ་ ངེས་འཛིན་འབད་ཡོད་པའི་ འཕྲིན་དོན་ཚུ་ གཏངམ་ད་རྐྱངམ་གཅིག་ "
-"ནུས་སྤེལ་འབད།(_o)"
+msgstr "མཐོང་མེད་ཤོག་གནག་འདྲ་བཤུས་ ལེན་མཁན་ཚུ་ ངེས་འཛིན་འབད་ཡོད་པའི་ འཕྲིན་དོན་ཚུ་ གཏངམ་ད་རྐྱངམ་གཅིག་ ནུས་སྤེལ་འབད།(_o)"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "འཕྲིན་དོན་འདྲ་དང་པ་ལུ་ འདྲེན་རྟགས་བཀལ།"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "འདྲེན་རྟགས་བཀོད་བཀོདཔ།"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "ཆོག་ཡིག་སེམས་ཁར་བཞག (_m)"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "ལན་གསལ་གཏང་ལུ་: (_p)"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "ཆོག་ཡིག་སེམས་ཁར་བཞག (_p)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "སེལ་འཐུ་འབད་...(_e)"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
-msgstr "ཚད་ལྡན་ཡིག་གཟུགས་: (_t)"
+msgstr "ཚད་ལྡན་ཡིག་གཟུགས། (_t)"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "སེལ་འཐུ་འབད་...(_l)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྒྱ་ཚད་གཏན་འཁེལ་གྱི་ ཡིག་གཟུགས་སེལ་འཐུ་འབད།"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "དཔར་བསྐྲུན་གྱི་དོན་ལས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྒྱ་ཚད་གཏན་ཁེལ་གྱི་ ཡིག་གཟུགས་སེལ་འཐུ་འབད།"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྒྱ་ཚད་འགྱུར་བ་ཅན་གྱི་ ཡིག་གཟུགས་སེལ་འཐུ་འབད།"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "དཔར་བསྐྲུན་གྱི་དོན་ལས་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ རྒྱ་ཚད་འགྱུར་བ་ཅན་གྱི་ ཡིག་གཟུགས་སེལ་འཐུ་འབད།"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
-msgstr "སྒྲ་སྐད་སེལ་འཐུ་འབད།"
+msgstr "སྒྲ་སྐད་ཡིག་སྣོད་སེལ་འཐུ་འབད།"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "འཕྲིན་དོན་གྱི་འབྱོར་རྟགས་ཚུ་གཏང་། "
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "ཡིག་འཕྲིན་བཏང་དོ།"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "བཏང་ཚར་བའི་ འཕྲིན་དོན་སྣོད་འཛིན་:(_M)"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "སར་བར་ལུ་ བདེན་བཤད་དགོ་པས། (_v)"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "སར་བར་གྱི་དབྱེ་བ་...(_T)"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "མིང་རྟགས་བཀོད་ནིའི་ལག་ཁྱེར་:(_n)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "མིང་རྟགས་: (_u)"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "མིག་རྟགས་ཚུ།"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "མིག་རྟགས་ཚུ་གི་ཐིག་ཁྲམ།"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 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
-msgid "T_ype: "
-msgstr "དབྱེ་བ་:(_y)"
-
 #: ../mail/mail-config.glade.h:141
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"ནཱ་ལུ་ཡོད་མི་ སྐད་ཡིག་གི་ཐོ་ཡིག་ནང་ལུ་ སྐད་ཡིག་ག་ཅི་གི་ ཡིག་མཛོད་གཞི་བཙུགས་འབད་དེ་ཡོད་མི་ སྐག་ཡིག་ཚུ་"
-"རྐྱངམ་གཅིག་ ཐོནམ་ཨིན།"
+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."
+msgstr "ནཱ་ལུ་ཡོད་མི་ སྐད་ཡིག་གི་ཐོ་ཡིག་ནང་ལུ་ སྐད་ཡིག་ག་ཅི་གི་ ཡིག་མཛོད་གཞི་བཙུགས་འབད་དེ་ཡོད་མི་ སྐག་ཡིག་ཚུ་རྐྱངམ་གཅིག་ ཐོནམ་ཨིན།"
+
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13453,7 +13196,7 @@ msgstr ""
 "ཁྱོད་ཀྱིས་གསལ་བཀོད་འབད་མི་མིང་དེ་ བཀྲམ་སྟོན་གྱི་དགོས་དོན་ལུ་རྐྱངམ་གཅིག་ \n"
 " ལག་ལེན་འཐབ་ནི་ཨིན།"
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13461,15 +13204,16 @@ msgstr ""
 "ཁྱོད་ཀྱིས་རྩིས་ཐོ་འདི་དང་ གཞི་བསྟུན་འབད་དགོ་མནོ་མི་ མིང་དེ་ཡིག་དཔར་རྐྱབས།\n"
 "དཔེར་ན་:\"Work\" ཡང་ཅིན་ \"Personal\" ལྟ་བུ་ཨིན།"
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149
+#: ../plugins/caldav/caldav-source.c:282
 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"
@@ -13479,95 +13223,83 @@ msgstr ""
 "\n"
 "  འགོ་བཙུགས་ཀྱི་དོན་ལུ་ \"Forward\"  ལུ་ ཨེབ་གཏང་འབད།"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "མིང་རྟགས་ཁ་སྐོང་རྐྱབས། (_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "ཨ་རྟག་ར་ གཟུགས་བརྙན་ཚུ་ ཨིན་ཊར་ནེཊི་ནང་ལས་ མངོན་གསལ་འབད། (_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "འཕྲིན་དོན་གསརཔ་ལྷོདཔ་ད་ ང་ལུ་བརྡ་བསྐུལ་མ་འབད། (_D)"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "འཛོམས་འདུའི་ཞུ་བ་ལུ་ མིང་རྟགས་མ་བཀོད། (ཨའུཊི་ལུཀ་ཆ་མཐུན་གྱི་དོན་ལུ) (_D)"
+msgstr "འཛོམས་འདུའི་ཞུ་བ་ཚུ་ལུ་ མིང་རྟགས་མ་བཀོད། (ཕྱི་སྣང་ཆ་མཐུན་གྱི་དོན་ལུ) (_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
-msgstr "གདོང་བསྐྱོད་ཀྱི་བཟོ་རྣམ་: (_F)"
+msgstr "བཟོ་རྣམ་གདོང་བསྐྱོད་འབད་: (_F)"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
-msgstr "འབྲེལ་ས་ཚུ་ནང་ལས་ ཡིག་འཕྲིན་ལུ་ གཟུགས་བརྙན་མངོན་གསལ་འབད།(_L)"
+msgstr "འབྲེལ་ས་ཚུ་ནང་ལས་ ཡིག་འཕྲིན་ནང་ལུ་ གཟུགས་བརྙན་མངོན་གསལ་འབད།(_L)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "འདི་ངེད་ཀྱི་ སྔོན་སྒྲིག་རྩིས་ཐོ་སྦེ་བཟོ། (_M)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
-msgstr "འཕྲིན་དོན་ཚུ་ལུ་ ཤུལ་ལས་ལྷག་ཟེར་ རྟགས་བཀལ། (_M)"
+msgstr "འཕྲིན་དོན་ཚུ་ལུ་ ཤུལ་ལས་ལྷག་ཟེར་རྟགས་བཀལ། (_M)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
-msgstr "ནམ་ཡང་ ཨིན་ཊར་ནེཊི་ནང་ལས་ གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་མ་འབད། (_N)"
+msgstr "ནམ་ཡང་ཨིན་ཊར་ནེཊི་ནང་ལས་ གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་མ་འབད། (_N)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "འགྲུལ་ལམ་: (_P)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "འཕྲིན་དོན་མ་དགོ་མི་ འབྲེལ་ས་ཚུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ འཕྲིན་དོན་གཏངམ་ད་ ནུས་སྤེལ་འབད། (_P)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "དོན་ཚན་གྱལ་རིམ་སྟོངམ་སྦེ་ འཕྲིན་དོན་བཏང་བའི་སྐབས་ ནུས་སྤེལ་འབད། (_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "ལན་གསལ་གྱི་དབྱེ་བ་: (_R)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "ཡིག་ཚུགས་: (_S)"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "གཟུགས་བརྙན་གྱི་བསྒུལ་པར་སྟོན།(_S)"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "གཏང་ཡུལ་/ཤོག་ནག་འདྲ་བཤུས་/མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ཀྱི་མགོ་ཡིག་ཚུ་སྐུམས།(_S)"
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
-msgstr "མཐའ་བཙན་ཅན་གྱི་མཐུད་ལམ་ ལག་ལེན་འཐབ་: (_U)"
+msgstr "མཐའ་བཙན་གྱི་མཐུད་ལམ་ ལག་ལེན་འཐབ་: (_U)"
 
 #: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "གློག་རིམ་གཞན་ཟུམ་གྱི་ ཡིག་གཟུགས་ཚུ་ ལག་ལེན་འཐབ། (_U)"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "ཁ་བྱང་།"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "ཚོས་གཞི།"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "འགྲེལ་བཤད།"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>འཚོལ་ཞིབ་སྣོད་འཛིན་གྱི་འབྱུང་ཁུངས་ཚུ།</b>"
@@ -13581,63 +13313,50 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">གསང་བཟོ་</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "ཐག་རིང་གི་སྣོད་འཛིན་ ཤུགས་ལྡན་ཆ་མཉམ།"
-
-#: ../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
 msgid "Case _sensitive"
-msgstr "ཡི་གུ་ཆུ་ཆུང་གི་ཉེན་ཁ། (_s)"
+msgstr "ཡི་གུ་ཆེ་ཆུང་གི་ཉེན་ཁ། (_s)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "མཇུག་བསྡུ་ཡོད། (_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "འཚོལ་: (_i)"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "འཕྲིན་དོན་ནང་འཚོལ།"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "ཤུལ་དཔྱད་དགོ་པའི་ཟུར་རྟགས།"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "སྣོད་འཛིན་མཁོ་མངགས་ཚུ།"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "ཆོག་ཐམ་གན་འཛིན།"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "སེལ་འཐུ་མ་འབདཝ།"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "སར་བར་: (_e)"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "སྲུང་སྐྱོབ་བརྡ་དོན།"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "དམིགས་བསལ་གྱི་སྣོད་འཛིན་ཚུ།"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13645,167 +13364,195 @@ msgstr ""
 "ཁྱོད་ཀྱིས་ ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་ སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་ཚུ་ འོག་ལུ་ཐོ་བཀོད་འབད་དེ་ཡོད།.\n"
 "\"Flag\" དཀར་ཆག་ནང་ལས་ ཤུལ་དཔྱད་ཀྱི་ བྱ་བ་ཅིག་སེལ་འཐུ་འབད་གནང་།"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
-msgstr "ཆོག་ཐམ་དང་ལེན་འབད། (_A)"
+msgstr "ཆོག་ཐམ་ལུ་དང་ལེན་འབད། (_A)"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/message-tags.glade.h:6
 msgid "_Due By:"
-msgstr "རན་དུས་: (_D)"
+msgstr "རན་དུས་་: (_D)"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "ཟུར་རྟགས་: (_F)"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "མཁོ་མངགས་འབད། (_S)"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "ཆོག་ཐམ་གན་འཛིན་དེ་ དང་ལེན་འབད་ནིའི་དོན་ལུ་ འདི་ལུ་བདེན་རྟགས་བཀལ། (_T)"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "མཁོ་མངགས་བཤོལ། (_U)"
 
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "དམིགས་བསལ་གྱི་ སྣོད་འཛིན་ཚུ་རྐྱངམ་གཅིག"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "ཐག་རིང་གི་ ཤུགས་ལྡན་སྣོད་འཛིན་ ཆ་མཉམ་དང་བཅསཔ་སྦེ།"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "ཉེ་གནས་དང་ ཐག་རིང་གི་ ཤུགས་ལྡན་སྣོད་འཛིན་ ཆ་མཉམ་དང་བཅསཔ་སྦེ།"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "ཉེ་གནས་ཀྱི་ ཤུགས་ལྡན་སྣོད་འཛིན་ ཆ་མཉམ་དང་བཅསཔ་སྦེ།"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "%s པིང་འབད་དོ"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "སྣོད་འཛིན་འཚག་དོ།"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "ཡིག་འཕྲིན་ལེན་དོ།"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ཕྱིར་གཏང་གི་ཚགས་མ་%s ཚུ་ ལག་ལེན་འཐབ་མ་ཚུགས།"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577
+#: ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
-msgstr ""
-"%s: %sལུ་ མཇུག་བསྣོན་འབད་མ་ཚུགས། དེ་གི་ཚབ་ལུ་ ཉེ་གནས་ལུ་བཏང་ཡོད་པའི་སྣོད་འཛིན་ལུ་ མཇུག་བསྣོན་"
-"འབད་དོ། "
+msgstr "%s: %sལུ་ མཇུག་བསྣོན་འབད་མ་ཚུགས། དེ་གི་ཚབ་ལུ་ ཉེ་གནས་ལུ་བཏང་ཡོད་པའི་སྣོད་འཛིན་ལུ་ མཇུག་བསྣོན་འབད་དོ། "
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ཉེ་གནས་ལུ་ ‘བཏང་ཡོད་པའི་’ སྣོད་འཛིན་%sལུ་ མཇུག་བསྣོན་འབད་མ་ཚུགས།"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "འཕྲིན་དོན་%d ལས་ %dབཏང་དོ།"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "འཕྲིན་དོན་%dལས་%dབཏང་མ་ཚུགས།"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762
+#: ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "ཆ་མེད་བཏང་ཡོད།"
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "ཡོངས་སྒྲུབ།"
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "འཕྲིན་དོན་སྣོད་འཛིན་ལུ་ སྲུང་བཞག་འབད་དོ།"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "འཕྲིན་དོན་ཚུ་ %s ལུ་ སྤོ་བཤུད་འབད་དོ།"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "འཕྲིན་དོན་ཚུ་%sལུ་ འདྲ་བཤུས་རྐྱབ་དོ།"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "གདོང་བསྐྱོད་འབད་ཡོད་པའི་འཕྲིན་དོན་ཚུ།"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "སྣོད་འཛིན་%sཁ་ཕྱེ་དོ།"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "མཛོད་ཁང་%sཁ་ཕྱེ་དོ།"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "སྣོད་འཛིན་%s སྤོ་བཤུད་འབད་དོ།"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "སྣོད་འཛིན་%sགསོག་འཇོག་འབད་དོ།"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "རྩིས་ཐོ་'%s'རྩ་མེད་བཏང་སྟེ་ གསོག་འཇོག་འབད་དོ།"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "རྩིས་ཐོ་'%s'གསོག་འཇོག་འབད་དོ།"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "སྣོད་འཛིན་ཡང་སེལ་འབད་དོ།"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613
+#: ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "སྣོད་འཛིན་རྩ་མེད་བཏང་དོ།"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s'ནང་ལུ་ ཕྱགས་ཧོད་སྟོངམ་བཏོན་དོ།"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "ཉེ་གནས་ཀྱི་སྣོད་འཛིན་ཚུ།"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "འཕྲིན་དོན་%s སླར་འདྲེན་འབད་དོ།"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "འཕྲིན་དོན་%dསླར་འདྲེན་འབད་དོ།"
 msgstr[1] "འཕྲིན་དོན་%d སླར་འདྲེན་འབད་དོ།"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "འཕྲིན་དོན་ %d སྲུང་བཞག་འབད་དོ།"
 msgstr[1] "་འཕྲིན་དོན་ཚུ་ %d སྲུང་བཞག་འབད་དོ།"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"ཨའུཊི་པུཊི་ཡིག་སྣོད་: %s བཟོ་མ་ཚུགས།\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13814,11 +13561,12 @@ msgstr ""
 "འཕྲིན་དོན་ཚུ་ %s ནང་ སྲུང་བཞག་འབད་ནི་ལུ་འཛོལ་བ།\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "མཉམ་སྦྲགས་སྲུང་བཞག་འབད་དོ།"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13827,69 +13575,61 @@ msgstr ""
 "ཨའུཊི་པུཊི་ཡིག་སྣོད་ %s བཟོ་མ་ཚུགས།\n"
 "\" %s\""
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "གནད་སྡུད་%sའབྲི་མ་ཚུགས།"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%sནང་ལས་ མཐུད་ལམ་བཏོག་བཏང་དོ།"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%sལུ་ སླར་མཐུད་འབད་དོ།"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "ཞབས་ཏོག་ཞིབ་དཔྱད་འབད་དོ།"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
-msgstr "ཆ་མེད་གཏང་དོ་..."
+msgstr "ཆ་མེད་བཏང་དོ་..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "འཕྲིན་དོན་གཏང་ནི་དང་ལེན་ནི།"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
-msgstr "ཆ་མཉམ་ ཆ་མེད་གཏང་། (_A)"
+msgstr "ཆ་མཉམ་ཆ་མེད་གཏང་། (_A)"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "དུས་མཐུན་བཟོ་དོ་..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425
+#: ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "བསྒུད་སྡོད་དོ་..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "ཡིག་འཕྲིན་གསརཔ་ཡོད་མེད་ ཞིབ་དཔྱད་འབད་དོ།"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%sགི་དོན་ལུ་ ཆོག་ཚིག་བཙུགས།"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "ཆོག་ཚིག་བཙུགས།"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%sགི་དོན་ལུ་ ཆོག་ཡིག་བཙུགས།"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "ཆོག་ཡིག་བཙུགས།"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "ལག་ལེན་པ་གིས་ བཀོལ་སྤྱོད་ཆ་མེད་བཏང་ནུག"
 
@@ -13945,52 +13685,39 @@ msgstr "'%s:%s'གི་དོན་ལས་ འཚོལ་ཞིབ་སྣ�
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s'གི་དོན་ལས་ འཚོལ་ཞིབ་སྣོད་འཛིན་ཚུ་ དུས་མཐུན་བཟོ་དོ།"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་ ཞུན་དག་རྐྱབས།"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་གསརཔ།"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "སྣོད་འཛིན་མིང་&quot;{1}&quot;འབད་མི་ཅིག་ ཧེ་མ་ལས་རང་འདུག མིང་སོ་སོ་ཅིག་བཏགས་གནང་།"
 
 #: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"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}ལུ་ གཏང་ནི་ཨིན?"
+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;འབད་མི་ཅིག་ ཧེ་མ་ལས་རང་འདུག མིང་སོ་སོ་ཅིག་བཏགས་གནང་།"
+msgid "A signature already exists with the name &quot;{0}&quot;. Please specify a different name."
+msgstr "མཚན་རྟགས་མིང་&quot;{1}&quot;འབད་མི་ཅིག་ ཧེ་མ་ལས་རང་འདུག མིང་སོ་སོ་ཅིག་གསལ་བཀོད་འབད་གནང་།"
 
 #: ../mail/mail.error.xml.h:7
-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:8
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -14001,29 +13728,20 @@ msgid "Are you sure you want to delete this account?"
 msgstr "ཁྱོད་ཀྱིས་རྩིས་ཐོ་འདི་ ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:10
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
-msgstr "ཁྱོད་ཀྱིས་རྩིས་ཐོ་འདི་དང་ དེ་གི་པོརོ་སི་ཆ་མཉམ་ ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgstr "ཁྱོད་ཀྱིས་རྩིས་ཐོ་འདི་ལྕོགས་མིན་བཟོ་སྟེ་ དེ་གི་པོ་རག་སི་ཚུ་ཆ་མཉམ་ ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "ཁྱོད་ཀྱིས་ འཕྲིན་དོན་(0) དུས་གཅིག་ལུ་ཁ་ཕྱེ་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:12
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"ཁྱོད་ཀྱིས་སྣོད་འཛིན་ཆ་མཉམ་ནང་ལས་ བཏོན་བཞག་མི་ འཕྲིན་དོན་ཆ་མཉམ་རང་ ངེས་པར་དུ་ རྟག་བརྟན་སྦེ་ རྩ་"
-"བསྐྲད་གཏང་ནི་ཨིན་ན?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "ཁྱོད་ཀྱིས་སྣོད་འཛིན་ཆ་མཉམ་ནང་ལས་ བཏོན་བཞག་མི་ འཕྲིན་དོན་ཆ་མཉམ་རང་ ངེས་པར་དུ་ རྟག་བརྟན་སྦེ་ རྩ་བསྐྲད་གཏང་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr ""
-"ཁྱོད་ཀྱིས་ སྣོད་འཛིན་&quot;{0}&quot; ནང་ལུ་ བཏོན་བཞག་མི་ འཕྲིན་དོན་ཆ་མཉམ་རང་ ངེས་པར་དུ་ རྟག་"
-"བརྟན་སྦེ་ རྩ་བསྐྲད་གཏང་ནི་ཨིན་ན?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
+msgstr "ཁྱོད་ཀྱིས་ སྣོད་འཛིན་&quot;{0}&quot; ནང་ལུ་ བཏོན་བཞག་མི་ འཕྲིན་དོན་ཆ་མཉམ་རང་ ངེས་པར་དུ་ རྟག་བརྟན་སྦེ་ རྩ་བསྐྲད་གཏང་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14031,8 +13749,7 @@ msgstr "ཁྱོད་ཀྱིས་ ཨེཆ་ཊི་ཨེམ་ཨེ�
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"ཁྱོད་ཀྱིས་འཕྲིན་དོན་ཅིག་ མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ ལེན་མཁན་ཚུ་རྐྱངམ་ལུ་ གཏང་ནི་ངེས་ཏིག་ཨིན་ན?"
+msgstr "ཁྱོད་ཀྱིས་འཕྲིན་དོན་ཅིག་ བི་སི་སི་ ལེན་མཁན་ཚུ་རྐྱངམ་ལུ་ གཏང་ནི་ངེས་ཏིག་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
@@ -14099,13 +13816,8 @@ msgid "Cannot open target &quot;{2}&quot;."
 msgstr "དམིགས་གཏད་&quot;{2}&quot;ཁ་ཕྱེ་མི་ཚུགས་པས།"
 
 #: ../mail/mail.error.xml.h:33
-msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
-msgstr ""
-"གཞི་བཙུགས་ཀྱི་ དཀའ་ངལ་ཅིག་ལུ་བརྟེན་ཏེ་ ཆོག་ཐམ་ཡིག་སྣོད&quot;{0}&quot;ལྷག་མ་ཚུགས། ཁྱོད་ཀྱིས་བྱིན་"
-"མཁན་དེ་གི་ཆོག་ཐམ་དང་ལེན་མ་འབད་ཚུན་ཚོད་ བྱིན་མཁན་འདི་ལག་ལེན་འཐབ་མི་ཚུགས།"
+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དེ་ ལྷག་མ་ཚུགས། ཁྱོད་ཀྱིས་བྱིན་མཁན་གྱི་ཆོག་ཐམ་དེ་ དང་ལེན་མ་འབད་ཚུན་ཚོད་ བྱིན་མཁན་དེ་ ལག་ལེན་འཐབ་མི་ཚུགས།"
 
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
@@ -14113,8 +13825,7 @@ msgstr "&quot;{0}&quot;དེ་ &quot;{1}&quot;ལུ་ བསྐྱར་མ�
 
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr ""
-"རིམ་ལུགས་སྣོད་འཛིན་&quot;{0}&quot;ལུ་ བསྐྱར་མིང་བཏགས་ནི་དང་ སྤོ་བཤུད་འབད་ནི་ཚུ་མི་བཏུབ་པས།"
+msgstr "རིམ་ལུགས་སྣོད་འཛིན་&quot;{0}&quot;ལུ་ བསྐྱར་མིང་བཏགས་ནི་དང་ སྤོ་བཤུད་འབད་ནི་ཚུ་མི་བཏུབ་པས།"
 
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
@@ -14133,12 +13844,8 @@ msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "མིང་རྟགས་ཡིག་ཚུགས་&quot;{0}&quot; གཞི་སྒྲིག་འབད་མི་ཚུགས་པས།"
 
 #: ../mail/mail.error.xml.h:40
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"ཁྱོད་རའི་ཆོག་ཡིག་གི་ཡིག་སྡེབ་ འཛོལ་མ་འཛོལ་ཞིབ་དཔྱད་འབད། ཆོག་ཡིག་ཚུ་ལུ་ ཡི་ཆེ་ཆུང་གི་ཉེན་ཁ་ཡོདཔ་ཨིནམ་ "
-"སེམས་ཁར་བཞག་དགོ ཡང་ཅིན་ ཁྱོད་ཀྱི་ཚུགས་ལྡེ་དེ་ ཨེབ་སྟེ་ཡོདཔ་འོང་།"
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "ཁྱོད་རའི་ཆོག་ཡིག་གི་ཡིག་སྡེབ་ འཛོལ་མ་འཛོལ་ ཞིབ་དཔྱད་འབད། ཆོག་ཡིག་ལེ་ཤ་ཅིག་ལུ་ ཡི་གུ་ཆེ་ཆུང་གི་ཉེན་ཁ་ཡོདཔ་ སེམས་ཁར་བཞག ཁྱོད་ཀྱི་ཚུགས་ལྡེ་དེ་ ཨེབ་སྟེ་ཡོདཔ་འོང་།།"
 
 #: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
@@ -14154,7 +13861,7 @@ msgstr "རྩིས་ཐོ་བཏོན་གཏང་ནི་ཨིན་
 
 #: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
-msgstr "བསྒྱུར་བཅོས་ཚུ་བཏོན་བཀོག་ནི་ཨིན་ན?"
+msgstr "བསྒྱུར་བཅོས་ཚུ་ བཏོན་བཀོག་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
@@ -14170,7 +13877,7 @@ msgstr "ཁྱོད་ཀྱིས་བཀོལ་སྤྱོད་ཚུ་
 
 #: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
-msgstr "འཕྲིན་དོན་ཆ་མཉམ་རང་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ཨིན་ན?"
+msgstr "འཕྲིན་དོན་ཆ་མཉམ་རང་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ཨིན་ན།"
 
 #: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
@@ -14205,16 +13912,12 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "ཁྱོད་ཀྱིས་ འཕྲོ་མཐུད་པ་ཅིན་ འཕྲིན་དོན་འདི་ཚུ་ སླར་གསོ་་འབད་མི་ཚུགས།"
 
 #: ../mail/mail.error.xml.h:57
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"ཁྱོད་ཀྱིས་སྣོད་འཛིན་དེ་བཏོན་གཏང་པ་ཅིན་ དེ་གི་ནང་དོན་དང་ དེ་གི་ཡན་ལག་སྣོད་འཛིན་ཚུ་གི་ ནང་དོན་ཆ་མཉམ་"
-"རང་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་འོང་།"
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgstr "ཁྱོད་ཀྱིས་སྣོད་འཛིན་དེ་བཏོན་གཏང་པ་ཅིན་ དེ་གི་ནང་དོན་དང་ དེ་གི་ཡན་ལག་སྣོད་འཛིན་ཚུ་གི་ ནང་དོན་ཆ་མཉམ་རང་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་འོང་།"
 
 #: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་པ་ཅིན་ པོརོ་སི་རྩིས་ཐོ་ཚུ་ རྟག་བརྟན་སྦེ་བཏོན་གཏང་འོང་།"
+msgstr "ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་འབད་བ་ཅིན་ པོ་རོག་སི་རྩིས་ཐོ་ཆ་མཉམ་རང་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་འོང་།"
 
 #: ../mail/mail.error.xml.h:59
 msgid ""
@@ -14229,9 +13932,7 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་འབད་བ་ཅིན་ རྩིས་ཐོའི་བརྡ་དོན་དེ་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་འོང་།"
 
 #: ../mail/mail.error.xml.h:62
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "ཁྱོད་ཀྱིས་སྤང་པ་ཅིན་ འཕྲིན་དོན་འདི་ཚུ་ ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་མ་བཙུགས་ཚུན་ཚོད་མི་གཏང་།"
 
 #: ../mail/mail.error.xml.h:63
@@ -14247,17 +13948,8 @@ msgid "Mail filters automatically updated."
 msgstr "ཡིག་འཕྲིན་ཚགས་མ་ཚུ་ རང་བཞིན་གྱིས་ དུས་མཐུན་བཟོ་ཡི།"
 
 #: ../mail/mail.error.xml.h:66
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"ཁྱོད་ཀྱིས་བཏང་བའི་བསྒང་ཡོད་མི་ འབྲེལ་སའི་ཐོ་ཡིག་དེ་ ལེན་མཁན་གྱི་ཐོ་ཡིག་ སྦ་བཞག་ནི་ལུ་ རིམ་སྒྲིག་འབད་ནུག "
-"གློག་འཕྲིན་རིམ་ལུགས་ ལེ་ཤ་ཅིག་གིས་རང་ མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ ལེན་མཁན་ཡོད་མི་འཕྲིན་དོན་ཚུ་རྐྱངམ་"
-"ལུ་ གཏང་ཡུལ་གྱི་ མགོ་ཡིག་ཅིག་ ཁ་སྐོང་བརྐྱབ་ཨིན། མགོ་ཡིག་འདི་ ཁ་སྐོང་རྐྱབས་བ་ཅིན་ ཁྱོད་ཀྱི་ལེན་མཁན་ ཆ་"
-"མཉམ་རང་ ཁྱོད་ཀྱི་འཕྲིན་དོན་གང་རུང་ནང་ ཐོ་བཀོད་འབདཝ་ཨིན། འདི་སྤང་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་ ཉུང་ཤོས་རང་ "
-"གཏང་ལུ: ཡང་ཅིན་ སི་སི་: ལེན་མཁན་གཅིག་ ཁ་སྐོང་བརྐྱབ་དགོ   "
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "ཁྱོད་ཀྱིས་བཏང་བའི་བསྒང་ཡོད་མི་ འབྲེལ་སའི་ཐོ་ཡིག་དེ་ ལེན་མཁན་གྱི་ཐོ་ཡིག་ སྦ་བཞག་ནི་ལུ་ རིམ་སྒྲིག་འབད་ནུག གློག་འཕྲིན་རིམ་ལུགས་ ལེ་ཤ་ཅིག་གིས་རང་ བི་སི་སི་ལེན་མཁན་ཡོད་མི་འཕྲིན་དོན་ཚུ་རྐྱངམ་ལུ་ གཏང་ཡུལ་གྱི་ མགོ་ཡིག་ཅིག་ ཁ་སྐོང་བརྐྱབ་ཨིན། མགོ་ཡིག་འདི་ ཁ་སྐོང་རྐྱབས་བ་ཅིན་ ཁྱོད་ཀྱི་ལེན་མཁན་ ཆ་མཉམ་རང་ ཁྱོད་ཀྱི་འཕྲིན་དོན་གང་རུང་ནང་ ཐོ་བཀོད་འབདཝ་ཨིན། འདི་སྤང་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་ ཉུང་ཤོས་རང་ གཏང་ལུ: ཡང་ཅིན་ སི་སི་: ལེན་མཁན་གཅིག་ ཁ་སྐོང་བརྐྱབ་དགོ   "
 
 #: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
@@ -14285,20 +13977,15 @@ msgstr "ཁྱོད་རའི་རྩིས་ཐོའི་གཞི་ས
 
 #: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
-msgstr "རྩིས་ཐོ་ལྕོགས་ཅན་བཟོ་ ཡང་ན་ རྩིས་ཐོ་གཞན་ཅིག་ ལག་ལེན་འཐབ་སྟེ་གཏང་།"
+msgstr "རྩིས་ཐོ་ལྕོགས་ཅན་བཟོ་ ཡང་ན་ རྩིས་ཐོ་གཞན་ཅིག་ ལག་ལེན་འཐབ་སྟེ་སྐྱེལ་གཏང་།"
 
 #: ../mail/mail.error.xml.h:75
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-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:76
 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}\n"
 "Send anyway?"
 msgstr ""
@@ -14308,7 +13995,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
-msgstr "མིང་རྟགས་འདི་ངོས་འཛིན་འབད་ནི་ལུ་ མཐུན་མོང་མ་ཡིན་པའི་མིང་ཅིག་བཏགས།"
+msgstr "མིང་རྟགས་འདི་ ངོས་འཛིན་གྱི་དོན་ལུ་ མཐུན་མིན་གྱི་མིང་ཅིག་བྱིན།"
 
 #: ../mail/mail.error.xml.h:80
 msgid "Please wait."
@@ -14332,9 +14019,7 @@ msgstr "འབྱོར་རྟགས་ཞུ་བ་ལྷག "
 
 #: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr ""
-"སྣོད་འཛིན་&quot;{0}&quot;དང་ དེ་གི་ཡན་ལག་སྣོད་འཛིན་ ཆ་མཉམ་རང་ ཐད་རི་འབའ་རི་ བཏོན་གཏང་ནི་"
-"ཨིན་ན?"
+msgstr "སྣོད་འཛིན་&quot;{0}&quot;དང་ དེ་གི་ཡན་ལག་སྣོད་འཛིན་ ཆ་མཉམ་རང་ ཐད་རི་འབའ་རི་ བཏོན་གཏང་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
@@ -14346,30 +14031,18 @@ msgstr "འབྱོར་རྟགས་སྐྱེལ།"
 
 #: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
-msgstr "མིང་རྟགས་ཧེ་མ་ལས་འདུག"
+msgstr "མིང་རྟགས་ཧེ་མ་ལས་རང་འདུག"
 
 #: ../mail/mail.error.xml.h:89
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"རིམ་ལུགས་སྣོད་འཛིན་ཚུ་ ཨི་བོ་ལུ་ཤཱན་ ཚུལ་མཐུན་སྦེ་ ལཱ་འབད་ནིའི་དོན་ལུ་དགོཔ་ནི་དང་ བསྐྱར་མིང་བཏགས་ནི་"
-"དང་ སྤོ་བཤུད་འབད་ནི་ བཏོན་གཏང་ནི་ཚུ་མི་བཏུབ།"
+msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "རིམ་ལུགས་སྣོད་འཛིན་ཚུ་ ཟི་མི་ཡཱན་ ཨི་བོ་ལུ་ཤཱན་ ཚུལ་མཐུན་སྦེ་ ལཱ་འབད་ནིའི་དོན་ལུ་དགོཔ་ལས་ བསྐྱར་མིང་བཏགས་ནི་དང་ སྤོ་བཤུད་འབད་ནི་ བཏོན་གཏང་ནི་ཚུ་མི་བཏུབ།"
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
-msgstr ""
-"ཁྱོད་ཀྱིས་བཏང་བའི་བསྒང་ཡོད་མི་ འབྲེལ་སའི་ཐོ་ཡིག་དེ་ ལེན་མཁན་གྱི་ཐོ་ཡིག་ སྦ་བཞག་ནི་ལུ་ རིམ་སྒྲིག་འབད་ནུག "
-"གློག་འཕྲིན་རིམ་ལུགས་ ལེ་ཤ་ཅིག་གིས་རང་ མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ ལེན་མཁན་ཡོད་མི་འཕྲིན་དོན་ཚུ་རྐྱངམ་"
-"ལུ་ གཏང་ཡུལ་གྱི་ མགོ་ཡིག་ཅིག་ ཁ་སྐོང་བརྐྱབ་ཨིན། མགོ་ཡིག་འདི་ ཁ་སྐོང་བརྐྱབས་པ་ཅིན་ ཁྱོད་ཀྱི་ལེན་མཁན་ ཆ་"
-"མཉམ་རང་ ཁྱོད་ཀྱི་འཕྲིན་དོན་ནང་ ཐོ་བཀོད་འབདཝ་ཨིན། འདི་སྤང་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་ ཉུང་ཤོས་རང་ གཏང་"
-"ལུ: ཡང་ཅིན་ སི་སི་: ལེན་མཁན་གཅིག་ ཁ་སྐོང་བརྐྱབ་དགོ"
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+msgstr "ཁྱོད་ཀྱིས་བཏང་བའི་བསྒང་ཡོད་མི་ འབྲེལ་སའི་ཐོ་ཡིག་དེ་ ལེན་མཁན་གྱི་ཐོ་ཡིག་ སྦ་བཞག་ནི་ལུ་ རིམ་སྒྲིག་འབད་ནུག གློག་འཕྲིན་རིམ་ལུགས་ ལེ་ཤ་ཅིག་གིས་རང་ བི་སི་སི་ལེན་མཁན་ཡོད་མི་འཕྲིན་དོན་ཚུ་རྐྱངམ་ལུ་ གཏང་ཡུལ་གྱི་ མགོ་ཡིག་ཅིག་ ཁ་སྐོང་བརྐྱབ་ཨིན། མགོ་ཡིག་འདི་ ཁ་སྐོང་བརྐྱབས་པ་ཅིན་ ཁྱོད་ཀྱི་ལེན་མཁན་ ཆ་མཉམ་རང་ ཁྱོད་ཀྱི་འཕྲིན་དོན་ནང་ ཐོ་བཀོད་འབདཝ་ཨིན། འདི་སྤང་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་ ཉུང་ཤོས་རང་ གཏང་ལུ: ཡང་ཅིན་ སི་སི་: ལེན་མཁན་གཅིག་ ཁ་སྐོང་བརྐྱབ་དགོ"
 
 #: ../mail/mail.error.xml.h:93
 msgid ""
@@ -14407,52 +14080,35 @@ msgstr "ཡིག་ཚུགས་ཡིག་སྣོད་དེ་ ཕྱ�
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
-msgstr ""
-"སྣོད་འཛིན་འདི་ བསམ་པའི་སྒོ་ལས་ ཁ་སྐོང་བརྐྱབས་བརྐྱབས་་འོང་ནི་ཨིནམ་ལས་ སོ་སོ་སྦེ་ ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་"
-"ལུ་ དགོས་མཁོ་འབྱུང་པ་ཅིན་ འཚོལ་ཞིབ་་སྣོད་འཛིན་ ཞུན་དགཔ་ལུ་སོང་།།"
+msgstr "སྣོད་འཛིན་འདི་ བསམ་པའི་སྒོ་ལས་ ཁ་སྐོང་བརྐྱབས་བརྐྱབས་་འོང་ནི་ཨིནམ་ལས་ སོ་སོ་སྦེ་ ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་ལུ་ དགོས་མཁོ་འབྱུང་པ་ཅིན་ འཚོལ་ཞིབ་་སྣོད་འཛིན་ ཞུན་དགཔ་ལུ་སོང་།།"
 
 #: ../mail/mail.error.xml.h:106
-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:107
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr "ཁྱོད་ཀྱིས་ལེན་མཁན་ག་ནི་ཡང་ གསལ་བཀོད་མ་འབདཝ་ལས་ འཕྲིན་དོན་འདི་གཏང་མི་ཚུགས།"
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "ཁྱོད་ཀྱིས་ལེན་མཁན་ག་ནི་ཡང་ གསལ་བཀོད་མ་འབདཝ་ལས་ འཕྲིན་དོན་འདི་ གཏང་མི་ཚུགས།"
 
 #: ../mail/mail.error.xml.h:108
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"སར་བར་འདི་གིས་ བདེན་བཤད་འདི་བཟུམ་ལུ་ རྒྱབ་སྐྱོར་མི་འབདཝ་ལས་ མ་གཞི་ལས་རང་ བདེན་བཤད་ལུ་ རྒྱབ་སྐྱོར་"
-"མི་འབདཝ་འོང་།"
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "སར་བར་འདི་གིས་ བདེན་བཤད་འདི་བཟུམ་ལུ་ རྒྱབ་སྐྱོར་མི་འབདཝ་ལས་ མ་གཞི་ལས་རང་ བདེན་བཤད་ལུ་ རྒྱབ་སྐྱོར་མི་འབདཝ་འོང་།"
 
 #: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "མིང་རྟགས་འདི་ བསྒྱུར་བཅོས་འབད་ནུག་ དེ་འབདཝ་ད་ མ་བསྲུངས་པས།"
 
 #: ../mail/mail.error.xml.h:110
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"འདི་གིས་སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དང་ དེ་གི་སྣོད་འཛིན་ཡན་ལག་ཚུ་ནང་གི་ འཕྲིན་དོན་ཆ་མཉམ་ལྷག་ཡོདཔ་སྦེ་ "
-"རྟགས་བཀལ་འོང་། "
+msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgstr "འདི་གིས་ སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དང་ སྣོད་འཛིན་ཡན་ལག་ཚུ་ནང འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་འོང་། "
 
 #: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "སྡེ་རིམ་སར་བར་ལུ་མཐུད་མ་ཚུགས།"
 
 #: ../mail/mail.error.xml.h:112
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"རྩིས་ཐོ་འདི་གི་དོན་ལས་ ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་ ཁ་ཕྱེ་མ་ཚུགས། དེ་གི་ཚབ་ལུ་ རིམ་ལུགས་ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་ "
-"ལག་ལེན་འཐབ་ག? "
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr "རྩིས་ཐོ་འདི་གི་དོན་ལས་ ཟིན་བྲིས་སྣོད་འཛིན་ ཁ་ཕྱེ་མ་ཚུགས། དེ་གི་ཚབ་ལུ་ རིམ་ལུགས་ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་ ལག་ལེན་འཐབ། "
 
 #: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
@@ -14489,13 +14145,11 @@ msgstr "ཁྱོད་ཀྱིས་སྣོད་འཛིན་ཅིག་
 #: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "ཁྱོད་ཀྱིས་ཉུང་ཤོས་རང་ འབྱུང་ཁུངས་སྦེ་ སྣོད་འཛིན་གཅིག་ གསལ་བཀོད་འབད་དགོ\n"
 "དེ་ཡང་ སྣོད་འཛིན་སོ་སོ་སྦེ་ སེལ་འཐུ་འབད་ཏེ་འབད་རུང་ ཉེ་གནས་ཀྱི་སྣོད་འཛིན་ ཆ་མཉམ་སེལ་འཐུ་འབད་རུང་\n"
-"ཐག་རིང་གི་སྣོད་འཛིན་ ཆ་མཉམ་སེལ་འཐུ་འབད་རུང་ ཡང་ཅིན་ དེ་གཉིས་ཆ་རང་ སེལ་འཐུ་འབད་བའི་ཐོག་ལས་"
-"འབད་དགོ"
+"ཐག་རིང་གི་སྣོད་འཛིན་ ཆ་མཉམ་སེལ་འཐུ་འབད་རུང་ ཡང་ཅིན་ དེ་གཉིས་ཆ་རང་ སེལ་འཐུ་འབད་བའི་ཐོག་ལས་འབད་དགོ"
 
 #: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
@@ -14507,7 +14161,7 @@ msgstr "མཇུག་བསྣོན་འབད། (_A)"
 
 #: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
-msgstr "བསྒྱུར་བཅོས་ཚུ་ བཏོན་བཀོག་ད། (_D)"
+msgstr "བསྒྱུར་བཅོས་ཚུ་བཏོན་བཀོག (_D)"
 
 #: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
@@ -14517,74 +14171,80 @@ msgstr "རྩ་མེད་གཏང་། (_E)"
 msgid "_Open Messages"
 msgstr "འཕྲིན་དོན་ཚུ་ཁ་ཕྱེ། (_O)"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "མ་མཐོངམ།"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "མཐོང་མཐོངམ།"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "ལན་སླབ་ཡོདཔ།"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "མ་མཐོང་པའི་སྣ་མང་འཕྲིན་དོན།"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "སྣ་མང་འཕྲིན་དོན།"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "དམའ་ཤོས།"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "དམའ་མི།"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "མཐོ་མི།"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "མཐོ་ཤོས།"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341
+#: ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348
+#: ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "ད་རིས་%l:%M %p"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357
+#: ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "ཁ་རྩང་%l:%M %p"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369
+#: ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377
+#: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379
+#: ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "འཕྲིན་དོན་ཚུ།"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "འཕྲིད་དོན་ཐོ་ཡིག་ བཟོ་བསྐྲུན་འབད་དོ།"
 
@@ -14604,15 +14264,15 @@ msgstr "ཟུར་རྟགས་བཀལ་ཡོདཔ།"
 msgid "Follow Up Flag"
 msgstr "ཟུར་རྟགས་ཤུལ་དཔྱད་འབད།"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "འགོ་ཐོག་གནས་ཁོངས།"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "ཐོབ་ཡོདཔ།"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "བཏང་ཡོད་པའི་འཕྲིན་དོན་ཚུ།"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "ཚད།"
@@ -14633,7 +14293,8 @@ msgstr "ཤུལ་དཔྱད།"
 msgid "For Your Information"
 msgstr "ཁྱོད་ཀྱི་བརྡ་དོན་གྱི་དོན་ལུ།"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "གདོང་བསྐྱོད།"
 
@@ -14641,11 +14302,13 @@ msgstr "གདོང་བསྐྱོད།"
 msgid "No Response Necessary"
 msgstr "ངོས་ལན་དགོཔ་མེད།"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:82
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "ལན་གསལ།"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:83
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "ཆ་མཉམ་ལུ་ ལན་གསལ་གཏང་།"
 
@@ -14683,15 +14346,11 @@ msgstr "ཉེ་གནས་ཀྱི་ཁ་བྱང་ཀི་དེབ།
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Provides core functionality for local address books."
-msgstr "ཉེ་གནས་ཀྱི་ཟླ་ཐོ་ཚུ་གི་དོན་ལུ་ ནང་སྙིང་ལས་འགན་ཚུ་བྱིནམ་ཨིན།"
+msgstr "ཉེ་གནས་ཁ་བྱང་ཀི་དེབ་ཚུ་གི་དོན་ལུ་ ནང་སྙིང་ལས་འགན་ཚུ་བྱིནམ་ཨིན།"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
-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"
@@ -14731,8 +14390,7 @@ 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
@@ -14751,35 +14409,25 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ གནད་སྡུད་ད�
 msgid "Restore Settings..."
 msgstr "གཞི་སྒྲིག་ཚུ་སོར་ཆུད་འབད་..."
 
-#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
+#: ../plugins/bbdb/bbdb.c:430
+#: ../plugins/bbdb/bbdb.c:439
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "རང་བཞིན་གྱི་འབྲེལ་ས་ཚུ།"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "ཡིག་འཕྲིན་ལུ་ ངོས་ལན་འབདཝ་ད་ ཁ་བྱང་ཀི་དེབ་ནང་ རང་བཞིན་གྱིས་ ཐོ་བཀོད་བཟོཝ་ཨིན།(_A)"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "རང་བཞིན་གྱི་འབྲེལ་སའི་དོན་ལུ་ ཁ་བྱང་ཀི་དེབ་ སེལ་འཐུ་འབད།"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
-msgstr "འཕྲལ་མྱུར་འཕྲིན་གཏོང་གི་འབྲེལ་ས།"
+msgstr "<b>འཕྲལ་མྱུར་འཕྲིན་གཏོང་འབྲེལ་ས་</b>"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
-msgstr ""
-"གེམ་བ་ཌི་ཐོ་ཡིག་ནང་ལས་ འབྲེལ་སའི་བརྡ་དོན་དང་གཟུགས་བརྙན་ཚུ་ འཕྲལ་འཕྲལ་སྦེ་མཉམ་འབྱུང་འབདཝ་ཨིན།"
-
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "གེམ་གྱི་ཆ་རོགས་ཐོ་ཡིག་གི་དོན་ལུ་ ཁ་བྱང་ཀི་དེབ་སེལ་འཐུ་འབད།"
+msgid "Periodically synchronize contact information and images from gaim buddy list"
+msgstr "གཱེམ་བཱ་ཌི་ཐོ་ཡིག་མི་ནང་ལས་ འབྲེལ་སའི་བརྡ་དོན་དང་ གཟུགས་བརྙན་ཚུ་ འཕྲལ་འཕྲལ་སྦེ་ མཉམ་འབྱུང་འབདཝ་ཨིན།"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
@@ -14787,22 +14435,17 @@ 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 ""
-"ཁྱོད་ཀྱིས་ཡིག་འཕྲིན་ཚུ་ལུ་ ལན་རྐྱབ་པའི་བར་ན་ རང་བཞིན་གྱིས་ ཁྱོད་ཀྱི་ཁ་བྱང་ཀི་དེབ་དེ་ནང་ མིང་གསལ་དང་ "
-"གློག་འཕྲིན་ཁ་བྱང་གིས་བཀངམ་ཨིན། ད་རུང་ ཁྱོད་ཀྱི་བཱ་ཌི་ཐོ་ཡིག་ཚུ་ནང་ལས་ ཨའི་ཨེམ་འབྲེལ་སའི་བརྡ་དོན་ཡང་"
-"བཀངམ་ཨིན།"
+msgid "Automatically fills your addressbook with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
+msgstr "ཁྱོད་ཀྱིས་ཡིག་འཕྲིན་ཚུ་ལུ་ ལན་རྐྱབ་པའི་བར་ན་ རང་བཞིན་གྱིས་ ཁྱོད་ཀྱི་ཁ་བྱང་ཀི་དེབ་དེ་ནང་ མིང་གསལ་དང་ གློག་འཕྲིན་ཁ་བྱང་ཚུ་གིས་བཀངམ་ཨིན། ད་རུང་ ཁྱོད་ཀྱི་བཱ་ཌི་ཐོ་ཡིག་ཚུ་ནང་ལས་ ཨའི་ཨེམ་འབྲེལ་སའི་བརྡ་དོན་ཡང་བཀངམ་ཨིན།"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "བི་བི་ཌི་བི།"
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
-msgstr "ཀཱལ་ཌེབ།"
+msgstr "ཀཱལ་ཌི་ཨེ་ཝི།"
 
 #: ../plugins/caldav/caldav-source.c:269
 msgid "Use _SSL"
@@ -14818,7 +14461,7 @@ msgstr "རང་ཡུལ་གྱི་ཟླ་ཐོ་ཚུ་གི་ད
 
 #: ../plugins/calendar-http/calendar-http.c:339
 msgid "_Secure connection"
-msgstr "མཐུད་ལམ་མཐའ་བཙན་བཟོ། (_S)"
+msgstr "མཐུད་ལམ་མཐའ་བཙན་བཟོ་: (_S)"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
@@ -14882,12 +14525,12 @@ 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:2
+msgid "Copy _Email Address"
+msgstr "གློག་འཕྲིན་ཁ་བྱང་ཚུ་འདྲ་བཤུས་རྐྱབས།(_E)"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -14898,8 +14541,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ སྔོན་སྒྲིག་སྦྲག་སྣོད་དེ་ཨིན་ན་མེན་ ཞིབ་དཔྱད་འབད།"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+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
@@ -14917,18 +14559,15 @@ msgstr "ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་ད
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default folder"
-msgstr "སྔོན་སྒྲིག་སྣོད་འཛིན་སྦེ་རྟགས་བཀལ།(_d)"
+msgstr "སྔོན་སྒྲིག་སྣོད་འཛིན་སྦེ་ རྟགས་བཀལ།(_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
 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 ""
-"ཟླ་ཐོ་ཅིག་ ཡང་ན་ ཁ་བྱང་ཀི་དེབ་ཅིག་ སྔོན་སྒྲིག་ཅན་སྦེ་ རྟགས་བཀལ་ནིའི་དོན་ལུ་ ལས་འགན་བྱིནམ་ཨིན།"
+msgid "Provides functionallity for marking a calendar or addressbook as the default one."
+msgstr "ཟླ་ཐོ་ ཡང་ན་ ཁ་བྱང་ཀི་དེབ་ཚུ་ སྔོན་སྒྲིག་སྦེ་ རྟགས་བཀལ་ནིའི་དོན་ལུ་ ལས་འགན་ཚུ་བྱིནམ་ཨིན།"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -14953,24 +14592,16 @@ msgstr "ཆོག་ཡིག་ མཐའ་བཙན་བཟོ།"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"གདམ་ཁ་འདི་གིས་ མཐའ་བཙན་ཆོག་ཡིག་ (ཨེན་ཊི་ཨེལ་ཨེམ) གི་བདེན་བཤད་ ལག་ལེན་འཐབ་སྟེ་ ཨེགསི་ཅེནཇི་ སར་"
-"བར་ལུ་ མཐུད་འོང་།"
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgstr "གདམ་ཁ་འདི་གིས་ མཐའ་བཙན་ཆོག་ཡིག་ (ཨེན་ཊི་ཨེལ་ཨེམ) གི་བདེན་བཤད་ ལག་ལེན་འཐབ་སྟེ་ ཨེགསི་ཅེནཇི་ སར་བར་ལུ་ མཐུད་འོང་།"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "ཡིག་རྐྱང་གི་ ཆོག་ཡིག"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"གདམ་ཁ་འདི་གིས་ ཚད་ལྡན་ཡིག་རྐྱང་གི་ ཆོག་ཡིག་བདེན་བཤད་ ལག་ལེན་འཐབ་སྟེ་ ཨེགསི་ཅེནཇི་ སར་བར་ལུ་མཐུད་"
-"འོང་།"
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgstr "གདམ་ཁ་འདི་གིས་ ཚད་ལྡན་ཡིག་རྐྱང་གི་ ཆོག་ཡིག་བདེན་བཤད་ ལག་ལེན་འཐབ་སྟེ་ ཨེགསི་ཅེནཇི་ སར་བར་ལུ་མཐུད་འོང་།"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
@@ -14980,9 +14611,7 @@ msgstr "ཡིག་ཚང་གི་ཕྱི་ཁར།"
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
-msgstr ""
-"འོག་ལུ་གསལ་བཀོད་འབད་མི་ འཕྲིན་དོན་དེ་ རང་བཞིན་གྱིས་ ཁྱོད་ཡིག་ཚང་གི་ཕྱི་ཁར་ཨིན་པའི་སྐབས་ ཁྱོད་ལུ་ཡིག་"
-"འཕྲིན་གཏང་མི་ རེ་རེ་བཞིན་དུ་ལུ་གཏང་འོང་།"
+msgstr "འོག་ལུ་གསལ་བཀོད་འབད་མི་ འཕྲིན་དོན་དེ་ རང་བཞིན་གྱིས་ ཁྱོད་ཡིག་ཚང་གི་ཕྱི་ཁར་ཨིན་པའི་སྐབས་ ཁྱོད་ལུ་ཡིག་འཕྲིན་གཏང་མི་ རེ་རེ་བཞིན་དུ་ལུ་གཏང་འོང་།"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:276
 #: ../plugins/exchange-operations/exchange-account-setup.c:281
@@ -15011,7 +14640,7 @@ msgstr "ཨེགསི་ཅེནཇི་རྩིས་ཐོའི་དོ
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
-msgstr "འཐུས་མིའི་ལས་རོགས།"
+msgstr "ཚོགས་འཐུསའི་ལས་རོགས།"
 
 #. Miscelleneous settings
 #: ../plugins/exchange-operations/exchange-account-setup.c:349
@@ -15038,7 +14667,7 @@ msgstr "ཨོ་ཌབ་ལུ་ཨེ་ ཡུ་ཨར་ཨེལ་: (_O
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
-msgstr "བདེན་བཤད་འབད། (_u"
+msgstr "བདེན་བཤད་འབད། (_u)"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
@@ -15054,20 +14683,15 @@ msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་དེ་ ཨོཕ་ལ་ཡིན་ཐབས་ལམ་ནང་ཨིན། ད་ལྟོ་ཁྱོད་ཀྱིས་སྣོད་འཛིན་ཚུ་ གསར་བསྐྲུན་འབད་ནི་དང་ ལེགས་"
-"བཅོས་འབད་ནི་ཚུ་མི་བཏུབ།\n"
-" དེ་བཟུམ་མའི་བཀོལ་སྤྱོད་ཀྱི་དོན་ལུ་ ཨཱོན་ལ་ཡིན་ཐབས་ལམ་གུ་ སོར་བསྒྱུར་འབད།"
+"ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལའིན་ཐབས་ལམ་ནང་འདུག ཁྱོད་ཀྱིས་ད་ལྟོ་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད་ནི་ ཡང་ན་ ལེགས་བཅོས་འབད་ནི་ཚུ་མི་ཚུགས།\n"
+"དེ་བཟུམ་མའི་བཀོལ་སྤྱོད་ཀྱི་དོན་ལུ་ ཨོན་ལའིན་ཐབས་ལམ་ལུ་ སོར་བསྒྱུར་འབད་གནང་།"
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
 #: ../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 ""
-"ཁྱོད་ཀྱི་རྩིས་ཐོའི་དོན་ལུ་ ད་ལྟོའི་ཆོག་ཡིག་དང་ གནས་བཞིན་ཡོད་མི་ཆོག་ཡིག་གཉིས་ མཐུན་སྒྲིག་མིན་འདུག ཆོག་ཡིག་"
-"ངེས་བདེན་སྦེ་བཙུགས།"
+msgid "The current password does not match the existing password for your account. Please enter the correct password"
+msgstr "ཁྱོད་ཀྱི་རྩིས་ཐོའི་དོན་ལུ་ ད་ལྟོའི་ཆོག་ཡིག་དང་ གནས་བཞིན་ཡོད་མི་ཆོག་ཡིག་གཉིས་ མཐུན་སྒྲིག་མིན་འདུག ཆོག་ཡིག་ངེས་བདེན་སྦེ་བཙུགས།"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
@@ -15089,15 +14713,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:662
 #, c-format
 msgid "Your password will expire in the next %d days"
-msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ ད་ལས་ཕར་ཉིན་གྲངས་%dནང་ དུས་ཡོལ་ཐལ་འོང་།"
+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
 msgid "Custom"
 msgstr "སྲོལ་སྒྲིག"
 
@@ -15132,25 +14754,25 @@ msgstr "ཤུགས་ལྡན་སྣོད་ཐོ་ནང་ རང་�
 #: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "ཤུགས་ལྡན་སྣོད་ཐོ་ནང་ འཐུས་མི་%sའཚོལ་མ་ཐོབ།"
+msgstr "ཤུགས་ལྡན་སྣོད་ཐོ་ནང་ ཚོགས་འཐུས་%sའཚོལ་མ་ཐོབ།"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
-msgstr "འཐུས་མི་%s རྩ་བསྐྲད་བཏང་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་%s རྩ་བསྐྲད་བཏང་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
-msgstr "འཐུས་མིའི་ཐོ་ཡིག་དུས་མཐུན་བཟོ་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུསའི་ཐོ་ཡིག་དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
 msgid "Could not add delegate %s"
-msgstr "འཐུས་མི་%s ཁ་སྐོང་རྐྱབས་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་%s ཁ་སྐོང་རྐྱབས་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:963
 msgid "Error reading delegates list."
-msgstr "འཐུས་མིའི་ཐོ་ཡིག་ལྷག་ནི་ལུ་འཛོལ་བ།"
+msgstr "ཚོགས་འཐུསའི་ཐོ་ཡིག་ལྷག་ནི་ལུ་འཛོལ་བ།"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
@@ -15168,7 +14790,7 @@ msgstr "འབྲེལ་ས་ཚུ་:(_n)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
-msgstr "འཐུས་མི་ཚུ།"
+msgstr "ཚོགས་འཐུས་ཚུ།"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
@@ -15187,13 +14809,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 ""
-"ལག་ལེན་པ་དེ་ཚུ་གིས་ ཁྱོད་ཀྱིས་ཁོང་ལུ་བྱིན་མི་ གནང་བ་གི་ཐོག་ལས་ ཁྱོད་ཀྱི་ཚབ་ལུ་ཡིག་འཕྲིན་གཏང་ཚུགསཔ་མ་"
-"ཚད་\n"
+"ལག་ལེན་པ་དེ་ཚུ་གིས་ ཁྱོད་ཀྱིས་ཁོང་ལུ་བྱིན་མི་ གནང་བ་གི་ཐོག་ལས་ ཁྱོད་ཀྱི་ཚབ་ལུ་ཡིག་འཕྲིན་གཏང་ཚུགསཔ་མ་ཚད་\n"
 "ཁྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ལུ་ཡང་ འཛུལ་སྤྱོད་འབད་ཚུགས།"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
-msgstr "འཐུས་མི་གིས་ སྒེར་གྱི་རྣམ་གྲངས་ཚུ་མཐོང་ཚུགས།(_D)"
+msgstr "ཚོགས་འཐུས་གིས་ སྒེར་གྱི་རྣམ་གྲངས་ཚུ་མཐོང་ཚུགས།(_D)"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:17
@@ -15218,7 +14839,7 @@ msgstr "སྣོད་འཛིན་གྱི་མིང་།"
 msgid "Folder Size"
 msgstr "སྣོད་འཛིན་གྱི་ཚད།"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "ལག་ལེན་པ་གཞན་གྱི་སྣོད་འཛིན་ལུ་ མཁོ་མངགས་འབད།"
@@ -15233,25 +14854,25 @@ msgstr "ཨེགསི་ཅེནཇི་ སྣོད་འཛིན་ག�
 msgid "Unsubscribe Folder..."
 msgstr "སྣོད་འཛིན་ཚུ་ལུ་ མཁོ་མངགས་བཤོལ་..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "སྣོད་འཛིན་\"%s\"ནང་ལས་ ཐད་རི་འབའ་རི་ མངགས་བཤོལ་འབད་ནི་ཨིན་ན?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\"ནང་ལས་ མངགས་བཤོལ་འབད།"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
-msgstr "ཆོག་ཡིག་དུས་ཡོལ་གྱི་ཉེན་བརྡ་..."
+msgstr "ཆོག་ཡིག་དུས་ཡོལ་གྱི་ཉེན་བརྡ།"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ ཉིནམ་ ༧ གྱི་ནང་ དུས་ཡོལ་ཐལ་འོང་།"
+msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ ད་ལས་ཕར་ཉིནམ་ ༧ ནང་ དུས་ཡོལ་ཐལ་འོང་།"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
@@ -15273,59 +14894,59 @@ msgstr "ལག་ལེན་པ་ཁ་སྐོང་རྐྱབས།"
 msgid "Add User"
 msgstr "ལག་ལེན་པ་ཁ་སྐོང་རྐྱབས།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>གནང་བ་ཚུ།</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "བཏོན་གཏང་མི་ཚུགས།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "ཞུན་དག་བརྐྱབ་མི་ཚུགས།།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "རྣམ་གྲངས་ཚུ་ གསར་བསྐྲུན་འབད།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "སྣོད་འཛིན་ཡན་ལག་ཚུ་ གསར་བསྐྲུན་འབད།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "རྣམ་གྲངས་གང་རུང་བཏོན་གཏང་།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "རང་གི་རྣམ་གྲངས་ཚུ་བཏོན་གཏང་།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "རྣམ་གྲངས་གང་རུང་ཞུན་དག་རྐྱབས།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "རང་གི་རྣམ་གྲངས་ཚུ་ཞུན་དག་རྐྱབས།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "སྣོད་འཛིན་འབྲེལ་ས།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "སྣོད་འཛིན་བདག་པོ།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "སྣོད་འཛིན་མཐོང་ཚུགས་པས།"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "རྣམ་གྲངས་ཚུ་ལྷག"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "ལས་འགན་:"
 
@@ -15346,15 +14967,12 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "ལག་ལེན་པ་གཞན་གྱི་ཟླ་ཐོ་ལུ་ མཁོ་མངགས་འབད།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
-"and features."
-msgstr ""
-"ཨེགསི་ཅེནཇི་རྩིས་ཐོའི་ དམིགས་བསལ་བཀོལ་སྤྱོད་དང་ ཁྱད་རྣམ་ཚུ་གི་བསྡུ་གསོག་ ལེགས་སྐྱོང་འཐབ་མི་ པ་ལག་ཨིན་ཅིག"
+msgid "A plugin that handles a collection of Exchange account specific operations and features."
+msgstr "ཨེགསི་ཅེནཇི་རྩིས་ཐོའི་བཀོལ་སྤྱོད་དང་ཁྱད་རྣམ་ཚུ་གི་ བསྡུ་གསོག་ཅིག་ལེགས་འཐབ་ནིའི་དོན་ལུ་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
-msgstr "ཨེགསི་ཅེནཇི་གི་བཀོལ་སྤྱོད་ཚུ།"
+msgstr "ཨེགསི་ཅེནཇི་བཀོལ་སྤྱོད་ཚུ།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
@@ -15365,83 +14983,73 @@ msgid "Cannot display folders."
 msgstr "སྣོད་འཛིན་ཚུ་བཀྲམ་སྟོན་འབད་མི་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "བཀོལ་སྤྱོད་ལག་ལེན་འཐབ་མི་ཚུགས་པས།"
+msgid "Changes to Exchange account configuration will take place after you quit and restart Evolution."
+msgstr "ཨེགསི་ཅེནཇི་རྩིས་ཐོའི་རིམ་སྒྲིག་ལུ་ བསྒྱུར་བཅོས་འབད་མི་ཚུ་ ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་ སྤངས་ཞིནམ་ལས་ ལོག་འགོ་བཙུགས་པའི་ཤུལ་ལུ་ བསྒྱིར་བཅོས་འགྱོ་འོང་།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid ""
-"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."
 msgstr "སར་བར་ལུ་ བདེན་བཤད་འབད་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "ཆོག་ཡིག་སོར་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
-msgstr ""
-"མ་ཤེས་པའི་འཛོལ་བ་ཅིག་བྱུང་ཡོདཔ་ལས་ ཨེགསི་ཅེནཇི་རྩིས་ཐོ་ རིམ་སྒྲིག་འབད་མ་ཚུགས། ཡུ་ཨལ་ཨེལ་དང་ ལག་ལེན་"
-"པའི་མིང་ ཆོག་ཡིག་ཚུ་ ཞིབ་དཔྱད་འབད་ཞིནམ་ལས་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད།"
+msgstr "མ་ཤེས་པའི་འཛོལ་བ་ཅིག་བྱུང་ཡོདཔ་ལས་ ཨེགསི་ཅེནཇི་རྩིས་ཐོ་ རིམ་སྒྲིག་འབད་མ་ཚུགས། ཡུ་ཨལ་ཨེལ་དང་ ལག་ལེན་པའི་མིང་ ཆོག་ཡིག་ཚུ་ ཞིབ་དཔྱད་འབད་ཞིནམ་ལས་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
-msgstr "ཨེགསི་ཅེནཇི་སར་བར་ལུ་མཐུད་མ་ཚུགས།"
+msgstr "ཨེགསི་ཅེནཇི་སར་བར་ལུ་ མཐུད་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "སར་བར་{0}ལུ་ མཐུད་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
-msgstr "འཐུས་མི་ཚུ་གི་དོན་ལུ་ སྣོད་འཛིན་གནང་བ་ཚུ་ ཐག་བཅད་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་ཚུ་གི་དོན་ལུ་ སྣོད་འཛིན་གནང་བ་ཚུ་ ཐག་བཅད་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "ཨེགསི་ཅེནཇི་ཝེབ་བསག་མཛོད་རིམ་ལུགས་ འཚོལ་མ་ཐོབ།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "སར་བར་{0}ག་ཡོད་འཛོལ་མ་ཐོབ།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
-msgstr "{0}འཐུས་མི་ཅིག་སྦེ་བཟོ་མ་ཚུགས།"
+msgstr "{0}ཚོགས་འཐུས་ཅིག་སྦེ་བཟོ་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "སྣོད་འཛིན་གནང་བ་ཚུ་ལྷག་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "སྣོད་འཛིན་གནང་བ་ཚུ་ལྷག་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "ཡིག་ཚང་ཕྱི་ཁའི་གནས་ལུགས་ལྷག་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "སྣོད་འཛིན་གནང་བ་ཚུ་ དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "ཡིག་ཚང་ཕྱི་ཁའི་གནས་ལུགས་ དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "ཨེགསི་ཅེནཇི་རྩིས་ཐོ་ ཨོཕ་ལའིན་ཨིན་པས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15458,111 +15066,107 @@ msgid ""
 msgstr ""
 "ཨེགསི་ཅེནཇི་མཐུད་བྱེད་ཀྱིས་ ཨེགསི་ཅེནཇི་སར་བར་གུ་ལྕོགས་མིན་ནམ་\n"
 "འགགས་ཏེ་ཡོད་དོ་བཟུམ་སྦེ་མཐོང་མི་ལས་འགན་ལ་ལོ་ཅིག་ལུ་\n"
-"འཛུལ་སྤྱོད་འབད་དགོཔ་འདུག (སྤྱིར་བཏང་གིས་འདི་དོན་ཅན་སྦེ་\n"
-"འབད་འབདཝ་མེན)ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་ཨེགསི་ཅེནཇི་མཐུད་བྱེད་\n"
-"ལག་ལེན་འཐབ་ཚུགས་ནིའི་དོན་ལུ་ ཁྱོད་རའི་ཨེགསི་ཅེནཇི་བདག་སྐྱོང་པ་གིས་\n"
+"འཛུལ་སྤྱོད་འབད་དགོཔ་འདུག (འདི་སྤྱིར་བཏང་གིས་འདི་དོན་ཅན་སྦེ་\n"
+"འབད་འབདཝ་མེན)ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་མཐུད་བྱེད་\n"
+"ལག་ལེན་འཐབ་ཚུགས་ནིའི་དོན་ལུ་ ཁྱོད་རའི་ཨེགསི་བདག་སྐྱོང་པ་གིས་\n"
 "ལས་འགན་འདི་ལྕོགས་ཅན་བཟོ་དགོཔ་འོང་།\n"
 "\n"
 "ཁྱོད་རའི་ཨེགསི་ཅེནཇི་བདག་སྐྱོང་པ་ལུ་ བརྡ་དོན་བྱིན་ནིའི་དོན་ལུ་\n"
 "འོག་གི་འབྲེལ་ལམ་དང་འཁྲིལ་གནང་:\n"
 "\n"
-"{0}\n"
-"  "
+"{༠}\n"
+"    "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
-msgstr "འཐུས་མི་ཚུ་ དུས་མཐུན་བཟོ་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་ཚུ་ དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "སྣོད་འཛིན་ཧེ་མ་ལས་རང་འདུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "སྣོད་འཛིན་མིན་འདུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "སྣོད་འཛིན་ཨོཕ་ལ་ཡིན།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "ཇེ་ནི་རིཀ་གི་འཛོལ་བ།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-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:38
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
+msgstr "ཨོ་ཌབ་ལུ་ཨེ་དེ་ འགྲུལ་ལམ་སོ་སོ་ཅིག་གུ་ གཡོག་བཀོལ་བའི་བསྒང་ཨིན་པ་ཅིན་ ཁྱོད་ཀྱིས་རྩིས་ཐོ་རིམ་སྒྲིག་ཌའི་ལོག་ནང་ གསལ་བཀོད་འབད་དགོ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0}གི་དོན་ལུ་ཡིག་སྒྲོམ་ སར་བར་འདི་གུ་མིན་འདུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "ཡུ་ཨར་ཨེལ་ངེས་བདེན་བཟོ་སྟེ་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད་གནང་།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "སར་བར་མིང་གི་སྡེབ་ ངེས་བདེན་བཟོ་ཞིནམ་ལས་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད་གནང་།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr "ལག་ལེན་པའི་མིང་དང་ ཆོག་ཡིག་ཚུ་ ངེས་བདེན་བཟོ་ཞིནམ་ལས་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད་གནང་།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "རྩིས་ཐོ་འདི་གི་དོན་ལུ་ སྤྱི་ཁྱབ་ཐོ་གཞུང་སར་བར་ རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "ལག་ལེན་པ་ {0} གི་དོན་ལུ་ ཡིག་སྒྲོམ་མིན་འདུག {1}གུ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "{0}བཟུམ་སྦེ་མི་ ལག་ལེན་པ་མིན་འདུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "ཆོག་ཡིག་མཐར་འཁྱོལ་སྦེ་སོར་ནུག།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "བསྒྱུར་བཅོས་ཚུ་ལུ་ ནུས་པ་འཐོབ་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ལོག་འགོ་བཙུགས་གནང་།"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་བཙུགས་གནང་།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "ལག་ལེན་པ་ཅིག་ སེལ་འཐུ་འབད་གནང་།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "ཆོག་ཡིག་དེ་ལུ་ནུས་པ་ཆུང་དྲགསཔ་ལས་ སར་བར་གྱིས་ཁས་ལེན་འབད་མ་བཏུབ།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་སྤངམ་དང་ ཨེགསི་ཅེནཇི་རྩིས་ཐོ་དེ་ ལྕོགས་མིན་འགྱོ་འོང་།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་སྤངམ་དང་ ཨེགསི་ཅེནཇི་རྩིས་ཐོ་དེ་ རྩ་བསྐྲད་འགྱོ་འོང་།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "ཨེགསི་ཅེནཇི་སར་བར་དེ་ ཨེགསི་ཅེནཇི་མཐུད་བྱེད་དང་གཅིག་ཁར་ མཐུན་འགྱུར་མིན་འདུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
-"སར་བར་གྱིས་ ཨེགསི་ཅེནཇི་ ༥.༥ གཡོག་བཀོལ་དོ། ཨེགསི་ཅེནཇི་མཐུད་བྱེད་ཀྱིས་ \n"
-" མའི་ཀོརོ་སོཕཊི་ཨེགསི་ཅེནཇི་ ༢༠༠༠ དང་ ༢༠༠༣ རྐྱངམ་གཅིག་ལུ་ རྒྱབ་སྐྱོར་ཡོད།"
+"སར་བར་གྱིས་ ཨེགསི་ཅེནཇི་ ༥.༥ གཡོག་བཀོད་དོ། ཨེགསི་ཅེནཇི་མཐུད་བྱེད་ཀྱིས་ \n"
+" ཤའི་ཀོརོ་སོཕཊི་ཨེགསི་ཅེནཇི་ ༢༠༠༠ དང་ ༢༠༠༣ རྐྱངམ་གཅིག་ལུ་ རྒྱབ་སྐྱོར་ཡོད།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15576,87 +15180,75 @@ msgstr ""
 "\n"
 "ཡང་ན་ ཁྱོད་ཀྱིས་ཁྱོད་རའི་ཆོག་ཡིག་ ཕྱི་འགྱུར་སྦེ་ ཡིག་དཔར་བརྐྱབས་གདའཔ་འོང་།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "ལོག་སྟེ་རང་ ཆོག་ཡིག་སོ་སོ་ཅིག་གི་ཐོག་ལས་ འབད་རྩོལ་བསྐྱེད།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "ཚད་འཛིན་ཐོ་ཡིག་ལུ་ འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ ལག་ལེན་པ་ཁ་སྐོང་བརྐྱབ་མི་ཚུགས་པས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
-msgstr "འཐུས་མི་ཚུ་ ཞུན་དག་བརྐྱབ་མི་ཚུགས་པས།"
+msgstr "ཚོགས་འཐུས་ཚུ་ ཞུན་དག་བརྐྱབ་མི་ཚུགས་པས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "མ་ཤེས་པའི་འཛོལ་བ་ {0} ལུ་བལྟ་དོ།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "མ་ཤེས་པའི་འཛོལ་བ།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "མ་ཤེས་པའི་དབྱེ་བ།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "རྒྱབ་སྐྱོར་མེད་པའི་བཀོལ་སྤྱོད།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr "སར་བར་འདི་གུ་ ཡིག་འཕྲིན་གསོག་འཇོག་འབད་ནི་ལུ་ ཁྱོད་རའི་ཐོབ་སྐལ་ཡོད་མི་དེ་རྫོགས་རན་དོ།"
+msgstr "ཁྱོད་ཀྱིས་སར་བར་འདི་གུ་ ཡིག་འཕྲིན་གསོག་འཇོག་འབད་ནི་ལུ་ ཁྱོད་རའི་ཐོབ་སྐལ་ རྫོགས་རན་དོ།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
-msgstr "ཁྱོད་ཀྱིས་ཁྱོད་རང་ ཁྱོད་རའི་འཐུས་མི་སྦེ་ བཟོ་མི་ཚུགས།"
+msgstr "ཁྱོད་ཀྱིས་ཁྱོད་རང་ ཁྱོད་རའི་ཚོགས་འཐུས་སྦེ་ བཟོ་མི་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "ཁྱོད་ཀྱིས་སར་བར་འདི་གུ་ ཡིག་འཕྲིན་གསོག་འཇོག་འབད་ནི་ལུ་ ཁྱོད་རའི་ཐོབ་སྐལ་ལས་ ལྷག་སོང་ནུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "ཁྱོད་ཀྱིས་ཨེགསི་ཅེནཇི་རྩིས་ཐོ་ ཕུད་རྡོག་གཅིག་རྐྱངམ་རིམ་སྒྲིག་འབད།"
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
+msgstr "ད་ལྟོ་ཁྱོད་ཀྱི་བེད་སྤྱོད་དེ་: ཀེ་བི་{༠}ཨིན་པས། ཡིག་འཕྲིན་ལ་ལོ་ཅིག་ བཏོན་གཏང་ཞིནམ་ལས་ བར་སྟོང་དུམ་གྲ་ཅིག་བཏོན་ཐབས་འབད།"
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid ""
-"Your current usage is: {0} KB. Try to 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 "ཁྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{༠}ཨིན་པས། ད་ཁྱོད་ཀྱིས་ ཡིག་འཕྲིན་གཏང་ནི་དང་ ལེན་ནི་ཚུ་ འབད་མི་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-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. You will not be able to send mail until you clear up some space by deleting some mail."
+msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{༠}ཨིན་པས། ཁྱོད་ཀྱིས་ཡིག་འཕྲིན་ལ་ལོ་ཅིག་བཏོན་གཏང་སྟེ་ བར་སྟོང་དུམ་གྲ་ཅིག་མ་བཏོན་ཚུན་ཚོད་ ཡིག་འཕྲིན་གཏང་མི་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"Your 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:76
 msgid "Your password has expired."
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ དུས་ཡོལ་ཐལ་སོང་ནུག"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0}འཛུལ་སྤྱོད་ཚད་འཛིན་ཐོ་ཡིག་ལུ་ ཁ་སྐོང་བརྐྱབ་མི་ཚུགས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
-msgstr "{0}ཧེ་མ་ལས་རང་འཐུས་མི་ཅིག་ཨིན་ཕས།"
+msgstr "{0}ཧེ་མ་ལས་རང་ཚོགས་འཐུས་ཅིག་ཨིན་ཕས།"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0}ཧེ་མ་ལས་རང་ ཐོ་ཡིག་ནང་འདུག"
 
@@ -15731,8 +15323,9 @@ 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
+#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-task-editor.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "གདམ་ཁ་ཚུ་གཏང་།"
 
@@ -15750,7 +15343,7 @@ msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད།"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
-msgstr "<b>ལག་ལེན་པ་ཚུ་ :</b>"
+msgstr "<b>ལག་ལེན་པ་ཚུ་:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
@@ -15850,16 +15443,13 @@ msgstr "པོརོག་སི་ང་བསྐྱོད།"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%sགི་དོན་ལས་ ཆོག་ཡིག་བཙུགས། (ལག་ལེན་པ་%s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
-msgstr "པོ་རོ་སི་ ནང་བསྐྱོད་...(_P)"
+msgstr "པོ་རོག་སི་ནང་བསྐྱོད་...(_P)"
 
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "པོརོ་སི་ཨེབ་ལྡེ་དེ་ རྩིས་ཐོ་དེ་ ལྕོགས་ཅན་ཨིན་པ་ཅིན་རྐྱངམ་གཅིག་འཐོབ་ཚུགས།"
+msgstr "པོརོག་སི་མཆོང་ལྡེ་དེ་ རྩིས་ཐོ་ལྕོགས་ཅན་ཨིན་པ་ཅིན་རྐྱངམ་གཅིག་ འཐོབ་ཚུགས།"
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
@@ -15887,7 +15477,7 @@ msgstr "འཕྲིན་དོན་གནས་ཚད་རྗེས་འཚ
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
-msgstr "ཧུ་ལ་ཟླ་ཐོའི་འབྱུང་ཁུངས་ཚུ་ གཞི་སྒྲིག་འབད་ནིའི་ པ་ལག་ཨིན་ཅིག"
+msgstr "ཧུ་ལ་ཟླ་ངོའི་འབྱུང་ཁུངས་ གཞི་བཙུགས་འབད་ནིའི་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
@@ -15895,15 +15485,15 @@ msgstr "ཧུ་ལ་རྩིས་ཐོའི་གཞི་སྒྲིག
 
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
-msgstr "ཟླ་བའི་ཟླ་ཐོ་ནང་འདྲེན་འབད།(_I)"
+msgstr "ཟླ་ཐོ་ནང་འདྲེན་འབད།(_I)"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:88
 msgid "_Import to Tasks"
-msgstr "ལས་ཀ་ལུ་ནང་འདྲེད་འབད།(_I)"
+msgstr "ལས་ཀ་ནང་འདྲེན་འབད།(_I)"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:198
 msgid "Import ICS"
-msgstr "ཨའི་ཨེསི་སི་ ནང་འདྲེནའབད།"
+msgstr "ཨའི་སི་ཨེསི་ནང་འདྲེནའབད།"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:226
 msgid "Select Task List"
@@ -15914,18 +15504,18 @@ msgid "Select Calendar"
 msgstr "ཟླ་ཐོ་སེལ་འཐུ་འབད།"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "ནང་འདྲེན། (_I)"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "ཨའི་ཟླ་ཐོའི་རྩ་སྒྲིག(.ཨའི་ཨི་ཨེསི)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
 msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་/ཟླ་ཐོ་/ཁ་བྱང་ཀི་དེབ་ཚུ་ ཨེ་པཱལ་ཨའི་པོཌི་དང་གཅིག་ཁར་མཉམ་འབྱུང་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་/ཟླ་ངོ་ཚུ/ཁ་བྱང་ཀི་དེབ་དེ་ ཨེ་པཱལ་ཨའི་པོཌི་གི་ཐོག་ལས་ མཉམ་འབྱུང་འབད།"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -15933,27 +15523,24 @@ msgstr "ཨའི་པོཌི་ལུ་ མཉམ་འབྱུང་འ�
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
-msgstr "ཨའི་པོཌི་མཉམ་འབྱུང་།"
+msgstr "ཨའི་པོཌི་གི་མཉམ་འབྱུང་།"
 
 #: ../plugins/ipod-sync/sync.c:158
 msgid "No output directory!"
-msgstr "ཨའུཊི་པུཊི་སྣོད་ཐོ་མིན་འདུག!"
+msgstr "ཨའུཊི་པུཊི་སྣོད་ཐོ་མིན་འདུག།"
 
 #: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"ཨའི་པོཌི་གུ་ ཨའུཊི་པུཊི་གི་སྣོད་ཐོ་དེ་འཚོལ་མ་ཐོབ། ཨའི་པོཌི་ཚུལ་མཐུན་སྦེ་ གཞི་སྒྲིག་འབད་ཞིནམ་ལས་ ལོག་སྟེ་"
-"འབད་རྩོལ་བསྐྱེད་གནང་།"
+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
+#: ../plugins/ipod-sync/sync.c:174
+#: ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
-msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་མ་ཚུགས!"
+msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་མ་ཚུགས།"
 
 #: ../plugins/ipod-sync/sync.c:203
 msgid "Exporting data failed."
-msgstr "གནད་སྡུད་ནང་འདྲེན་འབད་ནི་ལུ་འཐུས་ཤོར།"
+msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་མ་བཏུབ།"
 
 #: ../plugins/ipod-sync/sync.c:231
 msgid "Could not open addressbook!"
@@ -15961,7 +15548,7 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ཁ་ཕྱེ་མ་ཚུག
 
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
-msgstr "ཨི་བོ་ལུ་ཤཱན་ཁ་བྱང་ཀི་དེབ་དེ་ གནད་སྡུད་ཕྱིར་འདྲེན་འབད་ནི་ལུ་ ཁ་ཕྱེ་མ་ཚུགས།"
+msgstr "ཕྱིར་འདྲེན་འབད་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ ཁ་བྱང་ཀི་དེབ་དེ་ ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ../plugins/ipod-sync/sync.c:291
 msgid "Could not open calendar/todo!"
@@ -15969,155 +15556,148 @@ msgstr "ཟླ་ཐོ་/ཊུ་ཌུ་ཁ་ཕྱེ་མི་ཚུ�
 
 #: ../plugins/ipod-sync/sync.c:292
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་ནི་ལུ་ ཨི་བོ་ལུ་ཤཱན་ ཟླ་ཐོ་/ཊུ་ཌུ་ཐོ་ཡིག་ ཁ་ཕྱེ་མ་ཚུགས།"
+msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་གྱི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ཟླ་ཐོ་/ཊུ་ཌུ་ཐོ་ཡིག་ ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "ཟླ་ཐོ་'%s'དེ་ མངོན་གསལ་འབད་མ་ཚུགས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "ཟླ་ཐོ་'%s' ནང་གི་ངོ་ཕྲད་ཅིག་ འཛོམས་འདུ་འདི་དང་མི་མཐུན་པས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "ངོ་ཕྲད་དེ་ ཟླ་ཐོ་'%s'ནང་ཐོབ་ཅི།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "ཟླ་གཅིག་ཡང་འཐོབ་མ་ཚུགས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "འཛོམས་འདུ་འདི་ ཟླ་ཐོ་ག་ཅི་ནང་ཡང་ འཚོལ་མ་ཐོབ།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "ལས་ཀ་འདི་ ལས་ཀའི་ཐོ་ཡིག་ ག་ཅི་ནང་ཡང་ འཚོལ་མ་ཐོབ།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "གསར་དེབ་གི་ཐོ་བཀོད་དེ་ གསར་དེབ་ག་ཅི་ནང་ཡང་ འཚོལ་མ་ཐོབ།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "ངོ་འཕྲད་འདི་གི་ གནས་བཞིན་པའི་ཐོན་རིམ་ཅིག་གི་དོན་ལུ་ འཚོལ་ཞིབ་འབད་དོ།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "རྣམ་གྲངས་ མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ཟླ་ཐོ་'%s'.  %sལུ་ རྣམ་གྲངས་བཏང་མ་ཚུགས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ཟླ་ཐོ་'%s' ལུ་ དང་ལེན་འབད་ཡོདཔ་སྦེ་བཏང་ཡོད།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ཟླ་ཐོ་'%s' ལུ་ ངེས་མེད་སྦེ་ བཏང་ཡོད།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ཟླ་ཐོ་'%s' ལུ་ ངོས་ལེན་མེདཔ་སྦེ་བཏང་ཡོད།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
-msgstr "ཟླ་ཐོ་'%s' ལུ་ ཆ་མེད་བཏང་ཚརཝ་སྦེ་བཏང་ཡོད།"
+msgstr "ཟླ་ཐོ་'%s' ལུ་ ཆ་མེད་སྦེ་བཏང་ཡོད།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr "འགོ་འདྲེན་པ་གིས་ འཐུས་མི་%sརྩ་བསྐྲད་བཏང་ནུག"
+msgstr "འགོ་འདྲེན་པ་གིས་ ཚོགས་འཐུས་%sརྩ་བསྐྲད་བཏང་ནུག"
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
-msgstr "འཐུས་མི་དེ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་ཅིག་བཏང་ཡོད།"
+msgstr "ཚོགས་འཐུས་དེ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་ཅིག་བཏང་ཡོད་།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "འཐུས་མི་དེ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་གཏང་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་དེ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་གཏང་མ་ཚུགས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "གནས་ཚད་དེ་ ནུས་མེད་ཨིནམ་ལས་ ངོ་འཛོམས་པ་ དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ངོ་འཛོམས་པ་%s དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མཐུན་བཟོ་ཡོད།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "མཉམ་སྦྲགས་འབད་མི་ ཟླ་ཐོ་དེ་ ནུས་ཅན་མེན་པས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr "འཕྲིན་དོན་ནང་ལུ་ ཟླ་ཐོ་ཅིག་ཡོདཔ་སྦེ་ བཤདཔ་ཨིན་རུང་ ཟླ་ཐོ་དེ་ ནུས་ཅན་གྱི་ཨའི་ཟླ་ཐོ་ཅིག་མེན་པས།"
+#: ../plugins/itip-formatter/itip-formatter.c:1153
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgstr "འཕྲིན་དོན་ནང་ལུ་ ཟླ་ཐོ་ཅིག་ཡོདཔ་སྦེ་ བཤདཔ་ཨིན་རུང་ ཟླ་ཐོ་དེ་ ནུས་ཅན་གྱི་ཨའི་ཟླ་ཐོ་མེན་པས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "ཟླ་ཐོ་ནང་གི་ རྣམ་གྲངས་དེ་ ནུས་ཅན་མེན་པས།"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
-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:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr "འཕྲིད་དོན་ནང་ལུ་ ཟླ་ཐོ་ཅིག་འདུག་ དེ་འབདཝ་ད་ ཟླ་ཐོ་དེ་ནང་ བྱུང་ལས་དང་ ལས་ཀ་ ཡང་ཅིན་ དལཝ་/ཁོམ་མེད་ཀྱི་ བརྡ་དོན་མིན་འདུག"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "མཉམ་སྦྲགས་ཀྱི་ ཟླ་ཐོ་དེ་ནང་ སྣ་མང་རྣམ་གྲངས་འདུག"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"རྣམ་གྲངས་འདི་ཚུ་ ལས་སྦྱོར་འབད་ནིའི་དོན་ལུ་ ཡིག་སྣོད་དེ་ སྲུང་བཞག་འབད་དེ་ ཟླ་ཐོ་དེ་ ནང་འདྲེན་འབད་དགོ"
+#: ../plugins/itip-formatter/itip-formatter.c:1214
+msgid "To process all of these items, the file should be saved and the calendar imported"
+msgstr "རྣམ་གྲངས་འདི་ཚུ་ ལས་སྦྱོར་འབད་ནིའི་དོན་ལུ་ ཡིག་སྣོད་དེ་ སྲུང་བཞག་འབད་དེ་ ཟླ་ཐོ་དེ་ ནང་འདྲེན་འབད་དགོ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "བྱ་བ་བྱས་ཤུལ་ འཕྲིན་དོན་བཏོན་གཏང་།(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "མི་མཐུན་པའི་འཚོལ་ཞིབ།"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "འཛོམས་འདུ་མི་མཐུན་པའི་དོན་ལས་ འཚོལ་ཞིབ་འབད་ནི་ལུ་ ཟླ་ཐོ་ཚུ་ སེལ་འཐུ་འབད།"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:184
+#: ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:241
+#: ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "ད་རིས།"
 
@@ -16276,8 +15856,7 @@ msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུ�
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr ""
-"<b>%s</b> གིས་%sབརྒྱུད་དེ་ ཁྱོད་ འོག་གི་འཛོམས་འདུ་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབདཝ་མས།"
+msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ ཁྱོད་ འོག་གི་འཛོམས་འདུ་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབདཝ་མས།"
 
 #: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
@@ -16296,10 +15875,8 @@ msgstr "<b>%s</b> གིས་ ད་ལྟོའི་འཛོམས་འད�
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུའི་དོན་ལས་ མཐའ་མཇུག་གི་ བརྡ་དོན་ལེན་ནིའི་ རེ་འདོད་བསྐྱེདཔ་མས།"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུའི་དོན་ལས་ མཐའ་མཇུག་གི་ བརྡ་དོན་ལེན་ནིའི་ རེ་འདོད་བསྐྱེདཔ་མས།"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
@@ -16309,7 +15886,7 @@ msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུ�
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> གིས་%sབརྒྱུད་ཐོག་ འོག་གི་འཛོམས་འདུ་ ཆ་མེད་བཏང་ནུག"
+msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་འཛོམས་འདུ་ ཆ་མེད་བཏང་ནུག:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
@@ -16368,12 +15945,8 @@ msgstr "<b>%s</b> གིས་ ད་ལྟོའི་ལས་ཀ་ཅིག�
 
 #: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> གིས་ འོག་གི་འགན་སྤྲོད་འབད་མི་ ལས་ཀའི་དོན་ལུ་ མཐའ་མཇུག་གི་བརྡ་དོན་ ལེན་ནིའི་རེ་འདོད་"
-"བསྐྱེདཔ་མས།"
+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:438
 #, c-format
@@ -16383,12 +15956,12 @@ msgstr "<b>%s</b> གིས་ འོག་གི་འགན་སྤྲོད�
 #: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> གིས་%sབརྒྱུད་ཐོག་ འོག་ལུ་འགན་སྤྲོད་འབད་མི་ལས་ཀ་དེ་ ཆ་མེད་བཏང་ནུག"
+msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་འགན་སྤྲོད་ལས་ཀ་དེ་ ཆ་མེད་བཏང་ནུག:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> གིས་ འོག་ལུ་འགན་སྤྲོད་འབད་མི་ལས་ཀ་དེ་ ཆ་མེད་བཏང་ནུག"
+msgstr "<b>%s</b> གིས་ འོག་གི་འགན་སྤྲོད་ལས་ཀ་དེ་ ཆ་མེད་བཏང་ནུག:"
 
 #: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
@@ -16460,28 +16033,28 @@ msgid "_Update"
 msgstr "དུས་མཐུན་བཟོ།(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "འགོ་བཙུགས་དུས་ཚོད་:།"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "མཇུག་བསྡུ་བའི་དུས་ཚོད་:།"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "བསམ་བཀོད།"
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "ངོ་འཛོམས་པ་ཚུ་ལུ་ དུས་མཐུན་གཏང་།(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
-msgstr "དུས་སྐབས་ཆ་མཉམ་ལུ་འཇུག་སྤྱོད་འབད།(_p)"
+msgstr "དུས་སྐབས་ཆ་མཉམ་ལུ་་འཇུག་སྤྱོད་འབད།(_p)"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
@@ -16492,22 +16065,16 @@ msgid "Itip Formatter"
 msgstr "ཨའི་ཊིཔ་ རྩ་སྒྲིག་པ།།"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot གིས་ འཛོམས་འདུ་དེ་ བགོ་སྤེལ་འབད་ནུག ཁྱོད་ཀྱིས་བགོ་སྤེལ་&quot;{1}&quot; ལུ་ཁ་"
-"སྐོང་བརྐྱབ་ནི་ཨིན་ན?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
+msgstr "&quot;{0}&quot གིས་ འཛོམས་འདུ་དེ་ བགོ་སྤེལ་འབད་ནུག ཁྱོད་ཀྱིས་བགོ་སྤེལ་&quot;{1}&quot;ལུ་ ཁ་སྐོང་བརྐྱབ་ནི་ཨིན་ན?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 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 ""
-"ངོས་ལན་འདི་ ད་ལྟོའི་ངོ་འཛོམས་པ་ཅིག་ལས་མེན་པས། གཏང་མི་དེ་ ངོ་འཛོམས་པ་བཟུམ་ཅིག་སྦེ་ ཁ་སྐོང་རྐྱབས།"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "ངོས་ལན་འདི་ ད་ལྟོའི་ངོ་འཛོམས་པ་ཅིག་ལས་མེན་པས། གཏང་མི་དེ་ ངོ་འཛོམས་པ་བཟུམ་ཅིག་སྦེ་ ཁ་སྐོང་རྐྱབས།"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
@@ -16540,22 +16107,16 @@ msgid "No store available"
 msgstr "མཛོད་ཁང་འཐོབ་མི་ཚུགས་པས།"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr ""
-"ཐག་རིང་ལས་ ཡིག་འཕྲིན་གནད་སྡུད་ལུ་ འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ ཀོར་བའི་ངོས་འདྲ་བ་ཅིག་ བསྟར་སྤྱོད་འབད་"
-"མི་ པ་ལག་ཨིན་ཅིག"
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr "ཐག་རིང་ལས་ ཡིག་འཕྲིན་གནད་སྡུད་ལུ་ འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ ཀོར་བའི་ངོས་འདྲ་བ་ཅིག་ བསྟར་སྤྱོད་འབད་མི་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
 msgid "Mail Remote"
 msgstr "ཐག་རིང་ཡིག་འཕྲིན།"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr ""
-"ཡིག་འཕྲིན་གྱི་འཕྲིན་དོན་ཅིག་གི་ ནང་དོན་ཚུ་ནང་ལས་ འཛོམས་འདུ་ཚུ་གསར་བསྐྲུན་འབད་བཅུག་མི་ པ་ལག་ཨིན་ཅིག"
+msgid "A plugin which allows the creation of meetings from the contents of a mail message."
+msgstr "ཡིག་འཕྲིན་གྱི་འཕྲིན་དོན་ཅིག་གི་ ནང་དོན་ཚུ་ནང་ལས་ འཛོམས་འདུ་ཚུ་གསར་བསྐྲུན་འབད་བཅུག་མི་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -16566,11 +16127,8 @@ msgid "Mail to meeting"
 msgstr "འདི་འཛོམས་འདུ་ལུ་ ཡིག་འཕྲིན་གཏང་།"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr ""
-"ཡིག་འཕྲིན་གྱི་འཕྲིན་དོན་ཅིག་གི་ ནང་དོན་ཚུ་ནང་ལས་ ལས་ཀ་གསར་བསྐྲུན་འབད་བཅུག་མི་ པ་ལག་ཨིན་ཅིག"
+msgid "A plugin which allows the creation of tasks from the contents of a mail message."
+msgstr "ཡིག་འཕྲིན་གྱི་འཕྲིན་དོན་ཅིག་གི་ ནང་དོན་ཚུ་ནང་ལས་ ལས་ཀ་གསར་བསྐྲུན་འབད་བཅུག་མི་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -16586,14 +16144,17 @@ msgid "Convert the selected message to a new task"
 msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་དེ་ ལས་ཀ་གསརཔ་ཅིག་ལུ་ གཞི་བསྒྱུར་འབད།"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "འབྲེལ་སའི་ཐོ་ཡིག་བདག་པོ།(_o)"
 
 #: ../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 "ཐོ་ཡིག་གི་ཡིག་མཛོད་ལེན།(_a)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "ཐོ་ཡིག་ལག་ལེན་གྱི་་བརྡ་དོན་ལེན།(_u)"
 
@@ -16607,21 +16168,21 @@ 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
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་ལུ་ གནས་བསྐྱོད་འབད།(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "ཐོ་ཡིག་ལུ་ མཁོ་མངགས་འབད། (_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "ཐོ་ཡོག་ལུ་ མཁོ་མངགས་བཤོལ། (_U)"
 
@@ -16631,14 +16192,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 ""
-"གློག་འཕྲིན་གྱི་ འཕྲིན་དོན་ཅིག་ ཡུ་ཨར་ཨེལ་\"{0}\" ལུ་ གཏང་འོང་། ཁྱོད་ཀྱིས་ འཕྲིན་དོན་དེ་ རང་བཞིན་གྱིས་ "
-"གཏང་རུང་བཏུབ་ ཡང་ཅིན་ དང་པ་རང་ བལྟ་ཞིནམ་ལས་ བསྒྱུར་བཅོས་འབད་རུང་བཏུབ།\n"
+"གློག་འཕྲིན་གྱི་ འཕྲིན་དོན་ཅིག་ ཡུ་ཨར་ཨེལ་\"{0}\" ལུ་ གཏང་འོང་། ཁྱོད་ཀྱིས་ འཕྲིན་དོན་དེ་ རང་བཞིན་གྱིས་ གཏང་རུང་བཏུབ་ ཡང་ཅིན་ དང་པ་རང་ བལྟ་ཞིནམ་ལས་ བསྒྱུར་བཅོས་འབད་རུང་བཏུབ།\n"
 "\n"
 "འཕྲིན་དོན་དེ་བཏང་སྟེ་ དུས་ཡུན་དུམ་གྲ་ཅིག་ལས་ ཡིག་གཏོང་ཐོ་ཡིག་ནང་ལས་ ཁྱོད་ལུ་ལན་གསལ་ཅིག་འཐོབ་དགོ"
 
@@ -16655,12 +16213,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?"
@@ -16668,13 +16222,11 @@ 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"
+"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"བྱ་བ་འདི་ ལག་ལེན་འཐབ་མ་ཚུགས། འདི་གི་རྒྱུ་མཚན་འདི་ བྱ་བ་འདི་གི་ མགོ་ཡིག་དེ་ནང་ ང་བཅས་ཀྱི་ ལེགས་"
-"སྐྱོང་འཐབ་ཚུགས་པའི་ བྱ་བ་ག་ནི་ཡང་ མེདཔ་འོང་ནི་མས།\n"
+"བྱ་བ་འདི་ ལག་ལེན་འཐབ་མ་ཚུགས། འདི་གི་རྒྱུ་མཚན་འདི་ བྱ་བ་འདི་གི་ མགོ་ཡིག་དེ་ནང་ ང་བཅས་ཀྱི་ ལེགས་སྐྱོང་འཐབ་ཚུགས་པའི་ བྱ་བ་ག་ནི་ཡང་ མེདཔ་འོང་ནི་མས།\n"
 "\n"
 "མགོ་ཡིག: {0}"
 
@@ -16686,9 +16238,7 @@ msgid ""
 msgstr "འཕྲིད་དོན་འདི་གི་ མགོ་ཡིག་{0} དེ་ བཟོ་རྣམ་གྱུར་ཡོདཔ་ལས་ ལས་སྦྱོར་འབད་མ་ཚུགས།"
 
 #: ../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
@@ -16699,27 +16249,15 @@ msgstr "འཕྲིན་དོན་ཞུན་དག་རྐྱབས། (_
 msgid "_Send message"
 msgstr "འཕྲིན་དོན་གཏང་། (_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "ཐོ་ཡིག་བདག་པོ་ལུ་འབྲེལ་བ་འཐབ།(_O)"
-
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "འཕྲིན་དོན་འདི་བང་མི་ ཡིག་གཏོང་ཐོ་ཡིག་གི་ བདག་པོ་ལུ་འབྲེལ་བ་འཐབ།"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "ཐོ་ཡིག་གི་ཡིག་མཛོད་ལེན།(_A)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "ཐོ་ཡིག་ལག་ལེན་གྱི་་བརྡ་དོན་ལེན།(_U)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "འཕྲིན་དོན་འདི་བང་མི་ ཐོ་ཡིག་གི་ཡིག་མཛོད་ཅིག་ལེན།"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "འཕྲིན་དོན་འདི་བང་མི་ བེད་སྤྱོད་ཐོ་ཡིག་གི་སྐོར་ལས་ བརྡ་དོན་ལེན།"
 
@@ -16735,29 +16273,17 @@ msgstr "འཕྲིན་དོན་འདི་བང་མི་ ཡིག�
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "འཕྲིན་དོན་འདི་བང་མི་ ཡིག་གཏོང་ཐོ་ཡིག་ལུ་ མངགས་བཤོལ་འབད།"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "འཕྲིན་དོན་ཐོ་ཡིག་ལུ་ གནས་བསྐྱོད་འབད།(_P)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "ཐོ་ཡིག་ལུ་ མཁོ་མངགས་འབད། (_S)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "ཐོ་ཡིག་ནང་ལས་ མངགས་བཤོལ་འབད།(_U)"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
-msgstr "ལྷག་ཡོད་མི་ཆ་མཉམ་རྟགས་བཀལ། "
+msgstr "ལྷག་ཚར་མི་ཆ་མཉམ་རྟགས་བཀལ། "
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "འཕྲིན་དོན་ཚུ་ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ། (_s)"
+msgid "Mark me_ssages as read"
+msgstr "འཕྲིན་དོན་ཚུ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ། (_s)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
-msgstr "སྣོད་འཛིན་ཅིག་ནང་གི་ འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ལུ་ ལག་ལེན་འཐབ་ཨིན།"
+msgstr "འཕྲིན་དོན་ཆ་མཉམ་ སྣོད་འཛིན་ཅིག་གི་འོག་ལུ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཏལ་ནིའི་དོན་ལུ་ ལག་ལེན་འཐབ་ཅི།"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -16773,7 +16299,7 @@ msgstr "ཐོབ་ཚུགས་མི་འདི་ ཨོཕ་ལའི�
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 msgid "_Mark Calendar for offline use"
-msgstr "ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ ཟླ་ཐོ་ལུ་རྟགས་བཀལ།(_M)"
+msgstr "ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ ཟླ་ཐོ་ལུ་རྟགས་བཀལ།"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -16834,15 +16360,13 @@ 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 ""
-"ཁྱོད་ལུ་ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ཚུ་ ལྕོགས་མིན་བཟོ་ནིའི་ གདམ་ཁ་བརྐྱབ་བཅུག་མི་ རྩ་སྒྲིག་པའི་པ་ལག་ཨིན་ཅིག་ "
-"འགྲེམ་སྟོན་འབད་མི་ བརྟག་ཞིབ་པ་ལག་ཨིན་ཅིག\n"
+"ཁྱོད་ལུ་ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ཚུ་ ལྕོགས་མིན་བཟོ་ནིའི་ གདམ་ཁ་བརྐྱབ་བཅུག་མི་ རྩ་སྒྲིག་པའི་པ་ལག་ཨིན་ཅིག་ འགྲེམ་སྟོན་འབད་མི་ བརྟག་ཞིབ་པ་ལག་ཨིན་ཅིག\n"
 "\n"
-"པ་ལག་ཨིན་དེ་ རྒྱབ་སྐྱོར་མེད་པའི་འགྲེམ་སྟོན་གྱི་ ཀོཌི་ཙམ་ཅིག་ཨིན།\n"
+"པ་ལག་ཨིན་འདི་ རྒྱབ་སྐྱོར་མེད་པའི་འགྲེམ་སྟོན་གྱི་ ཀོཌི་ཙམ་ཅིག་ཨིན།\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
@@ -16874,8 +16398,10 @@ 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-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)"
@@ -16886,19 +16412,19 @@ msgstr "འཕྲིན་དོན་དེ་ དཔར་བསྐྲུན�
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
-msgstr "ཨི་བོ་ལུ་ཤཱནགྱི་གསལ་སྡུད་བཀོད་མི།"
+msgstr "ཨི་བོ་ལུ་ཤཱནགྱི་ གསལ་སྡུད་བཀོད་མི།"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Writes a log of profiling data events."
-msgstr "གསལ་སྡུད་བཀོད་མི་ གནད་སྡུད་འབྱུང་ལས་ཚུ་གི་ དྲན་དེབ་ཅིག་འབྲིཝ་ཨིན།"
+msgstr "གསལ་སྡུད་ཀྱི་གནད་སྡུད་བྱུང་ལས་ཚུ་གི་ དྲན་དེབ་ཅིག་འབྲིཝ་ཨིན།"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
-msgstr "ཟླ་ཐོ་ཚུ་ ཝེབ་གུ་དཔེ་བསྐྲུན་འབད་བཅུགཔ་ཨིན།"
+msgstr "ཟླ་ཐོ་ཚུ་ཝེབ་གུ་དཔེ་བསྐྲུན་འབད་བཅུགཔ་ཨིན།"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
-msgstr "ཟླ་ཐོའི་དཔེ་བསྐྲུན།"
+msgstr "ཟླ་ཐོ་དཔེ་བསྐྲུན།"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Locations"
@@ -16906,7 +16432,7 @@ msgstr "གནས་ཁོངས་ཚུ།"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
-msgstr "ཨའི་ཟླ་ཐོའི་བརྡ་དོན་དཔེ་བསྐྲུན་འབད།(_P)"
+msgstr "ཟླ་ཐོའི་བརྡ་དོན་དཔེ་བསྐྲུད་འབད།(_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
@@ -16918,7 +16444,7 @@ msgstr "<span weight=\"bold\">གནས་ཁོངས་</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:4
 msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">འབྱུང་ཁུངས་ཚུ་</span>"
+msgstr "<span weight=\"bold\">འབྱུང་ཁུངས་</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:6
 msgid ""
@@ -16928,19 +16454,19 @@ msgid ""
 msgstr ""
 "ཉིན་རིམ།\n"
 "བདུན་རིམ།\n"
-"ལག་ཐོག (བྱ་བའི་དཀར་ཆག་བརྒྱུད་དེ)"
+"ལག་ཐོག (བྱ་བའི་དཀར་ཆག་བརྒྱུད་ཐོག)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
-msgstr "འདྲེན་ལམ་: (_o)"
+msgstr "འདྲེན་ལམ་: (_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:11
 msgid "Publishing Location"
-msgstr "<b>དཔེ་བསྐྲུན་གནས་ཁོངས་</b> (_L)"
+msgstr "དཔེ་བསྐྲུན་གྱི་གནས་ཁོངས།"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:12
 msgid "Publishing _Frequency:"
-msgstr "<b>དཔེ་བསྐྲུན་འབྱུང་ཐེངས་</b>(_F)"
+msgstr "དཔེ་བསྐྲུན་གྱི་འབྱུང་ཐེངས་:(_F)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
@@ -16953,11 +16479,11 @@ msgid ""
 "Custom Location"
 msgstr ""
 "ཨེསི་ཨེསི་ཨེཆ།\n"
-"མི་མང་ཨེཕ་ཊི་པི།\n"
-"ཨེཕ་ཊི་པི། (ནང་བསྐྱོད་དང་བཅས)\n"
-"སྒོ་སྒྲིག་རུབ་སྤྱོད།\n"
-"ཝེབ་ཌེབ། (ཨེཆ་ཊི་ཊི་པི)\n"
-"ཝེབ་ཌེབ་མཐའ་བཙན་བཟོ།(ཨེཆ་ཊི་ཊི་པི་ཨེསི)\n"
+"མི་མང་གི་ཨེཕ་ཊི་པི།\n"
+"ཧེཕ་ཊི་པི།(ནང་བསྐྱོད་བཅས)\n"
+"ཝིན་ཌོསི་རུབ་སྤྱོད།\n"
+"ཝེབ་ཌི་ཨེ་ཝི།(ཨེཆ་ཊི་ཊི་པི)\n"
+"ཝེབ་ཌི་ཨེ་ཝི་ མཐའ་བཙན་བཟོ།(ཨེཆ་ཊི་ཊི་པི་ཨེསི)\n"
 "སྲོལ་སྒྲིག་གནས་ཁོངས།"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
@@ -16966,18 +16492,18 @@ msgstr "ཞབས་ཏོག་གི་དབྱེ་བ་:(_t)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
-msgstr "ཡིག་སྣོད་: (_F)"
+msgstr "ཡིག་སྣོད་:(_F)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
-msgstr "དེ་སྦེ་དཔེ་བསྐྲུན་འབད་:(_P)"
+msgstr "བཟུམ་སྦེ་དཔེ་བསྐྲུན་འབད་:(_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
 msgstr ""
-"ཨའི་ཟླ་ཐོ་\n"
+"ཨའི་ཟླ་ཐོ།\n"
 "དལཝ/ཁོམ་མེད།"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:101
@@ -16985,12 +16511,8 @@ msgid "Spamassassin (built-in)"
 msgstr "སི་པ་མ་ས་སིན།(ནང་སྦྲགས)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
-"to be installed."
-msgstr ""
-"སི་པ་མ་ས་སིན་ ལག་ལེན་འཐབ་ཐོག་ལས་ མཁོ་མེད་འཕྲིན་དོན་ཚུ་ བཙག་གཏངམ་ཨིན། པ་ལག་ཨིན་འདི་གི་དོན་ལུ་ "
-"ས་པ་མ་ས་སིན་ གཞི་བཙུགས་འབད་དགོ"
+msgid "Filters junk messages using Spamassassin. This plugin requires Spamassassin to be installed."
+msgstr "སི་པ་མ་ས་སིན་ ལག་ལེན་འཐབ་ཐོག་ལས་ མཁོ་མེད་འཕྲིན་དོན་ཚུ་ཕྱིར་སེལ་རྐྱབས། པ་ལག་ཨིན་དེ་ གཞི་བཙུགས་འབད་ནི་ལུ་ སི་པ་མ་ས་སིན་དགོ།"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
@@ -16998,9 +16520,7 @@ 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 "དུས་སྟབས་གཅིག་ལུ་ མཉམ་སྦྲགས་ཚུ་ཆ་མཉམ་ ཡང་ན་ འཕྲིན་དོན་གྱི་ཆ་ཤས་ཚུ་ སྲུང་བཞག་འབད་ནིའི་ པ་ལག་ཨིན་ཅིག"
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -17015,16 +16535,17 @@ msgstr "མཉམ་སྦྲགས་ཚུ་ སྲུངས་ ..."
 msgid "Save all attachments"
 msgstr "མཉམ་སྦྲགས་ཆ་མཉམ་ སྲུངས།"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "སྲུང་བཞག་གཞི་རྟེན་གྱི་མིང་ སེལ་འཐུ་འབད།"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 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:366
+#: ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "སྲུངས།"
 
@@ -17074,7 +16595,7 @@ msgstr "བརྒྱ་ཆ་ཚར་བ།"
 
 #: ../plugins/save-calendar/csv-format.c:398
 msgid "URL"
-msgstr "ཡུ་ཨར་ཨེལ།"
+msgstr "ཡུ་ཨར་ཨེལ་: "
 
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
@@ -17134,7 +16655,7 @@ 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:179
 msgid "Select destination file"
 msgstr "འགྲོ་ཡུལ་གྱི་ཡིག་སྣོད་ སེལ་འཐུ་འབད།"
 
@@ -17156,7 +16677,7 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་འདི་རྐྱངམ་
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "A plugin that handles the Startup wizard."
-msgstr "འགོ་བཙུགས་ཝི་ཛཌི་ ལེགས་སྐྱོང་འཐབ་མི་ པ་ལག་ཨིན་ཅིག"
+msgstr "འགོ་བཙུགས་ཝི་ཛརཌི་ ལེགས་སྐྱོང་འབད་མི་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
@@ -17172,29 +16693,27 @@ msgstr "བྱོན་པ་ལེགས་སོ།"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་ལུ་ བྱོན་པ་ལེགས་སོ་ཡོད། ཐེངས་དག་པ་ཅིག་སྟོན་པ་ཅིན་ ཨི་བོ་ལོ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་གློག་འཕྲིན་རྩིས་"
-"ཐོ་ལུ་ མཐུད་ལམ་འབད་ཚུགས་ནི་དང་ གློག་རིམ་གཞན་ཚུ་ལས་ ཡིག་སྣོད་ཚུ་ ནང་འདྲེན་འབད་ཚུགས།\n"
+"ཨི་བོ་ལུ་ཤཱན་ལུ་ བྱོན་པ་ལེགས་སོ་ཡོད། ཐེངས་དག་པ་ཅིག་སྟོན་པ་ཅིན་ ཨི་བོ་ལོ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་གློག་འཕྲིན་རྩིས་ཐོ་ལུ་ མཐུད་ལམ་འབད་ཚུགས་ནི་དང་ གློག་རིམ་གཞན་ཚུ་ལས་ ཡིག་སྣོད་ཚུ་ ནང་འདྲེན་འབད་ཚུགས།\n"
 "\n"
 "འཕྲོ་མཐུད་ནིའི་དོན་ལུ་ \"Forward\" ཨེབ་རྟ་གུ་ ཨེབ་གཏང་འབད་གནང་།"
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "ཁྱོད་ཀྱིས་ ནང་འདྲེན་འབད་དགོ་མནོ་མི་ བརྡ་དོན་དེ་ སེལ་འཐུ་འབད་གནང་།"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, 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:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "གནད་སྡུད་ནང་འདྲེན་འབད་དོ།"
 
@@ -17249,7 +16768,7 @@ msgstr "སྒོ་སྒྲིག་གི་མཐོ་ཚད་ སྔོ�
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window state"
-msgstr "སྔོན་སྒྲིག་སྒོ་སྒྲིག་གནས་ལུགས།"
+msgstr "སྔོན་སྒྲིག་སྒོ་སྒྲིག་གི་གནས་ལུགས།"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
@@ -17264,8 +16783,7 @@ msgid "Last upgraded configuration version"
 msgstr "མཐའ་མཇུག་གི་ དུས་མཐུན་བཟོ་བའི་ རིམ་སྒྲིག་ཐོན་རིམ།"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+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
@@ -17274,96 +16792,74 @@ msgstr "དཔར་འཕྲུལ་གཞི་སྒྲིག"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
-msgstr "ཟུར་ཁའི་་ཕྲ་རིང་མཐོང་ཚུགས་པས།"
+msgstr "ལག་ཆས་ཕྲ་རིང་མཐོང་ཚུགས་པས།"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "གོང་འཕེལ་ཉེན་བརྡའི་ ཌའི་ལོག་གོམ་སྟེ་འགྱོ།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "ཨོཕ་ལ་ཡིན་ ཐབས་ལམ་ནང་ འགོ་བཙུགས།"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "གནས་ཚད་ཕྲ་རིང་མཐོང་ཚུགས་པས།"
+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
-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
 msgid "The default height for the main window, in pixels."
 msgstr "སྒོ་སྒྲིག་གཙོ་བའི་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་མཐོ་ཚད་ པིག་སེལསི་ནང་།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "སྒོ་སྒྲིག་གཙོ་བའི་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་རྒྱ་ཚད་ པིག་སེལསི་ནང་།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "ཟུར་ཁའི་ཕྲ་རིང་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་རྒྱ་ཚད་ པིག་སེལསི་ནང་།"
 
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+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
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"སྦོམ་/ཆུང་ཀུ་ རིམ་སྒྲིག་གནས་རིམ་དང་བཅས་པའི་ མཐའ་མཇུག་རྒྱ་སྐྱེད་འབད་ཡོད་པའི་ ཨི་བོ་ལུ་ཤཱན་རིམ་སྒྲིག་ཐོན་"
-"རིམ།(དེཔར་ན་ \"2.6.0\")།"
+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
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"སྒོ་སྒྲིག་ཨེབ་རྟའི་བཟོ་རྣམ། \"text\", \"icons\", \"both\", \"toolbar\" འོང་སྲིད། གལ་སྲིད་"
-"\"toolbar\" གཞི་སྒྲིག་འབད་བ་ཅིན་ ཨེབ་རྟའི་བཟོ་རྣམ་དེ་ ཇི་ནོམ་ལག་ཆས་ཕྲ་རིང་ གཞི་སྒྲིག་གིས་གཏན་"
-"འབེབས་བཟོཝ་ཨིན།"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Toolbar is visible"
 msgstr "ལག་ཆས་ཕྲ་རིང་ མཐོང་ཚུགས་པས།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་དེ་ ཨཱོན་ལ་ཡིན་ ཐབས་ལམ་གྱི་ཚབ་ལུ་ ཨོཕ་ལ་ཡིན་་ ཐབས་ལམ་ནང་ འགོ་བཙུགས་ནི་ཨིན་ན།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་དེ་ ཨཱོན་ལ་ཡིན་ ཐབས་ལམ་གྱི་ཚབ་ལུ་ ཨོཕ་ལ་ཡིན་་ ཐབས་ལམ་ནང་ འགོ་བཙུགས་ནི་ཨིན་ན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
-msgstr "སྒོ་སྒྲིག་འཕར་དགོཔ་ཨིན་ན་མེན།"
+msgstr "སྒོ་སྒྲིག་དེ་སྦོམ་བཟོ་དགོཔ་ཨིན་ན་མེན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
-msgstr "ཟུར་ཁའི་ཕྲ་རིང་དེ་མཐོང་དགོཔ་ཨིན་ན་མེན།"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "གནས་ཚད་ཕྲ་རིང་དེ་མཐོང་དགོཔ་ཨིན་ན་མེན།"
+msgstr "ལག་ཆས་ཕྲ་རིང་དེ་ མཐོང་དགོཔ་ཨིན་ན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "ལག་ཆས་ཕྲ་རིང་དེ་ མཐོང་དགོཔ་ཨིན་ན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ གོང་འཕེལ་ཐོན་རིམ་ནང་གི་ ཉེན་བརྡའི་ཌའི་ལོག་དེ་ གོམ་སྟེ་འགྱོ་ཡི་ག"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ་ མཐོང་དགོཔ་ཨིན་ན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟའི་བཟོ་རྣམ།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ་ མཐོང་ཚུགས།"
 
@@ -17384,63 +16880,59 @@ msgstr "མཐུད་ལམ་འདི་ཚུ་ ཁ་བསྡམས་�
 msgid "(Untitled)"
 msgstr "(མགོ་མིང་མ་བཏགསཔ།)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "གཡོག་བཀོལ་ནིའི་དོན་ལུ་ ནང་འདྲེན་པའི་དབྱེ་བ་ གདམ་ཁ་རྐྱབས།"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"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"
 "\n"
 "ཁྱོད་ཀྱིས་མ་ཤེས་པ་ཅིན་ \"Automatic\" སེལ་འཐུ་འབདཝ་ད་ ཨི་བོ་ལུ་ཤཱན་ དཀའ་ངལ་སེལ་འཐུ་འབད་འོང་།"
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "ནང་འདྲེན་འདི་གི་དོན་ལུ་ འགྲོ་ཡུལ་གདམ་ཁ་རྐྱབས།"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
 "settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 msgstr ""
-"འོག་གི་གློག་རིམ་ནང་ལས་ གཞི་སྒྲིག་ཚུ་ ནང་འདྲེན་འབད་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ཞིབ་དཔྱད་འབད་ཡི་:པ་ཡིན། "
-"ནེཊི་སིཀེཔ། ཨི་ཨེལ་ཨེམ། ཨའི་ཟླ་ཐོ་ཚུ་ ཞིབ་དཔྱད་འབད་ཡི།\n"
+"འོག་གི་གློག་རིམ་ནང་ལས་ གཞི་སྒྲིག་ཚུ་ ནང་འདྲེན་འབད་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ཞིབ་དཔྱད་འབད་ཡི་:པ་ཡིན། ནེཊི་སིཀེཔ། ཨི་ཨེལ་ཨེམ། ཨའི་ཟླ་ཐོ་ཚུ་ ཞིབ་དཔྱད་འབད་ཡི།\n"
 "ནང་འདྲེན་འབད་བཏུབ་པའི་ གཞི་སྒྲིག་གཅིག་ཡང་མ་ཐོབ།\n"
 " ཁྱོད་ཀྱིས་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་\n"
 " \"Back\" ཨེབ་རྟ་ལུ་ ཨེབ་གཏང་འབད།\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "ཡིག་སྣོད་མིང་: (_i)"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "ཡིག་སྣོད་ཅིག་ སེལ་འཐུ་འབད།"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "ཡིག་སྣོད་ཀྱི་དབྱེ་བ་:(_t)"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "ལས་རིམ་རྙིངམ་ཚུ་ནང་ལས་ གནས་སྡུད་ནང་ གཞི་སྒྲིག་ཚུ་ ནང་འདྲེན་འབད། (_o)"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "ཡིག་སྣོད་ཕུད་རྡོག་གཅིག་ ནང་འདྲེན་འབད། (_s)"
 
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Preferences"
-msgstr "ཨི་བོ་ལུ་ཤཱན་དགའ་གདམ་ཚུ།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ དགའ་གདམ་ཚུ།"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -17484,15 +16976,14 @@ msgstr "བཱག་བ་ཌི་ གཡོག་བཀོལ་མ་ཚུ�
 #. * about box
 #: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
-msgstr ""
-"ཨའི་ཌི་ཨར་སི་གི་མ་དངུལ་རྒྱབ་སྐྱོར་ཐོག་ལས་ བརྡ་དོན་འཕྲུལ་རིག་ལས་ཁུངས་ནང་ སྐད་བསྒྱུར་འབད་ཡི། ཁ་གསལ་གྱི་"
-"དོན་ལུ་ འབྲེལ་བ་འཐབ་ས་: <pema_geyleg@druknet.bt>/<pgeyleg@dit.gov.bt>"
+msgstr "ཨའི་ཌི་ཨར་སི་གི་མ་དངུལ་རྒྱབ་སྐྱོར་ཐོག་ལས་ བརྡ་དོན་འཕྲུལ་རིག་ལས་ཁུངས་ནང་ སྐད་བསྒྱུར་འབད་ཡི། ཁ་གསལ་གྱི་དོན་ལུ་ འབྲེལ་བ་འཐབ་ས་: <pema_geyleg@druknet.bt>/<pgeyleg@dit.gov.bt>"
 
 #: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "ཨཱོན་ལ་ཡིན་གུ་ ལཱ་འབད། (_W)"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819
+#: ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད། (_W)"
 
@@ -17502,8 +16993,7 @@ msgstr "ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད།"
 
 #: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr ""
-"ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨཱོན་ལ་ཡིན་གུ་ཡོད། ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ད་ལྟོ་ ཨི་བོ་ལུ་ཤཱན་ ཨཱོན་ལ་ཡིན་གུ་ཡོད། ཨོཕ་ལ་ཡིན་གུ་ བཀལ་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
@@ -17511,48 +17001,44 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་�
 
 #: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr ""
-"ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་གུ་ཡོད། ཨཱོན་ལ་ཡིན་གུ་ ལཱ་འབད་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་གུ་ ཨེབ་གཏང་འབད།"
+msgstr "ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་གུ་ཨིན་མས། ཨཱོན་ལ་ཡིན་གུ་ བཀལ་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་གུ་ ཨེབ་གཏང་འབད།"
 
 #: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ལུ་སོར་བསྒྱུར་འབད།"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "མ་ཤེས་པའི་ རིམ་ལུགས་འཛོལ་བ།"
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829
+#: ../shell/e-shell.c:830
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ཀེ་བི།"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1261
+#: ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "བཏུབ་པས།"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "ནུས་མེད་ཀྱི་ སྒྲུབ་རྟགས་ཚུ།"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "ཨོ་ཨེ་ཨེཕ་གུ་ ཐོ་བཀོད་འབད་མི་ཚུགས།"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 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:685
 msgid "New"
 msgstr "གསརཔ།"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr "གསརཔ།"
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "བརྟག་ཞིབ་གསརཔ།"
@@ -17567,8 +17053,7 @@ msgstr "བརྟག་ཞིབ་ཀྱི་རྣམ་གྲངས་ ག�
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་ནང་ ཡིག་སྣོད་ནང་འདྲེན་འབད་ནི་ འགོ་བཙུགས་ནིའི་དོན་ལས་ \"Import\" ལུ་ ཨེབ་གཏང་འབད།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ནང་ ཡིག་སྣོད་ནང་འདྲེན་འབད་ནི་ འགོ་བཙུགས་ནིའི་དོན་ལས་ \"Import\" ལུ་ ཨེབ་གཏང་འབད།"
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -17605,7 +17090,7 @@ msgstr ""
 "ནང་འདྲེན་འབད་ནི་ལུ་ ལམ་སྟོན་འབད་འོང་།"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17624,22 +17109,22 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"དབའི། ཨི་བོ་ལེ་ཤཱན་གྱི་ གུརུབ་ཝེར་ཆ་ཚང་དེ་གི་ སྔོན་ལྟའི་གསར་སྟོན་འདི་\n"
-" ཕབ་ལེན་འབད་ནི་ལུ་ བསྒུགས་སྡོད་མི་དེ་ལུ་ བཀྲིན་ཆེ།\n"
+"དབའི། ཨི་བོ་ལེ་ཤཱན་གྱི་ གུརུབ་ཝེར་ སུཊི་གི་ སྔོན་ལྟ་འཛིན་གྲོལ་འདི་\n"
+" ཕབ་ལེན་འབད་ནི་ལུ་ བསྒུགས་མི་དེ་ལུ་ བཀྲིན་ཆེ།\n"
 "\n"
-"ཨི་བོ་ལུ་ཤཱན་ཐོན་རིམ་འདི་ ད་ལྟོ་མཇུག་མ་བསྡུ། འདི་རྫོགས་རན་ཁར་ལྷོད་ཡོད་རུང་\n"
+"ཨི་བོ་ལུ་ཤཱན་གྱི་ ཐོན་རིམ་འདི་ ད་ལྟོ་མཇུག་མ་བསྡུ། འདི་མཇུག་བསྡུ་རན་ཁར་ལྷོད་ཡོད་རུང་\n"
 " ཁྱད་རྣམ་ལ་ལོ་ཅིག་ མ་རྫོགས་པའམ་ ཚུལ་མཐུན་སྦེ་ ལཱ་འབད་མི་བཏུབ་པས།\n"
 "\n"
 " ཁྱོད་ལུ་ཨི་བོ་ལུ་ཤཱན་གྱི་ ཐོན་རིམ་རྩ་བརྟན་ཅིག་དགོ་པ་ཅིན་ ཐོན་རིམ་་འདི་ སྒྲིག་བཤོལ་འབད་ཞིནམ་ལས་\n"
 " དེ་གི་ཚབ་ལུ་ ཐོན་རིམ་%sདེ་ གཞི་བཙུགས་འབད།\n"
 "\n"
-" ཁྱོད་ཀྱིས་རྐྱེན་མཐོང་པ་ཅིན་ bugzilla.gnome.org ལུ་ སྙན་ཞུ་འབད།\n"
+" ཁྱོད་ཀྱིས་རྐྱེན་མཐོང་པ་ཅིན་ bugzilla.gnome.orgལུ་ སྙན་ཞུ་འབད།\n"
 "ཐོན་སྐྱེད་འདི་ ཉེན་ལེན་མེདཔ་སྦེ་འོངམ་ལས་\n"
 " ཁོང་ཁྲོ་ཅན་གྱི་ གང་ཟག་ཚུ་གི་དོན་ལུ་མེན།\n"
 "ང་བཅས་ཀྱི་ དཀའ་སྤྱད་ལཱ་གི་གྲུབ་འབྲས་འདི་ལུ་ ཁྱོད་སྤྲོ་བ་བྱུང་པའི་ རེ་བ་ཡོདཔ་མ་ཚད་\n"
 " དགའ་སྤྲོ་བའི་ཐོག་ལས་ ཁྱོད་ཀྱི་ཕན་འདེབས་ལུ་ བསྒུག་སྟེ་སྡོད་ཡོད།\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17647,39 +17132,35 @@ msgstr ""
 "བཀྲིན་ཆེ།\n"
 "ཨི་བོ་ལུ་ཤཱན་ རུ་ཚན།\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
-msgstr "ང་ལུ་ལོག་མ་སླབ།"
+msgstr "ང་ལུ་ ལོག་སྟེ་མ་སླབས།"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "གསལ་བཀོད་འབད་མི་ ཆ་ཤས་དེ་ཤུགས་ལྡན་བཟོ་མི་ ཨི་བོ་ལུ་ཤཱན་འགོ་བཙུགས།"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "ཨཱོན་ལ་ཡིན་ ཐབས་ལམ་ནང་ འགོ་བཙུགས།"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཆ་ཤས་ཆ་མཉམ་རང་ བང་ཅན་སྦེ་ སྒོ་བསྡམས།"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ༡.༤ ནང་ལས་ བང་ཅན་སྦེ་ ལོག་སྟེ་གཞིས་སྤོ་འབད།"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "ཆ་ཤས་ཆ་མཉམ་གྱི་ ཨའུཊི་པུཊི་ སྐྱོན་སེལ་འཐུ་འབད་དེ་ ཡིག་སྣོད་ཅིག་ནང་གཏང་།"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "པལག་ཨིན་གང་རུང་ མངོན་གསལ་འབད་ནི་ ལྕོགས་མིན་བཟོ།"
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ པི་ཨའི་ཨེམ་དང་ གློག་འཕྲིན་གྱི་ཞབས་ཏོག་སྤྱོད་མི།"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17705,12 +17186,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/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -17722,39 +17199,27 @@ 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 ""
-"&quot;evolution&quot; གི་སྣོད་ཐོའི་ནང་དོན་ཧྲིལ་བུ་ རྟག་བརྟན་སྦེ་ རྩ་བསྐྲད་གཏང་ནི་འབད་དོ།\n"
+"&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"
 "\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}"
@@ -17762,16 +17227,13 @@ 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 ""
-"ཁྱོད་ཀྱི་གནད་སྡུད་དང་ གཞི་སྒྲིག་ཚུ་ ཡར་བསྐྱེད་ཀྱི་དོན་ལུ་ ཌིཀསི་གི་བར་སྟོང་{༠}ཚུན་ཚོད་དགོཔ་ཨིན་རུང་ཁྱོད་ལུ་"
-"བར་སྟོང་{༡} མ་གཏོགས་མིན་འདུག\n"
+"ཁྱོད་ཀྱི་གནད་སྡུད་དང་ གཞི་སྒྲིག་ཚུ་ ཡར་བསྐྱེད་ཀྱི་དོན་ལུ་ ཌིཀསི་གི་བར་སྟོང་{༠}ཚུན་ཚོད་དགོཔ་ཨིན་རུང་ཁྱོད་ལུ་བར་སྟོང་{༡} མ་གཏོགས་མིན་འདུག\n"
 "\n"
-"ཁྱོད་ཀྱིས་འཕྲོ་མ་མཐུད་པའི་ཧེ་མར་ ཁྱོད་རའི་ཁྱིམ་གྱི་སྣོད་ཐོ་ནང་ བར་སྟོང་ཧེང་བཀལ་བཟོ་དགོ"
+"ཁྱོད་ཀྱིས་འཕྲོ་མ་མཐུད་པའི་ཧེ་མར་ ཁྱོད་རའི་ཁྱིམ་གྱི་སྣོད་ཐོ་ནང་ བར་སྟོང་ཧེང་བཀལ་ཡོདཔ་བཟོ་དགོ"
 
 #: ../shell/shell.error.xml.h:23
 msgid ""
@@ -17799,22 +17261,21 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:31
 msgid "_Forget"
-msgstr "སེམས་ལས་བརྗེད།(_F)"
+msgstr "སེམས་བརྗེད།(_F)"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
-msgstr "གནད་སྡུད་བདག་འཛིན་སྦེ་བཞག (_K)"
+msgstr "གནད་སྡུད་ བདག་འཛིན་སྦེ་བཞག (_K)"
 
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
-msgstr "ང་ལུ་ཤུལ་ལས་དྲན་བསྐུལ་འབད། (_R)"
+msgstr "ང་ལུ་ ཤུལ་ལས་དྲན་བསྐུལ་འབད། (_R)"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
 "{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 ""
 "{༡}\n"
 "\n"
@@ -17832,22 +17293,12 @@ msgstr ""
 "བློ་གཏད་གཞི་སྒྲིག་ཚུ་ ཞུན་དག་རྐྱབས།"
 
 #: ../smime/gui/cert-trust-dialog.c:154
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"ནཱ་ལུ་ བརྡ་སྟོན་ཏེ་ཡོད་ན་མ་གཏོགས་ ཁྱོད་ཀྱིས་ ལག་ཁྱེར་འདི་སྤྲོད་མི་ ལག་ཁྱེར་དབང་འཛིན་ལུ་ བློ་གཏད་འབད་བ་"
-"ཅིན་ ལག་ཁྱེར་འདི་གི་ བདེན་བཤད་ལུ་ཡང་ བློ་གཏད་འབད་དགོ"
+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 ""
-"ནཱ་ལུ་ བརྡ་སྟོན་ཏེ་ཡོད་ན་མ་གཏོགས་ ཁྱོད་ཀྱིས་ ལག་ཁྱེར་འདི་སྤྲོད་མི་ ལག་ཁྱེར་དབང་འཛིན་ལུ་ བློ་གཏད་མ་འབད་"
-"བ་ཅིན་ ལག་ཁྱེར་འདི་གི་ བདེན་བཤད་ལུ་ཡང་ བློ་གཏད་མ་འབད་དགོ"
+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
@@ -17869,7 +17320,8 @@ msgstr "ལག་ཁྱེར་གྱི་མིང་།"
 msgid "Purposes"
 msgstr "དགོས་དོན།"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:285
+#: ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "གོ་རིམ་ཨང་།"
@@ -17973,14 +17425,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 "ལག་ཁྱེར།"
 
@@ -18056,11 +17505,13 @@ msgstr "ལས་སྡེའི་ཆ་ཕྲན།(ཨོ་ཡུ)"
 msgid "SHA1 Fingerprint"
 msgstr "ཨེསི་ཨེཆ་ཨེ་ ༡ མཛུབ་རྗེས།"
 
-#: ../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 "ཨེསི་ཨེསི་ཨེལ་ ཞབས་ཏོག་སྤྱོད་མི་ ལག་ཁྱེར།"
 
-#: ../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 "ཨེསི་ཨེསི་ཨེལ་ སར་བར་ ལག་ཁྱེར།"
 
@@ -18089,8 +17540,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
@@ -18106,11 +17556,12 @@ 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:664
 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"
 
@@ -18192,11 +17643,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 "དངོས་པོ་ལུ་ མིང་རྟགས་བཀོད་མི།"
 
@@ -18240,7 +17693,8 @@ msgstr "སི་ཨར་ཨེལ་ མིང་རྟགས་བཀོད�
 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 "ཉེན་ཅན་མེནམ།"
 
@@ -18253,7 +17707,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 "ལག་ཁྱེར་ མིང་རྟགས་ཀྱི་ ཨཱལ་གོ་རི་དམ།"
 
@@ -18324,22 +17779,23 @@ msgstr "%s (%s)སྒོ་བསྡམ་དོ།\n"
 
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
-msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་རྒྱུ་དངོས་ཚུ་(_B)"
+msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་རྒྱུ་དངོས་ཚུ།(_B)"
 
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དེ་གི་ རྒྱུ་དངོས་ཚུ་བསྒྱུར་བཅོས་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་ སྣོད་འཛིན་འདི་གི་ རྒྱུ་དངོས་ཚུ་ བསྒྱུར་བཅོས་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "འབྲེལ་ས་ཆ་མཉམ་འདྲ་བཤུས་བརྐྱབ་ས་...(_p)"
+msgstr "འབྲེལ་ས་ཚུ་ཆ་མཉམ་རང་ འདྲ་བཤུས་རྐྱབས་...(_p)"
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "འབྲེལ་སའི་སྔོན་ལྟ།(_P)"
 
 #: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "འདྲ་བཤུས།"
@@ -18350,9 +17806,10 @@ 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
+#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "སེལ་འཐུ་འབད་མི་དེ་ འདྲ་བཤུས་རྐྱབས།"
 
@@ -18362,21 +17819,23 @@ msgstr "སྣོད་འཛིན་ལུ་ འདྲ་བཤུས་ར�
 
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new addressbook folder"
-msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་འཛིན་གསརཔ་ཅིག་གསར་བསྐྲུན་འབད།"
+msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་ཐོ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:5
+#: ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "བཏོག"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "སེལ་འཐུ་འབད་མི་བཏོག"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
-msgstr "ཁ་བྱང་བཏོན་གཏང་།(_e)"
+msgstr "ཁ་བྱང་ཀི་དེབ་བཏོན་གཏང་།(_e)"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
@@ -18384,7 +17843,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ འབྲེལ་ས་�
 
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་བཏོན་གཏང་།"
+msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དེ་བཏོན་གཏང་།"
 
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
@@ -18392,7 +17851,7 @@ msgstr "འབྲེལ་ས་གདོང་བསྐྱོད་འབད།
 
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
-msgstr "འབྲེལ་ས་ཆ་མཉམ་སྤོ་བཤུད་འབད་ས་...(_v)"
+msgstr "འབྲེལ་ས་ཚུ་ཆ་མཉམ་རང་ སྤོ་བཤུད་འབད་ཡུལ་...(_v)"
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
@@ -18400,19 +17859,21 @@ msgstr "སེལ་འཐུ་འབད་མི་འབྲེལ་ས་ཚ
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ སྣོད་འཛིན་གཞན་མི་ནང་སྤོ་བཤུད་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ སྣོད་འཛིན་གཞན་མི་ནང་ སྤོ་བཤུད་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "སྣོད་འཛིན་གཞན་ལུ་ སྤོ་བཤུད་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "སྦྱར།"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "འཛིན་སྤང་དེ་སྦྱར།"
 
@@ -18426,11 +17887,11 @@ msgstr "སེལ་འཐུ་འབད་མི་ འབྲེལ་ས་�
 
 #: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་ལུ་ བསྐྱར་མིང་བཏགས།"
+msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དེ་ལུ་ བསྐྱར་མིང་བཏགས།"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "ཁ་བྱང་ཀི་དེབ་དེ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།(_a)"
+msgstr "ཁ་བྱང་ཀི་དེབ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།(_a)"
 
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
@@ -18438,14 +17899,16 @@ msgstr "སེལ་འཐུ་འབད་མི་ འབྲེལ་ས་�
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།"
+msgstr "སེལ་འཐུ་འབད་མི་ འབྲེལ་ས་ཚུ་ ཝི་ཤོག་བྱང་བཟུམ་ཅིག་སྦེ་སྲུངས།"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
+#: ../ui/evolution-addressbook.xml.h:34
+#: ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "ཆ་མཉམ་སེལ་འཐུ་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11
+#: ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "ཆ་མཉམ་སེལ་འཐུ་འབད། (_A)"
@@ -18486,22 +17949,23 @@ 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)"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "འབྲེལ་ས་འདྲ་བཤུས་བརྐྱབ་ས་...(_C)"
+msgstr "འབྲེལ་ས་འདྲ་བཤུས་བརྐྱབ་ཡུལ་...(_C)"
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
-msgstr "སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ འདྲ་བཤུས་བརྐྱབ་ས་...(_C)"
+msgstr "སྣོད་འཛིན་འབྲེལ་ས་ འདྲ་བཤུས་བརྐྱབ་ཡུལ་...(_C)"
 
 #: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
-msgstr "འབྲེལ་ས་བཏོན་གཏང་ (_D)"
+msgstr "འབྲེལ་ས་བཏོན་གཏང་། (_D)"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
@@ -18509,13 +17973,14 @@ msgstr "འབྲེལ་ས་གདོང་བསྐྱོད་འབད་
 
 #: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
-msgstr "འབྲེལ་ས་སྤོ་བཤུད་འབད་ས་...(_M)"
+msgstr "འབྲེལ་ས་སྤོ་བཤུད་འབད་ཡུལ་...(_M)"
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
-msgstr "སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ སྤོ་བཤུད་འབད་ས་...(_M)"
+msgstr "སྣོད་འཛིན་འབྲེལ་ས་ཚུ་ སྤོ་བཤུད་འབད་ཡུལ་...(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "གསརཔ། (_N)"
 
@@ -18525,11 +17990,11 @@ msgstr "བསྐྱར་མིང་བཏགས།(_R)"
 
 #: ../ui/evolution-addressbook.xml.h:61
 msgid "_Save Contact as VCard..."
-msgstr "འབྲེལ་ས་ཝི་ཤོག་བྱང་སྦེ་སྲུངས།...(_S)"
+msgstr "འབྲེལ་ས་ཝི་ཤོག་བྱང་བཟུམ་སྦེ་སྲུངས་...(_S)"
 
 #: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
-msgstr "སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།(_S)"
+msgstr "སྣོད་འཛིན་འབྲེལ་ས་ཚུ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།(_S)"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
@@ -18575,8 +18040,8 @@ 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
 msgid "Next"
 msgstr "ཤུལ་མམ།"
 
@@ -18584,8 +18049,10 @@ 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:177
+#: ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "ཧེ་མམ།"
 
@@ -18593,7 +18060,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)"
 
@@ -18653,90 +18121,101 @@ msgstr "ལཱ་གི་བདུན་ཕྲག"
 msgid "_Open Appointment"
 msgstr "_ངོ་འཕྲད་ཁ་ཕྱེ། (_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
+#: ../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 "སེལ་འཐུ་འབད་མི་དེ་ འཛིན་པང་གུ་འདྲ་བཤུས་རྐྱབས།"
+msgstr "སེལ་འཐུ་འབད་མི་ འཛིན་པང་ལུ་འདྲ་བཤུས་རྐྱབས།"
 
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
+#: ../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 "སེལ་འཐུ་འབད་མི་དེ་ བཏོག་སྟེ་འཛིན་པང་ལུ་བཀལ།"
+msgstr "སེལ་འཐུ་འབད་མི་ འཛིན་པང་ལུ་བཏོག་བཀལ།"
 
 #: ../ui/evolution-composer-entries.xml.h:9
 msgid "Paste from clipboard"
-msgstr "འཛིན་སྤང་གུ་ལས་སྦྱར།"
+msgstr "འཛིན་སྤང་ནང་ལས་སྦྱར།"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10
+#: ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "འཛིན་པང་ནང་ལས་ ཚིག་ཡིག་སྦྱར།།"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12
+#: ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "ཚིག་ཡིག་ཆ་མཉམ་སེལ་འཐུ་འབད།"
 
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+#: ../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 "ཡིག་སྣོད་མཉམ་སྦྲགས་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད>"
+msgstr "ཡིག་སྣོད་ཅིག་ མཉམ་སྦྲགས་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../ui/evolution-editor.xml.h:3
 msgid "Click here to close the current window"
-msgstr "ད་ལྟོའི་སྒོ་སྒྲིག་ཁ་བསྡམ་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ད་ལྟོའི་ཡིག་སྣོད་སྒོ་སྒྲིག་དེ་ ཁ་བསྡམ་ནི་ལུ་ཡིག་སྣོད་ཅིག་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../ui/evolution-editor.xml.h:4
 msgid "Click here to save the current window"
-msgstr "ད་ལྟོའི་སྒོ་སྒྲིག་བསྲུང་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ད་ལྟོའི་སྒོ་སྒྲིག་བསྲུང་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།།"
 
 #: ../ui/evolution-editor.xml.h:5
 msgid "Click here to view help available"
-msgstr "ཐོབ་ཚུགས་པའི་གྲོགས་རམ་ཚུ་བལྟ་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ཐོབ་ཚུགས་པའི་གྲོགས་རམ་སྟོན་ནིའི་དོན་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _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-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
+#: ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "མཉམ་སྦྲགས་...(_A)"
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-editor.xml.h:15
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "ཁ་བསྡམས།་(_C)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11
+#: ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "ཡིག་སྣོད། (_F)"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "གྲོགས་རམ། (_H)"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "བཙུགས། (_I)"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "གདམ་ཁ་ཚུ།(_O)"
@@ -18749,131 +18228,144 @@ msgstr "ཉིནམ་གང་གི་བྱུང་ལས།"
 msgid "All _Day Event"
 msgstr "ཉིནམ་གང་གི་བྱུང་ལས།(_D)"
 
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:4
+#: ../ui/evolution-memo-editor.xml.h:1
 #: ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
-msgstr "གསང་བ་སྦེ་དབྱེ་རིམ་བཐོ།"
+msgstr "གསང་བ་སྦེ་དབྱེ་བ་བཟོ།"
 
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:5
+#: ../ui/evolution-memo-editor.xml.h:2
 #: ../ui/evolution-task-editor.xml.h:2
 msgid "Classify as Private"
-msgstr "སྒེར་དོན་སྦེ་དབྱེ་ཁག་བཟོ།"
+msgstr "སྒེར་དོན་སྦེ་དབྱེ་བ་བཟོ།"
 
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-memo-editor.xml.h:3
 #: ../ui/evolution-task-editor.xml.h:3
 msgid "Classify as public"
-msgstr "མི་མང་སྦེ་དབྱེ་ཁག་བཟོ།"
+msgstr "མི་མང་སྦེ་དབྱེ་བ་བཟོ།"
 
 #: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"བྱུང་ལས་འདི་གི་དོན་ལུ་ འཇིགས་བརྡ་ཚུ་གཞི་སྒྲིག་འབད་ནི་དང་ སྒྲིག་བཤོལ་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "འབྱུང་ལས་འདི་གི་དོན་ལུ་ འཇིགས་བརྡ་ཚུ་གཞི་སྒྲིག་ ཡང་ན་ སྒྲིག་བཤོལ་འབད་ནིའི་དོན་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
-msgstr "མཐོ་རིམ་ཅན་གྱི་ གཏང་ནིའི་གདམ་ཁ་ཚུ་བཙུགས། "
+msgstr "མཐོ་རིམ་ཅན་གྱི་ གཏང་བའི་གདམ་ཁ་ཚུ་བཙུགས། "
 
 #: ../ui/evolution-event-editor.xml.h:10
 msgid "Make this a recurring event"
-msgstr "འདི་སླར་འབྱུང་བྱུང་ལས་ཅིག་སྦེུ་བཟོ། "
+msgstr "འདི་སླར་འབྱུང་གི་འབྱུང་ལས་ཅིག་བཟོ། "
 
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-event-editor.xml.h:11
+#: ../ui/evolution-memo-editor.xml.h:4
 #: ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
-msgstr "མི་མང་གི(_b)"
+msgstr "མི་མང་།(_b)"
 
 #: ../ui/evolution-event-editor.xml.h:12
 msgid "Query free / busy information for the attendees"
-msgstr "ངོ་འཛོམས་པ་ཚུ་གི་དོན་ལས་ དལཝ་/ཁོམ་མེད་ཀྱི་བརྡ་དོན་གྱི་དྲི་དཔྱད་འབད།"
+msgstr "ངོ་འཛོམས་པ་ཚུ་གི་དོན་ལུ་ དལཝ་/ཁོམ་མེད་ཀྱི་བརྡ་དོན་དྲི་དཔྱད་འབད།"
 
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:13
+#: ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
-msgstr "ལས་འགན་ས་སྒོ། (_o)"
+msgstr "ལས་འགན་ས་སྒོ་ལུ། (_o)"
 
 #: ../ui/evolution-event-editor.xml.h:16
 msgid "Show time as _busy"
 msgstr "ཆུ་ཚོད་ཁོམ་མེད་སྦེ་སྟོན། (_b)"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:17
+#: ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
-msgstr "ཆུ་ཚོད་ཀྱི་གླིང་སྡེ། (_Z) "
+msgstr "ཆུ་ཚོད་གླིང་སྡེ་: (_Z) "
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:18
+#: ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "ངོ་འཛོམས་པའི་དབྱེ་བའི་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ངོ་འཛོམས་པའི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:19
+#: ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
-msgstr "ངོས་ལན་གྱི་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ངོས་ལན་གྱི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:20
+#: ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
-msgstr "ལས་འགན་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ལས་འགན་གྱི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:21
+#: ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
-msgstr "གནས་ཚད་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "གནས་ཚད་ཀྱི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:22
+#: ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
-msgstr "ཆུ་ཚོད་གླིང་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ཆུ་ཚོད་གླིང་སྡེ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
-msgstr "དབྱེ་རིམ་ཚུ་ བཀྲམ་སྟོན་འབད་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "དབྱེ་བ་ཚུ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to have All Day Event"
-msgstr "ཉིནམ་གང་གི་བྱུང་ལས་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ཉིནམ་གང་གི་འབྱུང་ལས་ཡོད་དགོཔ་ཨིན་ན་མེན་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to show time as busy"
-msgstr "ཆུ་ཚོད་ཁོམ་མེད་སྦེ་ སྟོན་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ཆུ་ཚོད་ཁོམ་མེད་སྦེ་ སྟོན་ནི་ཨིན་ན་མེན་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:26
 msgid "_Alarms"
 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-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-event-editor.xml.h:29
+#: ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
-msgstr "གསང་བའི།(_C)"
+msgstr "གསང་བ།(_C)"
 
 #: ../ui/evolution-event-editor.xml.h:30
 msgid "_Free/Busy"
 msgstr "དལཝ/ཁོམ་མེད་: (_F)"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../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
+#: ../ui/evolution-event-editor.xml.h:32
+#: ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
-msgstr "ངོས་ལན།(_P)"
+msgstr "ངོས་ལན།(_R)"
 
 #: ../ui/evolution-event-editor.xml.h:33
 msgid "_Recurrence"
 msgstr "སླར་འབྱུང་།(_R)"
 
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:34
+#: ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
-msgstr "གནས་ཚད་ས་སྒོ།: (_S)"
+msgstr "གནས་ཚད་ས་སྒོ།(_S)"
 
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:35
+#: ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
-msgstr "དབྱེ་བའི་ས་སྒོ། (_T)"
+msgstr "དབྱེ་བའི་ས་སྒོ།(_T)"
 
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -18899,78 +18391,59 @@ msgstr "ཡིག་འཕྲིན་གསརཔ་ འཚག་ནིའི�
 msgid "Empty _Trash"
 msgstr "ཕྱགས་ཧོད་སྟོངམ་བཏོན། (_T)"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:8
+#: ../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
+msgid "Message _Preview"
+msgstr "འཕྲིན་དོན་སྔོན་ལྟ།(_P)"
+
+#: ../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
-msgid "Search F_olders"
-msgstr "སྣོད་འཛིན་ཚུ་ འཚོལ་ཞིབ་འབད།(_o)"
-
 #: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "འཕྲིན་དོན་སྔོན་ལྟ་སྟོན།(_P)"
+msgid "Search F_olders"
+msgstr "སྣོད་འཛིན་ཚུ་ འཚོལ་ཞིབ་འབད།"
 
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "འཕྲིན་དོན་སྔོན་ལྟ་ འཕྲིན་དོན་ཐོ་ཡིག་གི་འོག་ལུ་སྟོན།"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "འཕྲིན་དོན་སྔོན་ལྟ་ འཕྲིན་དོན་ཐོ་ཡིག་ནང་དང་གཅིག་ཁར་ ཟུར་ཁར་སྟོན།"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "འཕྲིན་དོན་སྔོན་ལྟའི་ སྒོ་སྒྲིག་སྟོན།"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ཐག་རིང་སར་བར་གུ་ སྣོད་འཛིན་ཚུ་ མཁོ་མངགས་འབད་བའམ་ མངགས་བཤོལ་འབད།"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "སྔོན་སྲོལ་མཐོང་སྣང་།(_C)"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "སྣོད་འཛིན་ཚུ་ འདྲ་བཤུས་རྐྱབས་ས་...(_C)"
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
-msgstr "འཕྲིན་དོན་གྱི་ཚགས་མ་ཚུ།(_F)"
+msgstr "འཕྲིན་དོན་གྱི་ཚགས་མ་ཚུ།(_M)"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "སྣོད་འཛིན་སྤོ་བཤུད་འབད་ས་...(_M)"
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "གསརཔ་...(_N)"
 
-#: ../ui/evolution-mail-global.xml.h:23
-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:23
 msgid "_Subscriptions"
-msgstr "མཁོ་མངགས་དངུལ།(_S)"
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "ཀེར་ཕྲང་མཐོང་སྣང་།(_V)"
+msgstr "མངགས་དངུལ།(_S)"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
@@ -18982,7 +18455,7 @@ msgstr "སྣོད་འཛིན་འདི་གི་ རྒྱུ་ད�
 
 #: ../ui/evolution-mail-list.xml.h:3
 msgid "Collapse All _Threads"
-msgstr "ཐེ་རེཌི་ཆ་མཉམ་ཧྲམ་གཏང་(_T)"
+msgstr "ཐེ་རེཌི་ཆ་མཉམ་ཧྲམ་གཏང་།(_T)"
 
 #: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
@@ -18999,7 +18472,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོ�
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "ཐེརེཌི་ཆ་མཉམ་རྒྱ་འཕར།(_x)"
+msgstr "ཐེརེཌི་ཆ་མཉམ་ རྒྱ་འཕར་འབད།(_x)"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
@@ -19007,11 +18480,11 @@ msgstr "ཕྱིར་བསྐྲད། (_x)"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "འཕྲིན་དོན་ཐེ་རེཌི་ཆ་མཉམ་རྒྱ་འཕར།"
+msgstr "འཕྲིན་དོན་གྱི་ཐེརེཌི་ཆ་མཉམ་རྒྱ་འཕར།"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
-msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་ཚུ་སྦ་བཞག (_e)"
+msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་ཚུ་ སྦ་བཞག (_e)"
 
 #: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
@@ -19022,13 +18495,12 @@ 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
 msgid "Mar_k All Messages as Read"
-msgstr "འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ རྟགས་བཀལ། (_k)"
+msgstr "འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ། (_k)"
 
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
@@ -19056,8 +18528,7 @@ msgstr "ད་ལྟོ་སེལ་འཐུ་འབད་འཐུ་མ་
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"ཐེརེཌི་གཅིག་ནང་ཡོད་མི་ འཕྲིན་དོན་ཆ་མཉམ་རང་ སེལ་འཐུ་འབད་ཡོད་པའི་ འཕྲིན་དོན་བཟུམ་སྦེ་ སེལ་འཐུ་འབད།"
+msgstr "ཐེརེཌི་གཅིག་ནང་ཡོད་མི་ འཕྲིན་དོན་ཆ་མཉམ་རང་ སེལ་འཐུ་འབད་ཡོད་པའི་ འཕྲིན་དོན་བཟུམ་སྦེ་ སེལ་འཐུ་འབད།"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
@@ -19065,7 +18536,7 @@ msgstr "མཐོང་ཚུགས་པའི་ འཕྲིན་དོན�
 
 #: ../ui/evolution-mail-list.xml.h:25
 msgid "Sh_ow Hidden Messages"
-msgstr "སྦ་སྟེ་བཞག་མི་ འཕྲིན་དོན་ཚུ་སྟོན།(_o)"
+msgstr "སྦ་སྟེ་བཞག་མི་ འཕྲིན་དོན་ཚུ་སྟོན།"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
@@ -19087,7 +18558,8 @@ msgstr "ཐེ་རེཌི་འབད་མི་ འཕྲིན་དོ�
 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:32
+#: ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "འཕྲིན་དོན།(_M)"
@@ -19179,7 +18651,7 @@ msgstr "དོན་ཚན་འདི་གི་ཐོག་ལས་ འཕ�
 
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་བཏོག་ཏེ་ འཛིན་པང་གུ་བཀལ།"
+msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་བཏོགས་ཏེ་ འཛིན་པང་གུ་བཀལ།"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
@@ -19215,7 +18687,7 @@ msgstr "ཧེ་མའི་འཕྲིན་དོན་ མ་ལྷག་�
 
 #: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
-msgstr "བཟུམ་སྦེ་ གདོང་བསྐྱོད་འབད་...(_o)"
+msgstr "བཟུམ་སྦེ་གདོང་བསྐྱོད་འབད་...(_o)"
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
@@ -19239,7 +18711,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོ�
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་ ཟུར་རྟགས་བཀལ།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ལུ་ ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་ ཟུར་རྟགས་བཀལ།"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -19255,8 +18727,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོ�
 
 #: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
-msgstr ""
-"སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ ལན་གསལ་བཟུམ་ཅིག་སྦེ་ ལུང་འདྲེན་གྱི་རྟགས་ནང་ བཙུགས་མི་དེ་ གདོང་བསྐྱོད་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ ལན་གསལ་བཟུམ་ཅིག་སྦེ་ ལུང་འདྲེན་གྱི་རྟགས་ནང་ བཙུགས་མི་དེ་ གདོང་བསྐྱོད་འབད།"
 
 #: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
@@ -19292,7 +18763,7 @@ msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན
 
 #: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ མ་ལྷགཔ་སྦེ་རྟགས་བཀལ།"
 
 #: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages as unimportant"
@@ -19304,11 +18775,11 @@ msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོ�
 
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་གཞན་ཅིག་ལུ་སྤོ་བཤུད་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་གཞན་ཅིག་ལུ་ སྤོ་བཤུད་འབད།"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
-msgstr "འཕྲིན་དོན་གལ་ཅན་ ཤུལ་མམ། (_I)"
+msgstr "འཕྲིན་དོན་གལ་ཅན་ཤུལ་མམ། (_I)"
 
 #: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
@@ -19316,7 +18787,7 @@ msgstr "ཐེརེཌི་ཤུལ་མམ། (_T)"
 
 #: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
-msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཤུལ་མམ།"
+msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཤུལ་མམ།(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
@@ -19328,11 +18799,11 @@ msgstr "ཡིག་འཕྲིན་གྱི་ འཕྲིན་དོན�
 
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
-msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་དེ་སྒོ་སྒྲིག་གསརཔ་ཅིག་ནང་ཁ་ཕྱེ།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ སྒོ་སྒྲིག་གསརཔ་ཅིག་ནང་ཁ་ཕྱེ།"
 
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected messages in the composer for editing"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཞུན་དག་གི་དོན་ལུ་ རྩོམ་མཁན་ནང་ལུ་ཁ་ཕྱེ།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཞུན་དག་གི་དོན་ལུ་རྩོམ་མཁན་ནང་ཁ་ཕྱེ།"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
@@ -19340,7 +18811,7 @@ msgstr "ཧེ་མའི་ འཕྲིན་དོན་མ་ལྷགཔ�
 
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
-msgstr "འཛིན་པང་ནང་ལས འཕྲིན་དོན་ཚུ་སྦྱར།"
+msgstr "འཛིན་པང་ནང་ལས་ འཕྲིན་དོན་ཚུ་སྦྱར།"
 
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
@@ -19384,7 +18855,7 @@ msgstr "ཚིག་ཡིག་དེ་ ཧེ་མའི་ཚད་གུ�
 
 #: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the selected messages as a text file"
-msgstr "སེ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཚིག་ཡིག་ཡིག་སྣོད་ཅིག་སྦེ་སྲུངས།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཚིག་ཡིག་ཡིག་སྣོད་ཅིག་སྦེ་སྲུངས།"
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
@@ -19428,7 +18899,7 @@ msgstr "འཕྲིན་དོན་ཚུ་སྤྱིར་བཏང་བ
 
 #: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
-msgstr "འཕྲིན་དོན་ཚུ་གློག་འཕྲིན་མགོ་ཡིག་ཆ་མཉམ་དང་སྦྲགས་ཏེ་སྟོན།"
+msgstr "འཕྲིན་དོན་ཚུ་གློག་འཕྲིན་མགོ་ཡིག་ ཆ་མཉམ་དང་སྦྲགས་ཏེ་སྟོན།"
 
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
@@ -19440,7 +18911,7 @@ msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན
 
 #: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
-msgstr "གལ་ཅན་མེནམ།(_m)"
+msgstr "གལ་ཅན་མེནམ།(_i)"
 
 #: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
@@ -19492,7 +18963,7 @@ msgstr "གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་�
 
 #: ../ui/evolution-mail-message.xml.h:117
 msgid "_Message Source"
-msgstr "འཕྲིན་དོན་འབྱུང་ཁུངས།(_M)"
+msgstr "འཕྲིན་དོན་གྱི་འབྱུང་ཁུངས།(_M)"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
@@ -19516,7 +18987,7 @@ msgstr "ཧེ་མའི་འཕྲིན་དོན། (_P)"
 
 #: ../ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
-msgstr "འདྲེན་རྟགས་ནང་བཀོད་ཡོདཔ།(_Q)"
+msgstr "འདྲེན་རྟགས་བཀོད་ཡོདཔ།(_Q)"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
@@ -19531,28 +19002,26 @@ msgid "_Unread"
 msgstr "མ་ལྷགཔ།(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "རྒྱས་ཟུམ།(_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "ཕྱིར་རྒྱས།(_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "སྒོ་སྒྲིག་འདི་ ཁ་བསྡམས།"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "ལག་ཆས་ཕྲ་རིང་གཙོ་བོ།"
 
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
-msgstr "སེལ་འཐུ་འབད་མི་བརྗེན་ཐོ་འདྲ་བཤུས་རྐྱབས།"
+msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་ཐོ་འདྲ་བཤུས་རྐྱབས།"
 
 #: ../ui/evolution-memos.xml.h:5
 msgid "Cut selected memo"
-msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་བཏོག"
+msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་ཐོ་བཏོག་གཏང་།"
 
 #: ../ui/evolution-memos.xml.h:7
 msgid "Delete selected memos"
@@ -19560,15 +19029,15 @@ msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་ཐོ་
 
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
-msgstr "འཛིན་པང་ནང་ལས་བརྗེད་ཐོ་སྦྱར།"
+msgstr "འཛིན་པང་ནང་ལས་ ཚིག་ཡིག་སྦྱར།།"
 
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
-msgstr "དཔར་བསྐྲུན་འབད་ནིའི་ བརྗེད་ཐོ་ཚུ་གི་ཐོ་ཡིག་ སྔོན་ལྟ་འབདཝ་ཨིན།"
+msgstr "དཔར་བསྐྲུན་འབད་ནིའི་བརྗེད་ཐོ་ཚུ་གི་ཐོ་ཡིག་ སྔོན་ལྟ་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
-msgstr "བརྗེད་ཐོ་ཚུ་གི་ཐོ་ཡིག་དཔར་བསྐྲུན་འབད།"
+msgstr "བརྗེད་ཐོ་ཚུ་གི་ཐོ་ཡིག་ དཔར་བསྐྲུན་འབད།"
 
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
@@ -19611,12 +19080,17 @@ msgstr "རྩ་སྒྲིག (_m)"
 
 #: ../ui/evolution-message-composer.xml.h:9
 msgid "Get delivery notification when your message is read"
-msgstr "ཁྱོད་ཀྱི་འཕྲིན་དོན་ལྷག་ཚརཝ་དང་ འགྲེམ་སྤེལ་བརྡ་དོན་ལེན།"
+msgstr "ཁྱོད་ཀྱི་འཕྲིན་དོན་ལྷག་པའི་སྐབས་ འགྲེམ་སྤེལ་གྱི་བརྡ་དོན་ལེན།"
 
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ། (_M)"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "བཙུགས། (_n)"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "ཡིག་སྣོད་ཅིག་ཁ་ཕྱེ།"
@@ -19692,7 +19166,7 @@ msgstr "ཡིག་འཕྲིན་འདི་གཏང་།"
 
 #: ../ui/evolution-message-composer.xml.h:32
 msgid "Set the message priority to high"
-msgstr "འཕྲིན་དོན་གྱི་གཙོ་རིམ་མཐོ་སར་གཞི་སྒྲིག་འབད།"
+msgstr "འཕྲིན་དོན་གྱི་གཙོ་རིམ་ མཐོ་དྲགས་སྦེ་གཞི་སྒྲིག་འབད།"
 
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
@@ -19704,7 +19178,7 @@ msgstr "འཕྲིན་དོན་འདི་ ཁྱོད་རའི་ �
 
 #: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the BCC field is displayed"
-msgstr "མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "བི་སི་སི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the CC field is displayed"
@@ -19728,7 +19202,7 @@ msgstr "གཏང་ཡུལ་གྱི་་སྒོ་དེ་ བཀྲ�
 
 #: ../ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
-msgstr "མཐོང་མེད་ཤོག་ནག་འདྲ་བཤུས་ས་སྒོ། (_B)"
+msgstr "བི་སི་སི་ས་སྒོ། (_B"
 
 #: ../ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
@@ -19748,11 +19222,11 @@ msgstr "ཁ་ཕྱེ་...(_O)"
 
 #: ../ui/evolution-message-composer.xml.h:50
 msgid "_Post-To Field"
-msgstr "ས་སྒོ་ལུ་གནས་བསྐྱོད་འབད། (_P)"
+msgstr "ས་སྒོ་ལུ་-གནས་བསྐྱོད་འབད། (_P)"
 
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Prioritize Message"
-msgstr "འཕྲིན་དོན་གཙོ་རིམ་བཟོ།(_P)"
+msgstr "འཕྲིན་དོན་གྱི་གཙོ་རིམ་བཟོ།(_P)"
 
 #: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
@@ -19768,7 +19242,7 @@ msgstr "ས་སྒོ་ལུ། (_T)"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
-msgstr "ཁ་བསྡམས། (_l)"
+msgstr "ཁ་བསྡམས། (_C)"
 
 #: ../ui/evolution-signature-editor.xml.h:15
 msgid "H_TML"
@@ -19815,15 +19289,15 @@ msgstr "མཁོ་མངགས་བཤོལ།"
 
 #: ../ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
-msgstr "སེལ་འཐུ་འབད་མི་ འདྲེན་རྟགས་ནང་བཙུགས། (_I)"
+msgstr "སེལ་འཐུ་འབད་མི་ གནས་ལོག་འབད། (_I)"
 
 #: ../ui/evolution-task-editor.xml.h:4
 msgid "Click change / view the status details of the task"
-msgstr "ལས་ཀའི་རྒྱས་བཤད་གནས་ཚད་ སོར་/སྟོན་ལུ་ ཨེབ་གཏང་འབད།"
+msgstr "ལས་ཀའི་གནས་ཚད་རྒྱས་བཤད བསྒྱུར་བཅོས་འབད་ནི་/སྟོན་ནིའི་དོན་ལུ་ ཨེབ་གཏང་འབད།"
 
 #: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
-msgstr "གནས་ཚད་ཀྱི་རྒྱས་བཤད།"
+msgstr "གནས་ཚད་རྒྱས་བཤད།"
 
 #: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
@@ -19835,15 +19309,15 @@ msgstr "གདམ་ཁ་ཚུ་གཏང་།(_S)"
 
 #: ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Details"
-msgstr "གནས་ཚད་ཀྱི་རྒྱས་བཤད་ཚུ།(_S)"
+msgstr "གནས་ཚད་རྒྱས་བཤད།(_S)"
 
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
-msgstr "སེལ་འཐུ་འབད་མི་ལས་ཀ་ཚུ་ འདྲ་བཤུས་རྐྱབས།"
+msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་འདྲ་བཤུས་རྐྱབས།"
 
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
-msgstr "སེལ་འཐུ་འབད་མི་ལས་ཀ་ཚུ་བཏོག"
+msgstr "སེལ་འཐུ་འབད་མི་ལས་ཀ་ཚུ་བཏོག་གཏང་།"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -19855,7 +19329,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ལས་ཀ་ཚུ་ �
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
-msgstr "མཇུག་བསྡུཝ་སྦེ་ རྟགས་བཀལ། (_k)"
+msgstr "མཇུག་བསྡུཝ་སྦེ་རྟགས་བཀལ། (_k)"
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
@@ -19863,7 +19337,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་ �
 
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
-msgstr "འཛིན་པང་ནང་ལས་ལས་ཀ་ཚུ་སྦྱར།"
+msgstr "འཛིན་པང་ནང་ལས་ ལས་ཀ་ཚུ་སྦྱར།"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
@@ -19875,7 +19349,7 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་ དཔར་བསྐྲུ�
 
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
-msgstr "ལས་ཀ་སྔོན་ལྟའི་སྒོ་སྒྲིག་སྟོན།"
+msgstr "འབྲེལ་ས་སྔོན་ལྟའི་ སྒོ་སྒྲིག་སྟོན།"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
@@ -19927,9 +19401,7 @@ msgstr "ལས་རིམ་དེ་ ཕྱིར་འཐོན་འབད�
 
 #: ../ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"སེམས་ཁར་བཞག་མི་ ཆོག་ཡིག་ཚུ་ སེམས་ཁར་མ་བཞག་པ་ཅིན་ དེ་གི་དོན་ལུ་ ཁྱོད་ལུ་ལོག་སྟེ་རང་ ནུས་སྤེལ་འབད་"
-"འོང་།"
+msgstr "སེམས་ཁར་བཞག་མི་ ཆོག་ཡིག་ཚུ་ སེམས་ཁར་མ་བཞག་པ་ཅིན་ དེ་གི་དོན་ལུ་ ཁྱོད་ལུ་ལོག་སྟེ་རང་ ནུས་སྤེལ་འབད་འོང་།"
 
 #: ../ui/evolution.xml.h:12
 msgid "Hide window buttons"
@@ -19941,57 +19413,49 @@ msgstr "ནང་འདྲེན་འབད་...(_m)"
 
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
-msgstr "ངོས་དཔར་དང་ཚིག་ཡིག (_a)"
+msgstr "ངོས་དཔར་དང་ ཚིག་ཡིག (_a)"
 
 #: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr "ལས་རིམ་གཞན་ཚུ་ནང་ལས་ གནད་སྡུད་ནང་འདྲེན་འབད།"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "སྒྲིག་བཀོད། (_y)"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "སྒོ་སྒྲིག་གསརཔ། (_W)"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "དགའ་གདམ་ཚུ། (_n)"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "གཏོང་/ལེན།"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "གཏོང་/ལེན།(_R)"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "གྲལ་རིམ་ནང་ཡོད་མི་ རྣམ་གྲངས་ཚུ་ གཏང་ཞིནམ་ལས་ རྣམ་གྲངས་གསརཔ་ཚུ་ སླར་འདྲེན་འབད།"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "པའི་ལོཊི་གི་རིམ་སྒྲིག་ གཞི་སྒྲིག་འབད།"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་སྐོར་ལས་ བརྡ་དོན་ཚུ་སྟོན།"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "ཟུར་ཁའི་ཕྲ་རིང་སྟོན།(_B)"
+msgid "Side _Bar"
+msgstr "ཟུར་ཁའི་ཕྲ་རིང་།(_B)"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "གནས་ཚད་ཕྲ་རིང་སྟོན།(_S)"
+msgid "Status _Bar"
+msgstr "གནས་ཚད་ཕྲ་རིང་།(_B)"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "ལག་ཆས་ཕྲ་རིང་སྟོན། (_T)"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་སྐོར་ལས་ བརྡ་དོན་ཚུ་སྟོན།"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "རྐྱེན་གྱི་སྙན་ཞུ་བཙུགས།"
 
@@ -19999,77 +19463,81 @@ msgstr "རྐྱེན་གྱི་སྙན་ཞུ་བཙུགས།"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "རྐྱེན་གྱི་སྙན་ཞུ་བཙུགས། (_B)"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "བཱག་བ་ཌི་ ལག་ལེན་འཐབ་སྟེ་ རྐྱེན་གྱི་སྙན་ཞུ་ཅིག་བཙུགས།"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "ང་བཅས་ ཨོཕ་ལ་ཡིན་ནང་ ལཱ་འབདཝ་ཨིནམ་མེནམ་ སོར་སྟོན་འབདཝ་ཨིན།"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "ལག་ཆས་ ཕྲ་རིང་། (_b)"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "ལག་ཆས་ ཕྲ་རིང་གི་ བཟོ་རྣམ། (_b)"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
-msgstr "ཟུར་ཁའི་ཕྲ་རིང་སྟོན་/སྦ་བཞག"
+msgstr "ཟུར་ཁའི་ཕྲ་རིང་སྟོན་/སྦ།"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
-msgstr "གནས་ཚད་ཕྲ་རིང་སྟོན་/སྦ་བཞག"
+msgstr "གནས་ཚད་ཕྲ་རིང་སྟོན་/སྦ།"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "སྐོར་ལས། (_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "སྒོ་སྒྲིག་ཁ་བསྡམས།(_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
-msgstr "ཆོག་ཡིག་ཚུ་སེམས་ཁར་མ་བཞག (_F)"
+msgstr "ཆོག་ཡིག་ཚུ་ སེམས་ཁར་མ་བཞག (_P)"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
-msgstr "ཨེབ་རྟ་ཚུ་ སྦ་བཞག (_H)"
+msgstr "ཨེབ་རྟ་ཚུ་སྦ་བཞག (_H)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "ངོས་དཔར་རྐྱངམ་གཅིག (_I)"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "འཕྲལ་མྱུར་གཞི་བསྟུན། (_Q)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "སྤངས།(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "སོར་སྒྱུར་འབད་མིའི་འབྱུང་སྣང་།(_S)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "མཉམ་འབྱུང་གི་གདམ་ཁ་ཚུ་...(_S)"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "ཚིག་ཡིག་རྐྱངམ། (_T"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "སྒོ་སྒྲིག (_W)"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
-msgstr "ཚོང་སྡེའི་ཐོག་ལས། (_C)"
+msgstr "ཚོང་སྡེ་གིས། (_C)"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
@@ -20081,7 +19549,7 @@ msgstr "བརྒྱུད་འཕྲིན་ཐོ་ཡིག (_P)"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "བདུན་ཕྲག་གི་མཐོང་སྣང་། (_e)"
+msgstr "བདུན་ཕྲག་གི་མཐོང་སྣང་། (_W)"
 
 #: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
@@ -20100,34 +19568,26 @@ msgid "_Work Week View"
 msgstr "ལཱ་གི་བདུན་ཕྲག་གི་མཐོང་སྣང་། (_W)"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "རྒྱ་ཅན་མཐོང་སྣང་གི་དོན་ལུ་ བཏང་ཡོད་པའི་སྣོད་འཛིན་བཟུམ་སྦེ། (_d)"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "བཏང་ཡོད་པའི་ སྣོད་འཛིན་བཟུམ་སྦེ། (_S)"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
-msgstr "གནས་ཚད་ཐོག་ལས། (_t)"
+msgstr "གནས་ཚད་ཐོག་ལས། (_t"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "གཏོང་མཁན་ཐོག་ལས།(_n)"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "དོན་ཚན་ཐོག་ལས། (_b)"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "ཤུལ་དཔྱད་ ཟུར་རྟགས་ཐོག་ལས། (_F)"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "རྒྱ་ཅན་མཐོང་སྣང་གི་དོན་ལུ།(_W)"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "འཕྲིན་དོན་ཚུ།(_M)"
 
@@ -20143,12 +19603,8 @@ 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "ཡུ་ཊི་སི།"
 
@@ -20170,12 +19626,9 @@ msgstr "དུས་ཚོད་གླིང་སྡེའི་ བརྟག�
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
-msgstr ""
-"ས་ཁྲའི་ས་ཁོངས་ཅིག་ནང་ནང་ཟུམ་སྦེ་ དུས་ཚོད་གླིང་སྡེ་ཅིག་ སེལ་འཐུ་འབད་ནིའི་དོན་ལུ་ མའུསི་གི་ ཨེབ་རྟ་"
-"གཡོནམ་ ལག་ལེན་འཐབ།"
+msgstr "ས་ཁྲའི་ས་ཁོངས་ཅིག་ནང་ནང་ཟུམ་སྦེ་ དུས་ཚོད་གླིང་སྡེ་ཅིག་ སེལ་འཐུ་འབད་ནིའི་དོན་ལུ་ མའུསི་གི་ ཨེབ་རྟ་གཡོནམ་ ལག་ལེན་འཐབ།"
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:188
@@ -20203,7 +19656,7 @@ msgid "_Edit..."
 msgstr "ཞུན་དག་...(_E)"
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20217,11 +19670,11 @@ msgstr "དུས་སྐབས།"
 msgid "Save Current View"
 msgstr "ད་ལྟོའི་མཐོང་སྣང་སྲུངས།"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "མཐོང་སྣང་གསརཔ་ གསར་བསྐྲུན་འབད།(_C)"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "གནས་བཞིན་པའི་མཐོང་སྣང་གི་ཚབ་བཙུགས།(_R)"
 
@@ -20268,19 +19721,14 @@ msgstr "མཐོང་སྣང་གི་དབྱེ་བ།"
 msgid "Type of view:"
 msgstr "མཐོང་སྣང་གི་དབྱེ་བ་:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "མཉམ་སྦྲགས་རང་བཞིན་གྱིས་ བཀྲམ་སྟོན་འབད་ནིའི་ བསམ་འཆར་བཀོད།"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "ཨེམ་ཊི་ཌབ་ལུ་ཊི་ཨེཕ་ཨེསི་ཨེསི།"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20289,8 +19737,10 @@ msgid "Month Calendar"
 msgstr "ཟླ་བའི་ཟླ་ཐོ།"
 
 #: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:458
+#: ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285
+#: ../widgets/text/e-text.c:3563
 #: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "ཚོས་གཞི་བཀང་།"
@@ -20298,17 +19748,23 @@ msgstr "ཚོས་གཞི་བཀང་།"
 #: ../widgets/misc/e-canvas-background.c:464
 #: ../widgets/misc/e-canvas-background.c:465
 #: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/misc/e-canvas-background.c:472
+#: ../widgets/text/e-entry.c:1291
+#: ../widgets/text/e-entry.c:1292
+#: ../widgets/text/e-entry.c:1298
+#: ../widgets/text/e-entry.c:1299
+#: ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3578
 #: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "ཇི་ཌི་ཀེ་གིས་བཀང་བའི་ཚོས་གཞི།"
 
 #: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/misc/e-canvas-background.c:479
+#: ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306
+#: ../widgets/text/e-text.c:3585
 #: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "ཚག་ཐིག་བཀང་།"
@@ -20333,26 +19789,30 @@ msgstr "ཝའི་༡"
 msgid "Y2"
 msgstr "ཝའི་༢།"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/misc/e-canvas-vbox.c:102
+#: ../widgets/misc/e-reflow.c:1429
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "རྒྱ་ཚད་ཉུང་མཐའ།"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/misc/e-canvas-vbox.c:103
+#: ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "ཉུང་མཐའི་རྒྱ་ཚད།"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:114
+#: ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "བར་སྟོང་བཞག་ཐངས།"
 
 #: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "ད་ལྟོ།"
 
@@ -20417,13 +19877,16 @@ msgstr "ཝེསི་ཊརན་ ཡུ་རོ་པི་ཡཱན།"
 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:93
+#: ../widgets/misc/e-charset-picker.c:94
 #: ../widgets/misc/e-charset-picker.c:95
 msgid "Traditional"
 msgstr "སྔོན་སྲོལ་གྱི།"
 
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
-#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
 msgid "Simplified"
 msgstr "འཇམ་སམ་བཟོ་བཟོཝ།"
 
@@ -20480,134 +19943,111 @@ msgstr "ཆུ་ཚོད་སེལ་འཐུ་འབད་ནིའི་
 msgid "Time"
 msgstr "ཆུ་ཚོད།"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "ད་ལྟོ།(_w)"
-
-#: ../widgets/misc/e-dateedit.c:467
-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
+#: ../widgets/misc/e-dateedit.c:1436
+#: ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439
+#: ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "རྒྱ་བསྐྱེད་འབད་ཡོདཔ།"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "རྒྱ་སྐྱེད་པ་དེ་ རྒྱ་བསྐྱེད་འབད་ག་མ་འབད།"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "རྒྱ་སྐྱེད་པའི་ ཁ་ཡིག་གི་ཚིག་ཡིག"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "འོག་ཐིག་ལག་ལེན་འཐབ།"
 
-#: ../widgets/misc/e-expander.c:199
-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:198
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgstr "གཞི་སྒྲིག་འགྱོ་བ་ཅིན་ ཚིག་ཡིག་ནང་གི་ འོག་ཐིག་ཅིག་གིས་ དྲན་སྐྱེད་མགྱོགས་སྤྱོད་པའི་ ལྡེ་མིག་གི་དོན་ལུ་ ལག་ལེན་འཐབ་དགོ་པའི་ ཤུལ་མའི་ཡིག་འབྲུ་དེ་ བརྡ་སྟོནམ་ཨིན།"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "ཁ་ཡིག་དང་ ཅ་ཡེལ་གྱི་བར་ན་ བཙུགས་ནིའི་བར་སྟོང་།"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "ཁ་ཡིག་གི་ ཝི་གེཊི།"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "སྤྱིར་བཏང་རྒྱ་སྐྱེད་པའི་ ཁ་ཡིག་ཚབ་ལུ་ བཀྲམ་སྟོན་འབད་ནིའི་ ཝི་གེཊི་ཅིག"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222
+#: ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "རྒྱ་སྐྱེད་པའི་ཚད།"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223
+#: ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "རྒྱ་སྐྱེད་པའི་ མདའ་རྟགས་ཀྱི་ཚད།"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "བརྡ་སྟོན་པའི་ བར་སྟོང་བཞག་ཐངས།"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "རྒྱ་སྐྱེད་པའི མདའ་རྟགས་མཐའ་སྐོར་ལུ་ བར་སྟོང་བཞག་ཐངས།"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "མཐོ་རིམ་ཅན་གྱི་འཚོལ་ཞིབ།"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "འཚོལ་ཞིབ་སྲུངས།"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "འཚོལ་ཞིབ་ཚུ། (_S)"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
-msgstr "འཚོལ་ཞིབ་ཚུ། "
+msgstr "འཚོལ་ཞིབ་ཚུ།"
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "འཚོལ་ཞིབ་སྲུངས།"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:92
+#: ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
-msgstr "འཚོལ་ཞིབ་སྲུངས་...(_S)"
+msgstr "འཚོལ་ཞིབ་སྲུངས་...(_S"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93
+#: ../widgets/misc/e-filter-bar.h:100
 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:94
+#: ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "མཐོ་རིམ་ཅན་གྱི་འཚོལ་ཞིབ་...(_A)"
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "རྩིས་ཐོ་ཆ་མཉམ།"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "ད་ལྟོའི་རྩིས་ཐོ།"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "ད་ལྟོའི་སྣོད་འཛིན།"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "ད་ལྟོའི་འཕྲིན་དོན།"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "གཟུགས་བརྙན་ གདམ་ཁ་རྐྱབས།"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "འཛམ་གླིང་ས་ཁྲ།"
 
-#: ../widgets/misc/e-map.c:631
-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:629
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
 msgstr "དུས་ཚོད་གླིང་སྡེ་ སེལ་འཐུ་འབད་འཐུའི་དོན་ལུ་ མའུསི་ལུ་བརྟེན་པའི་ ཕན་ཚུན་འབྲེལ་བའི་ ས་ཁྲའི་ཝི་གེཊི།"
 
 #: ../widgets/misc/e-pilot-settings.c:103
@@ -20622,57 +20062,63 @@ msgstr "སྒེར་གྱི་དྲན་ཐོ་ཚུ་ མཉམ་�
 msgid "Sync Categories:"
 msgstr "དབྱེ་རིམ་ཚུ་ མཉམ་འབྱུང་འབད་:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1451
+#: ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "འཕྲིན་དོན་སྟོངམ་བཏོན།"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1458
+#: ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr "སླར་འབབ་ཀྱི་དཔེ།"
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1465
+#: ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "ཀེར་ཐིག་གི་རྒྱ་ཚད།"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "འཚོལ་ཞིབ།"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
-msgstr "འཚོལ་ཞིབ་འབད། (_S)"
+msgstr "འཚོལ་ཞིབ་འབད། (_S"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "ད་ལྟོ་རང་འཚོལ། (_F)"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595
+#: ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "བསལ། (_C)"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "འཚོལ་ཞིབ་དབྱེ་བ།"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "རྣམ་གྲངས་གྱི་ཨའི་ཌི"
 
-#: ../widgets/misc/e-search-bar.c:792 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "རྣམ་གྲངས་ཡན་ལག་གི་ཨའི་ཌི"
+
+#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250
+#: ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "ཚིག་ཡིག"
 
-#. 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:911
-msgid "Show: "
-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:927
-msgid "S_earch: "
-msgstr "འཚོལ་ཞིབ་:(_e)"
-
-#. 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:938
-msgid " in "
-msgstr "ནང་ན།"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "ད་ལྟོ་རང་འཚོལ། (_N)"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20721,13 +20167,12 @@ msgid "A_uto-delete sent item"
 msgstr "རང་བཞིན་གྱིས་བཏོན་གཏང་བའི་ རྣམ་གྲངས་བཏང་ཡོདཔ། (_u)"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-#, fuzzy
-msgid "Classification"
-msgstr "དབྱེ་བཟོ། (_C)"
+msgid "C_lassification"
+msgstr "དབྱེ་བཟོ། (_l)"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
-msgstr "ཊེཀ་གི་བརྡ་དོན་ལུ་ བཏང་ཡོད་པའི་ རྣམ་གྲངས་ཅིག་བཟོ།(_e)"
+msgstr "བརྡ་དོན་རྗེས་འཚོལ་འབད་ནི་ལུ་ བཏང་ཡོད་པའི་རྣམ་གྲངས་ཅིག་ གསར་བསྐྲུན་འབད།(_e)"
 
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
@@ -20747,23 +20192,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
+"མི་མང་གི་།\n"
+"སྒེར་གྱི།\n"
+"གསང་བའི།\n"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
-msgstr "ལན་གསལ་གྱི་ཞུ་བ་ཡོད། (_e)"
+msgstr "ལན་གསལ་གྱི་ཞུ་བ་འབད་ཡོད། (_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "གནས་ཚད་རྗེས་འཚོལ་འབད་དོ།(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -20775,51 +20220,51 @@ msgstr ""
 "ཚད་ལྡན།\n"
 "དམའ་བ།"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "ནམ་དང་ལེན་འབད་ཡོདཔ་:(_p)"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "མཇུག་བསྡུཝ་ད་: (_m)"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "ནམ་ཁག་མ་བཟེདཔ་: (_n)"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "ནང་འཁོད། (_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "ཤུལ་ལས་: (_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "བརྡ་དོན་ཆ་མཉམ། (_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "འཕྲིན་དོན་འགྲེམ་སྤེལ་ ཕྱིར་འགྱངས་འབད། (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "འགྲེམ་སྤེལ་འབད་ཡི། (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "དུས་ཡོལ་ཚེས་གྲངས་གཞི་སྒྲིག་འབད། (_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "ཚུན་ཚོད་: (_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "བྱ་སྟབས་བདེ་སྐབས། (_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "ནམ་ཁ་ཕྱེ་ཡོདཔ། (_W)"
 
@@ -20835,7 +20280,7 @@ msgstr "%s (%d%% ཡོངས་བསྒྲུབས།)"
 
 #: ../widgets/misc/e-url-entry.c:107
 msgid "Click here to go to URL"
-msgstr "ཡུ་ཨར་ཨེལ་ལུ་འགྱོ་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ཡུ་ཨར་ཨེལ་ལུ་ འགྱོ་ནིའི་དོན་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
@@ -20873,23 +20318,23 @@ msgstr "ཆེད་དམིགས་འབད་བའི་ཀེར་ཐི
 msgid "Unselected Column"
 msgstr "སེལ་འཐུ་མ་འབད་མི་ཀེར་ཐིག"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "ཀེར་ཐིག་སྦུག་འབྲེག་འབད།"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "ཀེར་ཐིག་ལུ་འོག་ཐིག་འཐེན།"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "ཀེར་ཐིག་རྒྱགས་པ་བཟོ།"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "ཀེར་ཐིག་ཚོས་གཞང་གཏང་།"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "བི་ཇི་ཚོས་གཞི་འབད་མི་ཀེར་ཐིག"
 
@@ -20904,7 +20349,6 @@ 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
 msgid "Ascending"
 msgstr "ཡར་འཛེགས།"
 
@@ -20915,7 +20359,6 @@ 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 "Descending"
 msgstr "མར་འབབ།"
 
@@ -20982,11 +20425,13 @@ msgstr "དབྱེ་སེལ་...(_S)"
 msgid "State"
 msgstr "གནས་ལུགས།"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../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
+#: ../widgets/table/e-table-config.c:307
+#: ../widgets/table/e-table-config.c:349
 msgid "(Descending)"
 msgstr "(མར་འབབ)"
 
@@ -21008,19 +20453,19 @@ msgstr "ཐོག་ལས་སྡེ་ཚན་བཟོ་...(_G)"
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
-msgstr "ས་སྒོ་འདི་ཚུ་ གོ་རིམ་ནང་སྟོན་:(_S)"
+msgstr "ས་སྒོ་འདི་ཚུ་ གོ་རིམ་ནང་སྟོན།(_S)"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "ཌི་ཨེན་ཌི་་ཀོཌི།"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "མགོ་ཡིག་ཆ་ཚང་།"
 
@@ -21036,29 +20481,34 @@ msgstr "ས་སྒོ་འདེམས་བྱེད།"
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
-msgstr ""
-"ཁྱོད་རའི་ཐིག་ཁྲམ་ནང་ ཀེར་ཐིག་ཅིག་ ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་ལུ་ འདི་འདྲུད་ཞིནམ་ལས་ ག་ཏེ་ལུ་འབྱུང་དགོ་པའི་ "
-"གནས་ཁོངས་ལུ་སྐྱེལ།"
+msgstr "ཁྱོད་རའི་ཐིག་ཁྲམ་ནང་ ཀེར་ཐིག་ཅིག་ ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་ལུ་ འདི་འདྲུད་ཞིནམ་ལས་ ག་ཏེ་ལུ་འབྱུང་དགོ་པའི་ གནས་ཁོངས་ལུ་སྐྱེལ།"
 
-#: ../widgets/table/e-table-group-container.c:345
-#, fuzzy, c-format
+#: ../widgets/table/e-table-group-container.c:346
+#, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (རྣམ་གྲངས་%d)"
-msgstr[1] "%s : %s (རྣམ་གྲངས་%d)"
+msgstr "%s : %s (རྣམ་གྲངས་%d)"
 
-#: ../widgets/table/e-table-group-container.c:351
-#, fuzzy, c-format
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (རྣམ་གྲངས་%d)"
+
+#: ../widgets/table/e-table-group-container.c:352
+#, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (རྣམ་གྲངས་%d)"
-msgstr[1] "%s (རྣམ་གྲངས་%d)"
+msgstr "%s (རྣམ་གྲངས་%d)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%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-item.c:2973
+#: ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "གྲལ་ཐིག་གི་ཚོས་གཞི་སྤེལ་མ།"
 
@@ -21066,8 +20516,10 @@ msgstr "གྲལ་ཐིག་གི་ཚོས་གཞི་སྤེལ་
 #: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
-#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3265
+#: ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "ཐད་སྙོམས་ཀྱི་ཌཱ་གིརིཌི།"
 
@@ -21075,8 +20527,10 @@ msgstr "ཐད་སྙོམས་ཀྱི་ཌཱ་གིརིཌི།"
 #: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3271
+#: ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "ཀེར་ཕྲང་གི་ཌཱ་གིརིཌི།"
 
@@ -21084,8 +20538,10 @@ msgstr "ཀེར་ཕྲང་གི་ཌཱ་གིརིཌི།"
 #: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3277
+#: ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "ཆེད་དམིགས་བྲིས།"
 
@@ -21093,7 +20549,8 @@ msgstr "ཆེད་དམིགས་བྲིས།"
 #: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
+#: ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "འོད་རྟགས་ཐབས་ལམ།"
 
@@ -21101,7 +20558,8 @@ msgstr "འོད་རྟགས་ཐབས་ལམ།"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+#: ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "སེལ་འཐུའི་དཔེ།"
 
@@ -21109,8 +20567,10 @@ msgstr "སེལ་འཐུའི་དཔེ།"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
-#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3301
+#: ../widgets/table/e-tree.c:3259
 #: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
 msgstr "རིང་ཚད་ཀྱི་ཐེ་རེཤ་ཧཱོལ།"
@@ -21119,8 +20579,10 @@ msgstr "རིང་ཚད་ཀྱི་ཐེ་རེཤ་ཧཱོལ།"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3308
+#: ../widgets/table/e-tree.c:3291
 #: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
 msgstr "གཅིག་མཚུངས་ཀྱི་གྲལ་ཐག་མཐོ་ཚད།"
@@ -21132,87 +20594,88 @@ msgstr "གཅིག་མཚུངས་ཀྱི་གྲལ་ཐག་མཐ
 msgid "Frozen"
 msgstr "སྤར་མ་བཏུབ།"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "ད་ལྟོའི་མཐོང་སྣང་སྲོལ་སྒྲིག་འབད།"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "ཡར་འཛེགས་དབྱེ་སེལ་འབད།"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "མར་འབབ་དབྱེ་སེལ་འབད།"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "དབྱེ་སེལ་བཤོལ།"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "ས་སྒོ་འདི་གི་ཐོག་ལས་སྡེ་ཚན་བཟོ།"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "སྒྲོམ་གྱི་ཐོག་ལས་སྡེ་ཚན་བཟོ།"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "ཀེར་ཐིག་འདི་རྩ་བསྐྲད་གཏང་།"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "ཀེར་ཐིག་ཅིག་ཁ་སྐོང་རྐྱབས་..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "ཕྲང་སྒྲིག"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "ལེགས་སྒྲིག"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "ཀེར་ཐིག་ཚུ་རྩ་སྒྲིག་འབད་..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "ད་ལྟོའི་མཐོང་སྣང་སྲོལ་སྒྲིག་འབད་..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "དབྱེ་སེལ་འབད་ཐངས།"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812
+#: ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "ཡིག་གཟུགས་གཞི་སྒྲིག"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "དབྱེ་སེལ་གྱི་བརྡ་དོན།"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "རྩ་འབྲེལ།"
 
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#: ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "ཐིག་ཁྲམ་མགོ་ཡིག"
 
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "ཐིག་ཁྲམ་གྱི་དཔེ།"
 
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "འོད་རྟགས་གྲལ་ཐིག"
 
-#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table.c:3315
+#: ../widgets/table/e-tree.c:3298
 #: ../widgets/table/e-tree.c:3299
 msgid "Always search"
 msgstr "ཨ་རྟག་ར་འཚོལ་ཞིབ་འབད།"
@@ -21221,7 +20684,8 @@ msgstr "ཨ་རྟག་ར་འཚོལ་ཞིབ་འབད།"
 msgid "Use click to add"
 msgstr "ཁ་སྐོང་བརྐྱབ་ནི་ལུ་ ཨེབ་གཏང་ལག་ལེན་འཐབ།"
 
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr "ཨི་ཊི་ཐིག་ཁྲམ་མཐུན་བྱེད།"
 
@@ -21245,75 +20709,102 @@ msgstr "དྲ་བཤུས་བདག་ཆ་་ (C) ༢༠༠༠ ཧེ་
 msgid "This should test the minicard canvas item"
 msgstr "འདི་གིས་ཤོག་བྱང་ཆུང་བའི་ འབྲི་གཞི་དེ་ལུ་ བརྟག་ཞིབ་འབད་དགོ"
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
+#: ../widgets/text/e-entry.c:1242
+#: ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-text.c:3478
+#: ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "བྱུང་ལས་ཀྱི་ ལས་སྦྱོར་འཕྲུལ་ཆས།"
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
+#: ../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
+#: ../widgets/text/e-entry.c:1270
+#: ../widgets/text/e-entry.c:1271
 msgid "GDKFont"
 msgstr "ཇི་ཌི་ཀེ་ཡིག་གཟུགས།"
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
+#: ../widgets/text/e-entry.c:1277
+#: ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3514
+#: ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "ལྟེམས་བཅོས།"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-entry.c:1319
+#: ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "ཚིག་ཆད་ལག་ལེན་འཐབ།"
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-entry.c:1326
+#: ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "ཚིག་ཆད།"
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-entry.c:1333
+#: ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "གྱལ་རིམ་ལོག་མཚམས།"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-entry.c:1340
+#: ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "ཡིག་འབྲུ་ཚུ་བར་མཚམས་བཟོ།"
 
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-entry.c:1347
+#: ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "གྱལ་རིམ་མང་མཐའ།"
 
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-entry.c:1354
+#: ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "གྱལ་རིམ་གསརཔ་བཟོ་བཅུག"
 
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-entry.c:1361
+#: ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-text.c:3664
+#: ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "མཐའ་མཚམས་ཚུ་བྲིས།"
 
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-entry.c:1368
+#: ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "རྒྱབ་གཞི་བྲིས། "
 
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
+#: ../widgets/text/e-entry.c:1375
+#: ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-text.c:3685
+#: ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "ཨེབ་རྟ་བྲིས།"
 
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-entry.c:1382
+#: ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-text.c:3692
+#: ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "འོད་རྟགས་གནས་ས།"
 
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+#: ../widgets/text/e-entry.c:1389
+#: ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
 msgstr "ཁ་ཡིག་གི་ཚད་བསྐྱར་བཟོ་ ནུས་སྐྱེད་འབད།"
 
@@ -21321,140 +20812,87 @@ msgstr "ཁ་ཡིག་གི་ཚད་བསྐྱར་བཟོ་ ན�
 msgid "Input Methods"
 msgstr "ཨིན་པུཊི་ཐབས་ལམ་ཚུ།"
 
-#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
+#: ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "རྒྱགས་པ།"
 
-#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
+#: ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "སིཊའིཀ་ཨའུཊི།"
 
-#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
+#: ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "ཨེན་ཀོར།"
 
-#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
+#: ../widgets/text/e-text.c:3521
+#: ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "འཛིན་ལྕགས་ཀྱི་རྒྱ་ཚད།"
 
-#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
+#: ../widgets/text/e-text.c:3528
+#: ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "འཛིན་ལྕགས་ཀྱི་རྒྱ་ཚད།"
 
-#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
+#: ../widgets/text/e-text.c:3535
+#: ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "འཛིན་ལྕགས།"
 
-#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
+#: ../widgets/text/e-text.c:3542
+#: ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "འཛིན་ལྕགས་གྲུ་བཞི་ནར་མོ་བཀང་།"
 
-#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
+#: ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "ཨེགསི་པར་ལེན།"
 
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "ཝའི་པར་ལེན།"
 
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "ཚིག་ཡིག་གི་རྒྱ་ཚད།"
 
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "ཚིག་ཡིག་གི་མཐོ་ཚད།"
 
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3699
+#: ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "ཨའི་ཨེམ་སྐབས་དོན།"
 
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3706
+#: ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 
-#~ msgid "C_lassification"
-#~ msgstr "དབྱེ་བཟོ། (_l)"
-
-#~ msgid ""
-#~ "Public\n"
-#~ "Private\n"
-#~ "Confidential\n"
-#~ msgstr ""
-#~ "མི་མང་གི་།\n"
-#~ "སྒེར་གྱི།\n"
-#~ "གསང་བའི།\n"
-
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s : %s (རྣམ་གྲངས་%d)"
-
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (རྣམ་གྲངས་%d)"
-
-#~ msgid "Category is"
-#~ msgstr "དབྱེ་རིམ་ཨིན་།"
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "ཟླ་ཐོ་: (_n)"
-
-#~ msgid "Dele_gatees"
-#~ msgstr "བགོ་སྤེལ་བྱ་ཡུལ་ཚུ།(_g)"
-
-#~ msgid "From:"
-#~ msgstr "ལས་:"
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "date-end"
-#~ msgstr "ཚེས་གྲངས་མཇུག"
-
-#~ msgid "date-start"
-#~ msgstr "ཚེས་གྲངས་འགོ་བཙུགས།"
-
-#~ msgid "_Memo"
-#~ msgstr "བརྗེད་ཐོ།(_M)"
-
-#~ msgid "      "
-#~ msgstr "    "
-
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "གལ་ཅན་མེནམ་སྦེ་ བཏགས་བཀལ། (_M)"
-
-#~ msgid "Original Location"
-#~ msgstr "འགོ་ཐོག་གནས་ཁོངས།"
-
-#~ msgid "Search Type"
-#~ msgstr "འཚོལ་ཞིབ་དབྱེ་བ།"
-
-#~ msgid "Subitem ID"
-#~ msgstr "རྣམ་གྲངས་ཡན་ལག་གི་ཨའི་ཌི"
-
-#~ msgid "Find No_w"
-#~ msgstr "ད་ལྟོ་རང་འཚོལ། (_w)"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "གློག་ཐོག་ཞལ་འཛོམས"
-
-#~ msgid "WWW"
-#~ msgstr "ཌབ་ལུ་ཌབ་ལུ་ཌབ་ལུ།"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "གནས་ཁོངས་: (_i)"
-
 #~ msgid "Properties..."
 #~ msgstr "རྒྱུ་དངོས་ཚུ་..."
-
 #~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
+#~ "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 ""
-#~ "ཨའུཊི་པུཊི་ཡིག་སྣོད་: %s བཟོ་མ་ཚུགས།\n"
-#~ " %s"
-
+#~ "འཕྲིན་དོན་འདི་ ཕྱི་ཁའི་གློག་རིམ་ &quot;sendmail&quot;བརྒྱུད་དེ་བཏང་ནུག སེནཌི་མེལ་གྱིས་ འོག་གི་"
+#~ "འཛོལ་བ་དེ་ སྙན་ཞུ་འབད་མིའི་ནང་ གནས་ཚད་༦༧:འབད་མི་ ཡིག་འཕྲིན་དེ་ བཏང་མ་ཚུགས་ཟེར་ཨིན་པས།\n"
+#~ "འཕྲིན་དོན་འདི་ ཕྱི་སྒྲོམ་སྣོད་འཛིན་ནང་ གསོག་འཇོག་འབད་དེ་འདུག འཕྲིན་དོན་གྱི་འཛོལ་བ་ ཞིབ་དཔྱད་འབད་"
+#~ "ཞིནམ་ལས་ ལོག་སྟེ་གཏང་།"
+#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgstr "ཁྱོད་ཀྱི་འཕྲིན་དོན་ དོན་ཚན་&quot;{0}&quot;འབད་མི་དེ་ འགྲེམ་སྤེལ་མ་འབད་བས།"
 #~ msgid "Addressbook"
 #~ 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 "
@@ -21466,50 +20904,36 @@ msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 #~ "དང་ཁྱོད་ཀྱི་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་དེ་ ལཱ་འབད་བའི་བསྒང་གི་ ཕ་ཡེར་ཝཱལ་ཅིག་གི་ རྒྱབ་ཁར་ཨིན་པ་ཅིན་ "
 #~ "ཁྱོད་ཀྱི་མཐུད་ལམ་དེ་ལུ་ ཧེ་མ་ལས་རང་ མཐའ་བཙན་ཡོདཔ་ལས་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཨེསི་ཨེསི་ཨེལ་/ཊི་ཨེལ་"
 #~ "ཨེསི་ ལག་ལེན་འཐབ་དགོཔ་མེད།"
-
 #~ msgid "Advanced..."
 #~ msgstr "མཐོ་རིམ་ཅན་…"
-
 #~ msgid "Select target addressbook."
 #~ msgstr "དམིགས་གཏད་ཀྱི་ ཁ་བྱང་ཀི་དེབ་ སེལ་འཐུ་འབད།"
-
 #~ msgid "(none)"
 #~ 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 "Discard Changes"
 #~ msgstr "བསྒྱུར་བཅོས་ཚུ་ བཏོན་བཀོག"
-
 #~ msgid ""
 #~ "<big><b>%s</b></big>\n"
 #~ "%s until %s"
 #~ msgstr ""
 #~ "<སྦོམ་><b>%s</b></སྦོམ་>\n"
 #~ "%s ཚུན་ %s"
-
 #~ msgid "description of appointment"
 #~ msgstr "ངོ་འཕྲད་ཀྱི་འགྲེལ་བཤད།"
-
 #~ msgid "Dismiss"
 #~ msgstr "ཐར་གྲོལ།"
-
 #~ msgid "Dismiss All"
 #~ msgstr "ཆ་མཉམ་ཐར་གྲོལ།"
-
 #~ msgid ""
 #~ "Alarm on %s\n"
 #~ "%s\n"
@@ -21520,448 +20944,297 @@ msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 #~ "%s\n"
 #~ "%sལུ་ འགོ་བཙུགས་དོ།\n"
 #~ "%sལུ་ མཇུག་བསྡུ་དོ།"
-
 #~ msgid "Remove"
 #~ msgstr "རྩ་བསྐྲད་བཏང་།"
-
 #~ msgid "Don't Remove"
 #~ msgstr "རྩ་བསྐྲད་མ་བཏང་།"
-
 #~ msgid "05 minutes"
 #~ msgstr "སྐར་མ་ ༠༥།"
-
 #~ msgid "10 minutes"
 #~ msgstr "སྐར་མ་ ༡༠།"
-
 #~ msgid "15 minutes"
 #~ msgstr "སྐར་མ་ ༡༥།"
-
 #~ msgid "30 minutes"
 #~ msgstr "སྐར་མ་ ༣༠།"
-
 #~ msgid "60 minutes"
 #~ msgstr "སྐར་མ་ ༦༠།"
-
 #~ msgid "<b>Alerts</b>"
 #~ msgstr "<b>དྲན་བརྡ་ཚུ།</b>"
-
 #~ 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 "ཡུ་ཨར་ཨེལ་ ཁ་སྐོང་རྐྱབས། (_A)"
-
 #~ msgid "option menu to choose reminder units"
 #~ msgstr "དྲན་བསྐུལ་ཆ་ཕྲན་ གདམ་ནིའི་དོན་ལུ་ ཡིག་སྣོད་ཀྱི་གདམ་ཁ།"
-
 #~ msgid "option menu to choose time units"
 #~ msgstr "ཆུ་ཚོད་ཀྱི་ཆ་ཕྲན་ གདམ་ནིའི་དོན་ལུ་ ཡིག་སྣོད་ཀྱི་གདམ་ཁ།"
-
 #~ msgid "_Attachment Bar (drop attachments here)"
 #~ msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་། (མཉམ་སྦྲགས་ཚུ་ ནཱ་ལུ་བཀོག་བཞག) (_A)"
-
 #~ msgid "Scheduling"
 #~ msgstr "འཆར་རིམ་བཀོད་དོ།"
-
 #~ msgid "Invitations"
 #~ msgstr "མགྲོན་བརྡ་ཚུ།"
-
 #~ msgid "<b>Basics</b>"
 #~ 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:"
 #~ msgstr "དབྱེ་བཟོ: (_f)"
-
 #~ msgid "This appointment has customized alarms"
 #~ msgstr "ངོ་འཕྲད་འདི་ལུ་ སྲོལ་སྒྲིག་འབད་ཡོད་པའི་ འཇིགས་བརྡ་འདུག"
-
 #~ msgid "_Description:"
 #~ msgstr "འགྲེལ་བཤད: (_D)"
-
 #~ msgid "<b>Dele_gatees</b>"
 #~ msgstr " <b>བགོ་སྤེལ་གྱི་ཡུལ་ཚུ་</b> "
-
 #~ msgid "<b>From:</b>"
 #~ msgstr "<b>ལས་:</b>"
-
 #~ msgid "_Delegate To..."
 #~ msgstr "བགོ་སྤེལ་འབད་ས།...(_D)"
-
 #~ msgid "Con_tacts..."
 #~ msgstr "འབྲེལ་ས་ཚུ།...(_t)"
-
 #~ msgid "Assignment"
 #~ msgstr "འགན་ལས།"
-
 #~ msgid "Task Table"
 #~ msgstr "ལས་ཀའི་ཐིག་ཁྲམ།"
-
 #~ msgid "_Publish Free/Busy Information"
 #~ msgstr "དལཝ/ཁོམ་མེད་ཀྱི་ བརྡ་དོན་དཔར་བསྐྲུན་འབད། (_P)"
-
 #~ msgid "Removal Complete"
 #~ msgstr "རྩ་བསྐྲད་མཇུག་བསྡུ་ཡོད།"
-
 #~ msgid "Timezone Button"
 #~ msgstr "ཆུ་ཚོད་གླིང་སྡེའི་ ཨེབ་རྟ།"
-
 #~ msgid "The Evolution Groupware Suite"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་ གུརུབ་ཝེར་ སུཊི།།"
-
 #~ msgid "%a %m/%d/%Y %I:%M %p"
 #~ msgstr "%a %m/%d/%Y %I:%M %p"
-
 #~ msgid "%a %m/%d/%Y %H:%M"
 #~ msgstr "%a %m/%d/%Y %H:%M"
-
 #~ msgid "%a %m/%d/%Y %I %p"
 #~ msgstr "%a %m/%d/%Y %I %p"
-
 #~ msgid "%a %m/%d/%Y %H"
 #~ msgstr "%a %m/%d/%Y %H"
-
 #~ msgid "%m/%d/%Y %I:%M:%S %p"
 #~ msgstr "%m/%d/%Y %I:%M:%S %p"
-
 #~ msgid "%m/%d/%Y %H:%M:%S"
 #~ msgstr "%m/%d/%Y %H:%M:%S"
-
 #~ msgid "%m/%d/%Y %I:%M %p"
 #~ msgstr "%m/%d/%Y %I:%M %p"
-
 #~ msgid "%m/%d/%Y %H:%M"
 #~ msgstr "%m/%d/%Y %H:%M"
-
 #~ msgid "%m/%d/%Y %I %p"
 #~ msgstr "%m/%d/%Y %I %p"
-
 #~ msgid "%m/%d/%Y %H"
 #~ msgstr "%m/%d/%Y %H"
-
 #~ msgid "%I:%M:%S %p"
 #~ msgstr "%I:%M:%S %p"
-
 #~ msgid "%H:%M:%S"
 #~ msgstr "%H:%M:%S"
-
 #~ msgid "%I %p"
 #~ msgstr "%I %p"
-
 #~ msgid "_Rule name:"
 #~ msgstr "ལམ་ལུགས་ཀྱི་མིང་: (_R)"
-
 #~ msgid "If"
 #~ msgstr "ཅིན།"
-
 #~ msgid "Execute actions"
 #~ msgstr "བྱ་བ་ལག་ལེན་འཐབ།"
-
 #~ msgid "Mail Accounts Table"
 #~ msgstr "ཡིག་འཕྲིན་རྩིས་ཐོའི་ཐིག་ཁྲམ།"
-
 #~ msgid "Attachment Button"
 #~ msgstr "མཉམ་སྦྲགས་ཀྱི་ཨེབ་རྟ།"
-
 #~ msgid "Filters"
 #~ msgstr "ཚགས་མ་ཚུ།"
-
 #~ msgid "Execute Command..."
 #~ msgstr "བརྡ་བཀོད་ལག་ལེན་འཐབ་་..."
-
 #~ msgid "T_erminal Font:"
 #~ msgstr "ཊར་མི་ནཱལ་ ཡིག་གཟུགས་: (_e)"
-
 #~ msgid "_Show animated images"
 #~ msgstr "བསྒུལ་ཅན་བཟོས་པའི་ གཟུགས་བརྙན་ཚུ་སྟོན། (_S)"
-
 #~ msgid "Server: %s, Type: %s"
 #~ msgstr "སར་བར་: %s དབྱེ་བ་ %s།"
-
 #~ msgid "Path: %s, Type: %s"
 #~ msgstr "འགྲུལ་ལམ་:%sདབྱེ་བ་ %s།"
-
 #~ msgid "Type: %s"
 #~ msgstr "དབྱེ་བ་:%s།"
-
-#~ msgid ""
-#~ "The message was sent via the &quot;sendmail&quot; external application.  "
-#~ "Sendmail reports the following error: status 67: mail not sent.\n"
-#~ "The message is stored in the Outbox folder.  Check the message for errors "
-#~ "and resend."
-#~ msgstr ""
-#~ "འཕྲིན་དོན་འདི་ ཕྱི་ཁའི་གློག་རིམ་ &quot;sendmail&quot;བརྒྱུད་དེ་བཏང་ནུག འཕྲིན་གཏང་གིས་ འོག་གི་"
-#~ "འཛོལ་བ་དེ་ སྙན་ཞུ་འབད་མིའི་ནང་ གནས་ཚད་༦༧:འབད་མི་ ཡིག་འཕྲིན་དེ་ བཏང་མ་ཚུགས་ཟེར་ཨིན་པས།\n"
-#~ "འཕྲིན་དོན་འདི་ ཕྱི་སྒྲོམ་སྣོད་འཛིན་ནང་ གསོག་འཇོག་འབད་ནུག འཕྲིན་དོན་གྱི་འཛོལ་བ་ ཞིབ་དཔྱད་འབད་ཞིནམ་"
-#~ "ལས་ ལོག་སྟེ་གཏང་།"
-
-#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-#~ msgstr "ཁྱོད་ཀྱི་འཕྲིན་དོན་ དོན་ཚན་&quot;{0}&quot;འབད་མི་དེ་ འགྲེམ་སྤེལ་མ་འབད་བས།"
-
 #~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
 #~ msgstr "<span weight=\"bold\">རང་བཞིན་གྱི་འབྲེལ་ས་ཚུ་</span>"
-
 #~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 #~ msgstr "<span weight=\"bold\">དེ་འཕྲལ་འཕྲིན་གཏོང་གི་འབྲེལ་ས་ཚུ་</span>"
-
 #~ msgid "Automatic contacts"
 #~ msgstr "རང་བཞིན་གྱི་འབྲེལ་ས་ཚུ།"
-
 #~ msgid "Exchange Connector access error."
 #~ msgstr "ཨེགསི་ཅེནཇི་མཐུད་བྱེད་འཛུལ་སྤྱོད་ཀྱི་འཛོལ་བ།"
-
 #~ msgid "dialog1"
 #~ msgstr "ཌའི་ལོག་ ༡ པ།"
-
 #~ msgid "Meetings and Tasks"
 #~ msgstr "འཛོམས་འདུ་དང་ ལས་ཀ།"
-
 #~ msgid "<span weight=\"bold\">Conflict Search</span>"
 #~ msgstr "<span weight=\"bold\">མི་མཐུན་འཚོལ་ཞིབ་</span>"
-
 #~ msgid "Plugin manager"
 #~ msgstr "པ་ལག་ཨིན་ འཛིན་སྐྱོང་པ།"
-
 #~ msgid "Id"
 #~ msgstr "ཨའི་ཌི་"
-
 #~ msgid "Path"
 #~ msgstr "འགྲུལ་ལམ།"
-
 #~ msgid "Sa junk-plugin"
 #~ 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"
 #~ msgstr "ཨོ་ཡུ།"
-
 #~ msgid "O"
 #~ msgstr "ཨོ།"
-
 #~ msgid "L"
 #~ msgstr "ཨེལ།"
-
 #~ msgid "DN"
 #~ msgstr "ཌི་ཨེན།"
-
 #~ msgid "DC"
 #~ msgstr "ཌི་སི།"
-
 #~ msgid "ST"
 #~ msgstr "ཨེསི་ཊི།"
-
 #~ msgid "E"
 #~ msgstr "ཤར།"
-
 #~ msgid "_Preview Pane"
 #~ msgstr "པེན་ སྔོན་ལྟ་འབད། (_P)"
-
 #~ msgid "_Select All"
 #~ msgstr "ཆ་མཉམ་སེལ་འཐུ་འབད། (_S)"
-
 #~ msgid "Delete this Occurrence"
 #~ msgstr "འབྱུང་བ་འདི་ བཏོན་གཏང་།"
-
 #~ msgid "Customize My Evolution"
 #~ msgstr "ངེད་ཀྱི་ ཨི་བོ་ལུ་ཤཱན་ སྲོལ་སྒྲིག་འབད།"
-
 #~ msgid "Move"
 #~ msgstr "སྤོ་བཤུད།"
-
 #~ msgid "_About Evolution..."
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་སྐོར་ལས་...(_A)"
-
 #~ msgid "_Send / Receive"
 #~ msgstr "གཏང་/ལེན། (_S)"
-
 #~ msgid "Previous Button"
 #~ msgstr "ཧེ་མའི་ཨེབ་རྟ།"
-
 #~ msgid "Text Date Entry"
 #~ msgstr "ཚིག་ཡིག་གི་ཚེས་གྲངས་ཐོ་བཀོད།"
-
 #~ msgid "Date Button"
 #~ msgstr "ཚེས་གྲངས་ཀྱི་ཨེབ་རྟ།"
-
 #~ msgid "Time Combo Box"
 #~ msgstr "ཆུ་ཚོད་ཀྱི་བརྟག་སྒྲོམ།"
-
 #~ msgid "Search Text Entry"
 #~ msgstr "ཚིག་ཡིག་ཐོ་བཀོད་ འཚོལ་ཞིབ་འབད།"
-
 #~ msgid "Always Search"
 #~ msgstr "ཨ་རྟག་རང་ འཚོལ་ཞིབ་འབད།"
-
 #~ msgid "Your server needs to be updated"
 #~ msgstr "ཁྱོད་ཀྱི་སར་བར་དེ་ དུས་མཐུན་བཟོ་དགོཔ་འདུག"
-
 #~ msgid ""
 #~ "Are you sure you want\n"
 #~ "to delete this contact?"
 #~ msgstr ""
 #~ "ཁྱོད་ཀྱིས་ འབྲེལ་སའདི་\n"
 #~ " ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན? "
-
 #~ msgid "Save Appointment"
 #~ msgstr "ངོ་འཕྲད་སྲུངས།"
-
 #~ msgid ""
 #~ " Some features may not work correctly with your current server version"
 #~ msgstr ""
 #~ "ཁྱད་རྣམ་ལ་ལོ་ཅིག་གིས་ ཁྱོད་ཀྱི་ད་ལྟོའི་ སར་བར་ ཐོན་རིམ་དང་གཅིག་ཁར་ ཚུལ་མཐུན་སྦེ་ ལཱ་མི་འབདཝ་འོང་"
 #~ "།"
-
 #~ msgid "Appointment Title"
 #~ msgstr "ངོ་འཕྲད་ཀྱི་མགོ་མིང་།"
-
 #~ msgid "end-time"
 #~ msgstr "མཇུག་བསྡུ་བའི་དུས་ཚོད།"
-
 #~ msgid "start-time"
 #~ msgstr "འགོ་བཙུགས་དུས་ཚོད།"
-
 #~ msgid "Show _Attachment Bar (drop attachments here)"
 #~ msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན། (མཉམ་སྦྲགས་ཚུ་ ནཱ་ལུ་བཀོག་བཞག)། (_A)"
-
 #~ msgid "Ad_vanced  send options"
 #~ msgstr "མཐོ་རིམ་ཅན་གྱི་ གཏང་ནིའི་གདམ་ཁ་ཚུ།"
-
 #~ msgid "N"
 #~ msgstr "བྱང་།"
-
 #~ msgid "S"
 #~ msgstr "ལྷོ།"
-
 #~ msgid "W"
 #~ msgstr "ནུབ།"
-
 #~ msgid ""
 #~ "Evolution has found Gnome Calendar files.\n"
 #~ "Would you like to import them into Evolution?"
 #~ msgstr ""
 #~ "ཨི་བོ་ལུ་ཤཱན་ ཇི་ནོམ་ཟླ་ཐོའི་ཡིག་སྣོད་ཚུ་ཐོབ་ནུག.\n"
 #~ "ཁྱོད་ཀྱིས་ དེ་ཚུ་ཨི་བོ་ལུ་ཤཱན་ནང་ལུ་ ནང་འདྲེན་འབད་ནི་ཨིན་ན?"
-
 #~ msgid "<b>If</b>"
 #~ msgstr "<b>ཅིན་</b>"
-
 #~ msgid "Mo_ve to Folder..."
 #~ msgstr "སྣོད་འཛིན་ལུ་ སྤོ་བཤུད་འབད་..(_v)"
-
 #~ msgid "v_Folders"
 #~ msgstr "ཝི་སྣོད་འཛིན་ཚུ། (_F)"
-
 #~ msgid "port for starting user runned spamd"
 #~ msgstr "ལག་ལེན་པ་གིས་ གཡོག་བཀོལ་མི་ ཨེསི་པི་ཨེ་ཨེམ་ཌི་ འགོ་བཙུགས་ཀྱི་འདྲེན་ལམ་།"
-
 #~ msgid "spamd port"
 #~ msgstr "ཨེསི་པི་ཨེ་ཨེམ་ཌི་ འདྲེན་ལམ་།"
-
 #~ msgid "Evolution Netscape Mail importer"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་ ནེཊི་སིཀེཔ་ ཡིག་འཕྲིན་ནང་འདྲེན་པ།"
-
 #~ msgid "Evolution Outlook Express 4 importer"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨའུཊི་ལུཀ་ ཨེགསི་པེརེསི་ ༤ གི་ ནང་འདྲེན་པ།"
-
 #~ msgid "Evolution mbox importer"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་ འཕྲིན་སྒྲོམ་ནང་འདྲེན་པ།"
-
 #~ msgid "MBox (mbox)"
 #~ msgstr "འཕྲིན་སྒྲོམ། (འཕྲིན་སྒྲོམ)"
-
 #~ msgid "Outlook Express 4 (.mbx)"
 #~ msgstr "ཨའུཊི་ལུཀ་ ཨེགསི་པེརེསི་ ༤། (.mbx)"
-
 #~ msgid "Evolution is importing your old Elm mail"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་ཨི་ཨེལ་ཨེམ་ ཡིག་འཕྲིན་རྙིངམ་ ནང་འདྲེན་འབད་དོ།"
-
 #~ msgid ""
 #~ "Evolution has found Elm mail files\n"
 #~ "Would you like to import them into Evolution?"
 #~ msgstr ""
 #~ "ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཨི་ཨེལ་ཨེམ་ ཡིག་འཕྲིན་ཡིག་སྣོད་ཚུ་ཐོབ་ནུག\n"
 #~ "ཁྱོད་ཀྱིས་དེ་ཚུ་ ཨི་བོ་ལུ་ཤཱན་ནང་ ནང་འདྲེན་འབད་ནི་ཨིན་ན?"
-
 #~ msgid "Elm"
 #~ msgstr "ཨི་ཨེལཨེམ།"
-
 #~ msgid "Evolution is importing your old Pine data"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་པ་ཡིན་ གནད་སྡུད་རྙིངམ་ཚུ་ ནང་འདྲེན་འབད་དོ།"
-
 #~ msgid ""
 #~ "Evolution has found Pine mail files.\n"
 #~ "Would you like to import them into Evolution?"
 #~ msgstr ""
 #~ "ཨི་བོ་ལུ་ཤཱན་གྱིས་ པ་ཡིན་ ཡིག་འཕྲིན་ཡིག་སྣོད་ཚུ་ ཐོབ་ནུག\n"
 #~ "ཁྱོད་ཀྱིས་ དེ་ཚུ་ཨི་བོ་ལུ་ཤཱན་ནང་ ནང་འདྲེན་འབད་ནི་ཨིན་ན?"
-
 #~ msgid "Pine"
 #~ 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"
@@ -21970,28 +21243,20 @@ msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 #~ "\n"
 #~ "འོག་ལུ་བཀྲམ་སྟོན་འབད་མི་ ཆིངས་ཡིག་དེ་ དྲན་ཤེས་ཀྱི་ཐོག་ལས་ ལྷག་ཞིནམ་ལས་\n"
 #~ "དང་ལེན་འབད་ནིའི་དོན་ལུ་ ཞིབ་དཔྱད་སྒྲོམ་ནང་ བདེན་རྟགས་བཀལ།\n"
-
 #~ msgid "{1}."
 #~ msgstr "(1)"
-
 #~ msgid "New vFolder"
 #~ msgstr "ཝི་སྣོད་འཛིན་གསརཔ།"
-
 #~ msgid "Mark  as default folder"
 #~ msgstr "སྔོན་སྒྲིག་སྣོད་འཛིན་སྦེ་ རྟགས་བཀལ།"
-
 #~ msgid "Out of office Message:"
 #~ msgstr "ཡིག་ཚང་གི་ ཕྱི་ཁའི་འཕྲིན་དོན།"
-
 #~ msgid "<b>%s</b> requests the presence of %s at the following meeting:"
 #~ msgstr "<b>%s</b> གིས་%sདེ་ འོག་གི་འཛོམས་འདུ་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབདཝ་མས།"
-
 #~ msgid "Manage Plugins..."
 #~ msgstr "པལག་ཨིནསི་ འཛིན་སྐྱོང་འཐབ་..."
-
 #~ msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
 #~ msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-
 #~ msgid ""
 #~ "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
 #~ "sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
@@ -22000,85 +21265,66 @@ msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 #~ "ཡུ་ཨའི་ཌི་%sབཅུད་དོན་%sའགྲེལ་བཤད་ཐོ་ཡིག་%sདབྱེ་རིམ་ཐོ་ཡིག་%sབསམ་བཀོད་ཐོ་ཡིག་%sཡོངས་བསྒྲུབས་%s "
 #~ "གསར་བཟོས་%sའབྲེལ་སའི་ཐོ་ཡིག་%sའགོ་བཙུགས་%sམཇུག་སྡུད་%sརན་ནི་%sའབད་ཚར་བའི་བརྒྱ་ཆ་%sགཙོ་རིམ་%"
 #~ "s ཨུ་ཨར་ཨེལ་%sངོ་འཛོམས་པའི་ཐོ་ཡིག་%sགནས་ཁོངས་%sལེགས་བཅོས་%sའབད་ཡོདཔ།"
-
 #~ msgid ""
 #~ "The suggested filename extension of this filetype (%s) is unused in the "
 #~ "chosen filename. Do you want to continue?"
 #~ msgstr ""
 #~ "ཡིག་སྣོད་དབྱེ་བ་འདི་གི་ བསམ་ཚུལ་བཀོད་མི་ ཡིག་སྣོད་མིང་གི་རྒྱ་བསྐྱེད་(%s) དེ་ གདམ་ཁ་བརྐྱབས་མི་ ཡིག་"
 #~ "སྣོད་ཀྱི་མིང་ནང་ ལག་ལེན་མ་འཐབ་པས། ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་ནི་ཨིན་ན?"
-
 #~ msgid "Invalid user"
 #~ msgstr "ནུས་མེད་ལག་ལེན་པ།"
-
 #~ msgid ""
 #~ "\n"
 #~ "You cannot share folder with specified user \"{0}\" \n"
 #~ msgstr ""
 #~ "\n"
 #~ "ཁྱོད་ཀྱིས་ གསལ་བཀོད་འབད་མི་ ལག་ལེན་པ་\"{0}\" དང་གཅིག་ཁར་ སྣོད་འཛིན་རུབ་སྤྱོད་འབད་མི་བཏུབ།\n"
-
 #~ msgid "Specify User"
 #~ msgstr "ལག་ལེན་པ་ གསལ་བཀོད་འབད།"
-
 #~ msgid ""
 #~ "\n"
 #~ "\tYou have to specify a user name whom you want to add to the list \n"
 #~ msgstr ""
 #~ "\n"
 #~ "\tཁྱོད་ཀྱིས་ ཐོ་ཡིག་ལུ་ ཁ་སྐོང་བརྐྱབ་དགོ་མནོ་མི་ ལག་ལེན་པའི་མིང་དེ་ གསལ་བཀོད་འབད།\n"
-
 #~ msgid ""
 #~ "Importing %s\n"
 #~ "Importing item %d."
 #~ msgstr ""
 #~ "%sནང་འདྲེན་འབད་དོ།\n"
 #~ "རྣམ་གྲངས་%dནང་འདྲེན་འབད་དོ།"
-
 #~ msgid "Select importer"
 #~ msgstr "ནང་འདྲེན་པ་སེལ་འཐུ་འབད།"
-
 #~ msgid "Importing"
 #~ msgstr "ནང་འདྲེན་འབད་དོ།"
-
 #~ msgid "Importing %s.\n"
 #~ msgstr "%sནང་འདྲེན་འབད་དོ།\n"
-
 #~ msgid "Error loading %s"
 #~ msgstr "%sམངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ།"
-
 #~ msgid ""
 #~ "Importing %s\n"
 #~ "Importing item 1."
 #~ msgstr ""
 #~ "%sནང་འདྲེན་འབད་དོ།\n"
 #~ "རྣམ་གྲངས་༡ པ་ ནང་འདྲེན་འབད་དོ།"
-
 #~ msgid "Automatic"
 #~ msgstr "རང་བཞིན་གྱི།"
-
 #~ msgid ""
 #~ "Please wait...\n"
 #~ "Scanning for existing setups"
 #~ msgstr ""
 #~ "བསྒུག་སྡོད་གནང་...\n"
 #~ "གནས་ཏེ་ཡོད་མི་གཞི་སྒྲིག་ཚུ་ ཞིབ་ལྟ་འབད་དོ།"
-
 #~ msgid "Starting Intelligent Importers"
 #~ msgstr "རིག་རྩལ་ཅན་གྱི་ ནང་འདྲེན་པ་ཚུ་ འགོ་བཙུགས་དོ།"
-
 #~ msgid "No importer available for file %s"
 #~ msgstr "ཡིག་སྣོད་%sགི་དོན་ལས་ ནང་འདྲེན་པ་ མི་འཐོབ་པས།"
-
 #~ msgid "Unable to execute importer"
 #~ msgstr "ནང་འདྲེན་པ་ ལག་ལེན་འཐབ་མ་ཚུགས།"
-
 #~ msgid "Closing connections..."
 #~ msgstr "མཐུད་ལམ་ཁ་བསྡམ་དོ་..."
-
 #~ msgid "Starting import"
 #~ msgstr "ནང་འདྲེན་འགོ་བཙུགས་དོ།"
-
 #~ msgid ""
 #~ "If you quit the Evolution Setup Assistant now, all of the information "
 #~ "that you have entered will be forgotten. You will need to run this "
@@ -22091,13 +21337,10 @@ msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 #~ "ལག་ལེན་འཐབ་དགོ.\n"
 #~ "\n"
 #~ "ལས་རོགས་དེ་ ལག་ལེན་འཐབ་པའི་སྒོ་ལས་ ད་ལྟོ་རང་ སྤང་བཞག་ནི་ཨིན་ན?"
-
 #~ msgid "Importing Files"
 #~ msgstr "ཡིག་སྣོད་ཚུ་ ནང་འདྲེན་འབད་དོ།"
-
 #~ msgid "Timezone "
 #~ msgstr "ཆུ་ཚོད་གླིང་སྡེ།"
-
 #~ msgid ""
 #~ "You have successfully entered all of the information needed to set up "
 #~ "Evolution. \n"
@@ -22107,91 +21350,66 @@ msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 #~ "ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་ གཞི་བཙུགས་ཀྱི་དོན་ལས་དགོ་པའི་ བརྡ་དོན་ཆ་མཉམ་ མཐར་འཁྱོལ་སྦེ་ བཙུགས་ནུག\n"
 #~ "\n"
 #~ "ཁྱོད་རའི་གཞི་སྒྲིག་ཚུ་ བསྲུང་ནིའི་དོན་ལས་ \"Apply\" ཨེབ་རྟ་གུ་ ཨེབ་གཏང་འབད།"
-
 #~ msgid "Don't import"
 #~ msgstr "ནང་འདྲེན་མ་འབད།"
-
 #~ msgid "Don't ask me again"
 #~ msgstr "ང་ལུ་ ལོག་སྟེ་མ་འདྲི།"
-
 #~ msgid "Evolution can import data from the following files:"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ འོག་གི་ཡིག་སྣོད་ཚུ་ལས་ གནད་སྡུད་ནང་འདྲེན་འབད་ཚུགས:།"
-
 #~ msgid "Disable the mono plugin environment."
 #~ msgstr "པལག་ཨིན་ མཐའ་འཁོར་རྐྱང་པོ་དེ་ ལྕོགས་མིན་བཟོ།"
-
 #~ msgid "Cannot start Evolution"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་ འགོ་བཙུགས་མི་ཚུགས་པས།"
-
 #~ msgid "_Filters..."
 #~ msgstr "ཚགས་མ་ཚུ་...(_F)"
-
 #~ msgid "vFolder _Editor..."
 #~ msgstr "ཝི་སྣོད་འཛིན་ ཞུན་དགཔ་...(_E)"
-
 #~ msgid "_Folder"
 #~ msgstr "སྣོད་འཛིན། (_F"
-
 #~ msgid "_Threaded Message List"
 #~ msgstr "ཐེ་རེཌི་འབད་ འཕྲིན་དོན་ཐོ་ཡིག"
-
 #~ msgid "Create _vFolder From Message"
 #~ msgstr "འཕྲིན་དོན་ནང་ལས་ ཝི་སྣོད་འཛིན་བཟོ། (_v)"
-
 #~ msgid "Filter _Junk"
 #~ msgstr "མཁོ་མེད་འཚག (_J)"
-
 #~ msgid "Mark as I_mportant"
 #~ msgstr "གལ་ཅན་སྦེ་ རྟགས་བཀལ། (_m)"
-
+#~ msgid "Mark as Unimp_ortant"
+#~ msgstr "གལ་ཅན་མེནམ་སྦེ་ རྟགས་བཀལ། (_o)"
 #~ msgid "S_earch in Message..."
 #~ msgstr "འཕྲིན་དོན་ནང་འཚོལ་ཞིབ་འབད། (_e)"
-
 #~ msgid "S_maller"
 #~ msgstr "ཆུང་མི། (_m)"
-
 #~ msgid "Show Email _Source"
 #~ msgstr "གློག་འཕྲིན་གྱི་ འབྱུང་ཁུངས་སྟོན། (_S)"
-
 #~ msgid "Text Si_ze"
 #~ msgstr "ཚིག་ཡིག་གི་ཚད། (_z)"
-
 #~ msgid "_Create Filter From Message"
 #~ msgstr "འཕྲིན་དོན་ནང་ལས་ ཚགས་མ་བཟོ། (_C)"
-
 #~ msgid "_Larger"
 #~ msgstr "སྦོམ་མི། (_L)"
-
 #~ msgid "_Message Display"
 #~ msgstr "འཕྲིན་དོན་བཀྲམ་སྟོན། (_M)"
-
 #~ msgid "_Tools"
 #~ msgstr "ལག་ཆས། (_T)"
-
 #~ msgid "_Undelete"
 #~ msgstr "བཏོན་བཤོལ་འབད། (_U)"
-
 #~ msgid "Show / hide attachments"
 #~ msgstr "མཉམ་སྦྲགས་ཚུ་ སྟོན་/སྦ།"
-
 #~ msgid "Show _attachments"
 #~ msgstr "མཉམ་སྦྲགས་ཚུ་སྟོན། (_a"
-
 #~ msgid "E_xit"
 #~ msgstr "ཕྱིར་ཐོན།"
-
 #~ msgid "Evolution _FAQ"
 #~ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨེཕ་ཨེ་ཀིའུ། (_F)"
-
 #~ msgid "Window B_uttons"
 #~ msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ། (_u)"
-
 #~ msgid "_Advanced..."
 #~ msgstr "མཐོ་རིམ་ཅན་...(_A)"
-
 #~ msgid ""
 #~ "None\n"
 #~ "Mail Receipt\n"
 #~ msgstr ""
 #~ "ཅི་མེད།\n"
 #~ "ཡིག་འཕྲིན་འབྱོར་འཛིན།\n"
+
diff --git a/po/el.po b/po/el.po
index 2c75e26381..4889b72d3b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -37,13 +37,12 @@
 # Kostas Papadimas <pkst@gnome.org>, 2003, 2004, 2005, 2006.
 # Nikos Charonitakis <charosn@her.forthnet.gr>, 2003, 2004, 2005.
 # Simos Xenitellis <simos@gnome.org>, 2005.
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 15:17+0300\n"
-"PO-Revision-Date: 2006-07-19 10:30+0300\n"
+"POT-Creation-Date: 2006-05-14 11:37+0300\n"
+"PO-Revision-Date: 2006-05-14 11:39+0300\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
 "MIME-Version: 1.0\n"
@@ -54,26 +53,26 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "βιβλίο διευθύνσεων του evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
-msgstr "Νέα επαφή"
+msgstr "Νέα Επαφή"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
 #: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
-msgstr "Νέα λίστα επαφών"
+msgstr "Νέα Λίστα Επαφών"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "ο φάκελος τρέχοντος βιβλίου διευθύνσεων  %s έχει %d κάρτα"
-msgstr[1] "Ο φάκελος τρέχοντος βιβλίου διευθύνσεων  %s έχει %d κάρτες"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "ο φάκελος τρέχοντος βιβλίου διευθύνσεων έχει %d κάρτα"
+msgstr[1] "Ο φάκελος τρέχοντος βιβλίου διευθύνσεων έχει %d κάρτες"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -82,7 +81,7 @@ msgstr "Άνοιγμα"
 
 #: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
-msgstr "Λίστα επαφών: "
+msgstr "Λίστα Επαφών: "
 
 #: ../a11y/addressbook/ea-minicard.c:142
 msgid "Contact: "
@@ -92,38 +91,38 @@ msgstr "Επαφή: "
 msgid "evolution minicard"
 msgstr "μίνι καρτέλα του evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Έχει συναγερμούς."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Έχει επανεμφανίσεις."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Είναι μια συνάντηση."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Γεγονός ημερολογίου: Η περίληψη είναι %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
-msgstr "Γεγονός ημερολογίου: Δεν έχει περίληψη."
+msgstr "Γεγονός Ημερολογίου: Δεν έχει περίληψη."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "προβολή γεγονότος ημερολογίου"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
-msgstr "Λήψη εστίασης"
+msgstr "Λήψη Εστίασης"
 
 #: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
-msgstr "Νέο ραντεβού"
+msgstr "Νέο Ραντεβού"
 
 #: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
@@ -131,62 +130,52 @@ msgstr "Νέο ολοήμερο γεγονός"
 
 #: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
-msgstr "Νέα συνάντηση"
+msgstr "Νέα Συνάντηση"
 
 #: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
-msgstr "Μετάβαση στο σήμερα"
+msgstr "Μετάβαση στο Σήμερα"
 
 #: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
-msgstr "Μετάβαση στην ημερομηνία"
+msgstr "Μετάβαση στην Ημερομηνία"
 
 #: ../a11y/calendar/ea-day-view-main-item.c:299
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "ένας πίνακας για την προβολή και επιλογή της τρέχουσας ώρας"
 
-#. 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Έχει %d γεγονός."
 msgstr[1] "Έχει %d γεγονότα."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:152
 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Προβολή Ημέρας: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "προβολή ημερολογίου για μια εργάσιμη εβδομάδα"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "προβολή ημερολογίου για μια ή περισσότερες ημέρες"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -197,20 +186,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:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
-msgstr "%a %d %b"
+msgstr "%d %a %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:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -218,10 +205,10 @@ msgstr "%a %d %b %Y"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -231,11 +218,9 @@ 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:220
-#: ../calendar/gui/calendar-component.c:732
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -365,14 +350,6 @@ msgstr "Ενεργοποίηση Προεπιλεγμένου"
 msgid "Popup Menu"
 msgstr "Αναδυόμενο μενού"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Εναλλαγή προβολής μπάρας συνημμένων"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "ενεργοποίηση"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -444,8 +421,7 @@ msgstr "Δημιουργία βιβλίου διευθύνσεων GroupWise:"
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "LDAP server did not respond with valid schema information."
-msgstr ""
-"Η απάντηση του διακομιστή IMAP δεν περιείχε έγκυρες πληροφορίες σχήματος."
+msgstr "Η απάντηση του διακομιστή IMAP δεν περιείχε έγκυρες πληροφορίες σχήματος."
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
@@ -462,8 +438,7 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Το Βιβλίο Διευθύνσεων του Evolution τερματίστηκε απρόσμενα."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Η εικόνα που επιλέξατε είναι μεγάλη. Θέλετε να αλλαχθεί το μέγεθος της και "
 "να αποθηκευθεί;"
@@ -549,15 +524,14 @@ msgstr ""
 "αλλαγές;"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Οι επαφές σας για {0} δεν θα είναι διαθέσιμες μέχρι το Evolution ξεκινήσει "
 "ξανά."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Προσθήκη"
@@ -567,7 +541,7 @@ msgid "_Discard"
 msgstr "Α_πόρριψη"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -577,7 +551,7 @@ msgstr "{1}"
 
 #: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
-msgstr "Προεπιλεγμένη διεύθυνση συγχρονισμού:"
+msgstr "Προεπιλεγμένη Διεύθυνση Συγχρονισμού:"
 
 #: ../addressbook/conduit/address-conduit.c:1241
 #: ../addressbook/conduit/address-conduit.c:1242
@@ -587,8 +561,7 @@ msgstr "Αδυναμία φόρτωσης του βιβλίου διευθύνσ
 #: ../addressbook/conduit/address-conduit.c:1310
 #: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -608,9 +581,9 @@ msgstr "Ρυθμίστε εδώ την αυτόματη συμπλήρωση"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Επαφές"
 
@@ -650,8 +623,8 @@ msgstr "Διαχείριση των πιστοποιητικών S/MIME εδώ"
 #. 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:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -666,13 +639,12 @@ msgstr "Σε αυτό τον υπολογιστή"
 #. 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:600
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Προσωπικό"
 
@@ -699,7 +671,7 @@ 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-config.c:1202
 msgid "New Address Book"
 msgstr "Νέο Βιβλίο Διευθύνσεων"
 
@@ -715,73 +687,72 @@ msgstr "Δημιουργία νέου βιβλίου διευθύνσεων"
 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:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Τύπος:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../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/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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Γενικά"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Βιβλίο Διευθύνσεων"
 
-#: ../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/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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 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:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Ιδιότητες Βιβλίου Διευθύνσεων"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Εισαγωγή..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Εισαγωγή `%s':"
@@ -846,7 +817,7 @@ msgstr "Μετονομασία φακέλου \"%s\" σε:"
 #: ../addressbook/gui/component/addressbook-view.c:437
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
-msgstr "Μετονομασία φακέλου"
+msgstr "Μετονομασία Φακέλου"
 
 #: ../addressbook/gui/component/addressbook-view.c:442
 #: ../mail/em-folder-utils.c:511
@@ -857,35 +828,34 @@ msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει �
 msgid "A Folder with this name already exists"
 msgstr "Ο φάκελος με αυτό το όνομα υπάρχει ήδη."
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Νέο Βιβλίο Διευθύνσεων"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Διαγραφή"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Αποθήκευση ως VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "Ι_διότητες..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Επιλογέας πηγής επαφής"
 
@@ -894,12 +864,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ανώνυμη πρόσβαση στο διακομιστή LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
@@ -938,8 +908,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-"URI για το φάκελο που χρησιμοποιήθηκε τελευταία στο διάλογο επιλογής ονομάτων"
+msgstr "URI για το φάκελο που χρησιμοποιήθηκε τελευταία στο διάλογο επιλογής ονομάτων"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
@@ -948,7 +917,7 @@ msgstr ""
 "ονομάτων."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Τοποθεσία κάθετου ταμπλό"
 
@@ -977,7 +946,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Πιστοποίηση</b>"
 
@@ -1027,8 +996,7 @@ msgid "Email address"
 msgstr "Διεύθυνση Email"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Το Evolution θα χρησιμοποιήσει αυτήν τη διεύθυνση για την πιστοποίησή σας "
 "στο διακομιστή."
@@ -1212,7 +1180,7 @@ msgstr "Όταν είναι δυνατό"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
-msgstr "Προσ_θήκη βιβλίου διευθύνσεων"
+msgstr "Προσ_θήκη Βιβλίου Διευθύνσεων"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
@@ -1228,9 +1196,9 @@ msgstr "Μέθοδος _πιστοποίησης:"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Όνομα:"
 
@@ -1243,7 +1211,7 @@ msgid "_Search scope:"
 msgstr "Σ_κοπός αναζήτησης:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Διακομιστής:"
@@ -1263,7 +1231,7 @@ 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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
@@ -1272,222 +1240,242 @@ msgid "minutes"
 msgstr "λεπτά"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Οικία</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Instant Messaging</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Εργασία</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Διάφορα</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Άλλο</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Τηλέφωνο</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Διευθύνσεις Ιστού</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Εργασία</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Επαφή"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 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 "Πλήρες Ό_νομα..."
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Ψευδώνυμο:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: ../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:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Εργασία"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "Ε_πέτειος:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "Βοη_θός:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "Γε_νέθλια:"
 
-#: ../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:1707
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Ημερολόγιο:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Κατηγορίες..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Κατηγορίες"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "Πό_λη:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Εταιρία:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Χώρα:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "Τ_μήμα:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Αρχειοθέτηση κάτω:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "Δια_θεσιμότητα:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "Αρ_χική Σελίδα:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "Διε_υθυντής:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "Ση_μειώσεις:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "Γρα_φείο:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Ταχ.Θυρίδα:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "Επά_γγελμα:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "Σύ_ζυγος:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Πολιτεία/Επαρχία:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Τίτλος:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Επιθ_υμεί την παραλαβή μηνυμάτων HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Ιστολόγιο:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Where:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "Τα_χ.Κώδικας:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Διεύθυνση"
 
@@ -1495,17 +1483,17 @@ msgstr "Διεύθυνση"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../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:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Επεξεργάσιμο"
 
@@ -2481,7 +2469,7 @@ msgstr "Ζιμπάμπουε"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Όνομα"
@@ -2492,7 +2480,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2502,7 +2490,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2511,7 +2499,7 @@ msgid "Service"
 msgstr "Υπηρεσία"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2523,28 +2511,26 @@ msgstr "Όνομα Χρήστη"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:204
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Οικία"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../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:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
@@ -2570,23 +2556,23 @@ msgstr "Απαιτούμενα Πεδία"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
-msgstr "Τροποποιήθηκε"
+msgstr "Αλλάχθηκε"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
-msgstr "Επεξεργαστής επαφών - %s"
+msgstr "Επεξεργαστής Επαφών - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Παρακαλώ επιλέξτε μια εικόνα για αυτή την επαφή"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
-msgid "_No image"
-msgstr "_Χωρίς εικόνα"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "Χωρίς εικόνα"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2594,31 +2580,15 @@ msgstr ""
 "Τα δεδομένα επαφής δεν είναι έγκυρα:\n"
 "\n"
 
-#: ../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:3106
-#, 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
-#, 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:3110
 msgid "Invalid contact."
 msgstr "Μη έγκυρη επαφή."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Γρήγορη Προσθήκη Επαφής"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "Πλή_ρης Επεξεργασία"
 
@@ -2626,11 +2596,11 @@ msgstr "Πλή_ρης Επεξεργασία"
 msgid "_Full name"
 msgstr "Π_λήρες Όνομα"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
-msgstr "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "E-_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "Επιλο_γή βιβλίου διευθύνσεων"
 
@@ -2638,10 +2608,10 @@ msgstr "Επιλο_γή βιβλίου διευθύνσεων"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Είστε βέβαιοι ότι θέλετε\n"
-"να διαγραφεί η λίστα επαφών (%s);"
+"να διαγραφούν οι επαφές (%s) ;"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
@@ -2655,7 +2625,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Είστε βέβαιοι ότι θέλετε\n"
 "να διαγραφεί η επαφή (%s);"
@@ -2668,105 +2638,104 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε\n"
 "να διαγραφούν αυτές οι επαφές;"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Διεύθυνση _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Πόλη:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Χώρα:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Πλήρης Διεύθυνση"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Ταχ.Κώδικας:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Δρ."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Αξιότ."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Πλήρες Όνομα"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "Ι"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "ΙΙ"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "ΙΙΙ"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Νεότ."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Δις"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Κος"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Κα"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Κα/Δις"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Κος"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Μικρό:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Επώνυμο:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Μεσαίο:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Κατάληξη:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Προσθήκη λογαριασμού IM"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "Όνομα _λογαριασμού:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "Υπηρεσία _IM:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2777,62 +2746,61 @@ msgstr "_Τοποθεσία:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Προσθήκη ενός email στη λίστα"
 
-#: ../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:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Επεξεργαστής Λίστας Επαφών"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "Εισαγωγή διευθύνσεων email από το Βιβλίο Διευθύνσεων"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Μέλη"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Αφαίρεση διευθύνσεων email από τη λίστα"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Απόκρυψη διευθύνσεων κατά την αποστολή σε αυτή τη λίστα"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Όνομα _λίστας:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "Επιλο_γή"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
+msgstr "Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Βιβλίο"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Είναι Νέα Λίστα"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Μέλη"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Επικοινωνία με μέλη λίστας"
 
@@ -2859,7 +2827,7 @@ msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
-msgstr "Νέα επαφή:"
+msgstr "Νέα Επαφή:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
@@ -2873,18 +2841,25 @@ msgstr ""
 "Το όνομα ή η διεύθυνση e-mail αυτής της επαφής υπάρχει\n"
 "ήδη σε αυτόν το φάκελο.  Θέλετε οπωσδήποτε να προστεθεί;"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Κάθε πεδίο περιέχει"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Η κατηγορία είναι"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "Email αρχίζει με"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Όνομα αρχίζει με"
@@ -2902,9 +2877,9 @@ 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:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Ερώτημα"
 
@@ -2918,7 +2893,7 @@ msgstr "Σφάλμα λήψης όψης βιβλίου"
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Μοντέλο"
 
@@ -2926,104 +2901,103 @@ msgstr "Μοντέλο"
 msgid "Error modifying card"
 msgstr "Σφάλμα τροποποίησης κάρτας"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Πηγή"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Τύπος"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Αποθήκευση ως VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
-msgstr "_Νέα επαφή..."
+msgstr "_Νέα Επαφή..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Νέα λίστα επα_φών..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Αποθήκευση ως VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "Προώ_θηση επαφής"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "Πρ_οώθηση επαφών"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Αποστολή _μηνύματος στην επαφή"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Αποστολή _μηνύματος στη λίστα"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Αποστολή _μηνύματος στις επαφές"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "Εκτύ_πωση"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "Αντι_γραφή στο Βιβλίο Διευθύνσεων..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "Με_τακίνηση στο Βιβλίο Διευθύνσεων..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Αποκοπή"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "Αντι_γραφή"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "Επι_κόλληση"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Κάθε Κατηγορία"
 
@@ -3033,7 +3007,6 @@ msgid "Print cards"
 msgstr "Εκτύπωση καρτών"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
 msgid "Assistant"
 msgstr "Βοηθός"
 
@@ -3062,7 +3035,7 @@ msgid "Car Phone"
 msgstr "Τηλέφωνο Αυτοκινήτου"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3074,7 +3047,7 @@ msgid "Company Phone"
 msgstr "Τηλέφωνο Εταιρείας"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:783
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Email"
@@ -3093,7 +3066,7 @@ msgstr "Οικογενειακό Όνομα"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
-msgstr "Αρχειοθέτηση ως"
+msgstr "Αρχειοθέτηση Ως"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
@@ -3120,22 +3093,20 @@ msgid "Journal"
 msgstr "Ημερολόγιο"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
 msgid "Manager"
 msgstr "Διευθυντής"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Κινητό Τηλέφωνο"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Σημείωση"
 
@@ -3144,7 +3115,7 @@ msgid "Office"
 msgstr "Γραφείο"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Οργανισμός"
 
@@ -3177,7 +3148,6 @@ msgid "Role"
 msgstr "Ρόλος"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
 msgid "Spouse"
 msgstr "Σύζυγος"
 
@@ -3208,7 +3178,7 @@ msgid "Web Site"
 msgstr "Ιστοσελίδα"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3219,12 +3189,12 @@ msgstr "Ιστοσελίδα"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Πλάτος"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3234,12 +3204,12 @@ msgstr "Πλάτος"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Ύψος"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "Έχει εστίαση"
 
@@ -3253,7 +3223,7 @@ msgstr " Όνομα πεδίου"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
-msgstr "Μοντέλο κειμένου"
+msgstr "Μοντέλο Κειμένου"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
@@ -3263,7 +3233,7 @@ msgstr "Μέγιστο μάκρος ονόματος πεδίου"
 msgid "Column Width"
 msgstr "Πλάτος στήλης"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3277,7 +3247,7 @@ msgstr ""
 "\n"
 "ή διπλό κλικ εδώ για να δημιουργήσετε μια νέα επαφή."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3291,7 +3261,7 @@ msgstr ""
 "\n"
 "Κάντε κλικ εδώ για να προσθέσετε μια νέα Επαφή."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3301,7 +3271,7 @@ msgstr ""
 "\n"
 "Αναζήτηση για την Επαφή."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3311,143 +3281,80 @@ msgstr ""
 "\n"
 "Δεν υπάρχουν στοιχεία προς εμφάνιση σε αυτή την προβολή."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Προσαρμογέας"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "Email εργασίας"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "Email οικίας"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "Άλλο Email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "Επιλεγμένα"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "Έχει Δρομέα"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Άν_οιγμα δεσμού στο φυλλομετρητή"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "Αντι_γραφή τοποθεσίας δεσμού"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-msgid "_Send New Message To ..."
-msgstr "Απο_στολή νέου μηνύματος σε..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Αντιγραφή διεύ_θυνσης Email:"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(χάρτης)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:310
-#: ../addressbook/gui/widgets/eab-contact-display.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "χάρτης"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:461
-#: ../addressbook/gui/widgets/eab-contact-display.c:761
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Μέλη Λίστας"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
-msgid "Department"
-msgstr "Τμήμα"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Profession"
-msgstr "Επάγγελμα"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Θέση"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-msgid "Video Chat"
-msgstr "Video Chat"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Ημερολόγιο"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "Διαθεσιμότητα"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Τηλεδιάσκεψη"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Φαξ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
-msgid "Home Page"
-msgstr "Αρχική Σελίδα"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "εργασία"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-msgid "Web Log"
-msgstr "Ιστολόγιο"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
-msgid "Birthday"
-msgstr "Γενέθλια"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-msgid "Anniversary"
-msgstr "Επέτειος"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "προσωπικό"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:779
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Τίτλος Εργασίας"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Προσωπική σελίδα"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:818
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3478,7 +3385,7 @@ msgstr "Δεν ορίσθηκε προσωπική επαφή"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
 
@@ -3503,7 +3410,7 @@ msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Ακυρώθηκε"
 
@@ -3516,7 +3423,7 @@ msgstr "Δεν ήταν δυνατή η ακύρωση"
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
 #: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
-msgstr "Η πιστοποίηση απέτυχε"
+msgstr "Η Πιστοποίηση Απέτυχε"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
@@ -3640,7 +3547,7 @@ 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:695
 msgid "Error adding contact"
 msgstr "Σφάλμα προσθήκης επαφής"
 
@@ -3657,12 +3564,12 @@ 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:650
 msgid "Error removing contact"
 msgstr "Σφάλμα αφαίρεσης επαφής"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:292
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -3671,16 +3578,12 @@ msgid_plural ""
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
 "Ανοίγοντας %d επαφή θα γίνει άνοιγμα %d  νέου παραθύρου.\n"
-"Θέλετε να εμφανίσετε αυτή την επαφή;;Ανοίγοντας %d επαφές θα γίνει άνοιγμα %"
-"d  νέων παραθύρων.\n"
-"Θέλετε να εμφανίσετε όλες αυτές τις επαφές;"
+"Θέλετε να εμφανίσετε αυτή την επαφή;"
 msgstr[1] ""
-"Ανοίγοντας %d επαφή θα γίνει άνοιγμα %d  νέου παραθύρου.\n"
-"Θέλετε να εμφανίσετε αυτή την επαφή;;Ανοίγοντας %d επαφές θα γίνει άνοιγμα %"
-"d  νέων παραθύρων.\n"
+"Ανοίγοντας %d επαφές θα γίνει άνοιγμα %d  νέων παραθύρων.\n"
 "Θέλετε να εμφανίσετε όλες αυτές τις επαφές;"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3689,69 +3592,69 @@ msgstr ""
 "Το %s υπάρχει ήδη.\n"
 "Θέλετε να αντικατασταθεί;"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "Επαφή"
 msgstr[1] "Επαφές"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 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:756
 msgid "Move contact to"
 msgstr "Μετακίνηση επαφής σε"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Αντιγραφή επαφής σε"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Μετακίνηση επαφών σε"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Αντιγραφή επαφών σε"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Πολλαπλές VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard για %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Πληροφορίες επαφής για %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Υποβολή ερωτήματος στο Βιβλίο Διευθύνσεων..."
 
@@ -3841,12 +3744,12 @@ msgstr "Εισαγωγέας VCard Evolution"
 msgid "Print envelope"
 msgstr "Εκτύπωση φακέλου"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Εκτύπωση επαφών"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Εκτύπωση επαφής"
 
@@ -3895,7 +3798,7 @@ msgstr "Μορφοποίηση"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Κεφαλίδα"
@@ -3999,7 +3902,7 @@ msgstr "Σκίαση"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4041,12 +3944,11 @@ msgstr "Πνευματικά Δικαιώματα (C) 2000, Ximian, Inc."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr ""
-"Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφών"
+msgstr "Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφών"
 
 #: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
-msgstr "Δοκιμή εκτύπωσης επαφής"
+msgstr "Δοκιμή Εκτύπωσης Επαφής"
 
 #: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
@@ -4091,8 +3993,7 @@ msgid "Export in asynchronous mode"
 msgstr "Εξαγωγή σε ασύγχρονη κατάσταση"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "Ο αριθμός των καρτών σε ένα αρχείο αποτελέσματος σε ασύγχρονη κατάσταση, "
 "προεπιλεγμένο μέγεθος 100."
@@ -4102,8 +4003,7 @@ msgid "NUMBER"
 msgstr "ΑΡΙΘΜΟΣ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Σφάλμα παραμέτρων γραμμής εντολών, παρακαλώ χρησιμοποιήστε --help για να "
 "δείτε τη χρήση."
@@ -4161,8 +4061,7 @@ msgstr ""
 "δε θα είναι δυνατή η ανάκτηση τους."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Όλες οι πληροφορίες σε αυτό το ημερολόγιο θα διαγραφούν και δε θα είναι "
 "δυνατή η ανάκτηση τους."
@@ -4182,8 +4081,7 @@ msgstr ""
 "δυνατή η ανάκτηση τους."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Όλες οι πληροφορίες για αυτό το ραντεβού θα διαγραφούν και δε θα είναι "
 "δυνατή η ανάκτηση τους."
@@ -4197,8 +4095,7 @@ msgstr ""
 "θα είναι δυνατή η ανάκτηση τους."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Όλες οι πληροφορίες για αυτή τη συνάντηση θα διαγραφούν και δεν θα είναι "
 "δυνατή η ανάκτηση τους."
@@ -4227,8 +4124,7 @@ msgstr "Είστε βέβαιοι ότι θέλετε να διαγραφούν
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε να διαγραφούν αυτές οι {0} καταχωρήσεις ημερολογίου;"
+msgstr "Είστε βέβαιοι ότι θέλετε να διαγραφούν αυτές οι {0} καταχωρήσεις ημερολογίου;"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
@@ -4239,17 +4135,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Είστε βέβαιοι για τη διαγραφή αυτού του ραντεβού;"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Είστε βέβαιοι για τη διαγραφή αυτής της καταχώρησης ημερολογίου;"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Είστε βέβαιοι για τη διαγραφή αυτού του ραντεβού;"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Είστε βέβαιοι ότι θέλετε να διαγραφεί αυτή η εργασία;"
 
@@ -4302,8 +4195,7 @@ msgstr ""
 "επιτρέψουν να αποδεχθούν αυτή την εργασία."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Προσκλήσεις μέσω email θα σταλούν σε όλους τους συμμετέχοντες και θα τους "
 "επιτρέψουν να απαντήσουν."
@@ -4387,18 +4279,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Το ημερολόγιο του Evolution τερματίστηκε απρόσμενα."
 
 #: ../calendar/calendar.error.xml.h:45
-#, fuzzy
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Το ημερολόγιο του Evolution τερματίστηκε απρόσμενα."
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Οι εργασίες του Evolution τερματίστηκαν απρόσμενα."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "Το ημερολόγιο δεν έχει σημειωθεί για εργασία χωρίς σύνδεση."
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "Το ημερολόγιο που επιλέξατε είναι μόνο για ανάγνωση"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "Η λίστα εργασιών δεν έχει σημειωθεί για εργασία χωρίς σύνδεση."
@@ -4439,8 +4330,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
-"Θέλετε να στείλετε σε όλους τους συμμετέχοντες μια ειδοποίηση ακύρωσης;"
+msgstr "Θέλετε να στείλετε σε όλους τους συμμετέχοντες μια ειδοποίηση ακύρωσης;"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
@@ -4458,8 +4348,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
-"Θέλετε να στείλετε ενημερωμένες πληροφορίες εργασίας στους συμμετέχοντες;"
+msgstr "Θέλετε να στείλετε ενημερωμένες πληροφορίες εργασίας στους συμμετέχοντες;"
 
 #: ../calendar/calendar.error.xml.h:62
 msgid ""
@@ -4472,68 +4361,53 @@ 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
 msgid "You have changed this appointment, but not yet saved it."
 msgstr ""
 "Έχετε κάνει αλλαγές σε αυτό το ραντεβού, αλλά δεν τις έχετε αποθηκεύσει "
 "ακόμα."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr ""
 "Έχετε κάνει αλλαγές σε αυτή την εργασία, αλλά δεν τις έχετε αποθηκεύσει "
 "ακόμα."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr ""
-"Έχετε κάνει αλλαγές σε αυτό το memo, αλλά δεν τις έχετε αποθηκεύσει ακόμα."
+msgstr "Έχετε κάνει αλλαγές σε αυτό το memo, αλλά δεν τις έχετε αποθηκεύσει ακόμα."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Τα ημερολόγια σας δε θα είναι διαθέσιμα μέχρι το Evolution ξεκινήσει ξανά."
+msgstr "Τα ημερολόγια σας δε θα είναι διαθέσιμα μέχρι το Evolution ξεκινήσει ξανά."
 
-#: ../calendar/calendar.error.xml.h:68
-#, fuzzy
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr ""
-"Οι εργασίες σας δε θα είναι διαθέσιμες μέχρι το Evolution ξεκινήσει ξανά."
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Οι εργασίες σας δε θα είναι διαθέσιμες μέχρι το Evolution ξεκινήσει ξανά."
+msgstr "Οι εργασίες σας δε θα είναι διαθέσιμες μέχρι το Evolution ξεκινήσει ξανά."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
-msgstr "Α_πόρριψη αλλαγών"
+msgstr "Α_πόρριψη Αλλαγών"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_Αποθήκευση"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "Απο_θήκευση αλλαγών"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Αποστολή"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "Απο_στολή ειδοποίησης"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
@@ -4550,22 +4424,20 @@ msgstr "Διαχωρισμός Γεγονότων Multi-Day:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του  evolution-data-server"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1529
 #: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
 
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 msgid "Could not read pilot's Memo application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανάγνωση του τμήματος Memo του Υπολογιστή ΠαλάμηςMemo "
+msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Memo του Υπολογιστή ΠαλάμηςMemo "
 
 #: ../calendar/conduits/memo/memo-conduit.c:976
 #: ../calendar/conduits/memo/memo-conduit.c:979
@@ -4579,22 +4451,20 @@ msgstr "Προκαθορισμένη Προτεραιότητα:"
 #: ../calendar/conduits/todo/todo-conduit.c:1112
 #: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1151
 #: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Ημερολόγιο και Εργασίες"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Ημερολόγια"
 
@@ -4635,21 +4505,21 @@ msgid "Memo_s"
 msgstr "Memo_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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Memos"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Εργασίες"
@@ -4667,16 +4537,16 @@ msgstr "_Εργασίες"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του Ημερολογίου του Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "λεπτό"
 msgstr[1] "λεπτά"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4685,7 +4555,7 @@ msgid_plural "hours"
 msgstr[0] "ώρες"
 msgstr[1] "ώρες"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Χρόνος έναρξης"
 
@@ -4696,10 +4566,10 @@ msgstr "Ραντεβού"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Τοποθεσία:"
 
@@ -4709,16 +4579,16 @@ msgstr "Χρόνος της _χρονικής μετάθεσης:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
@@ -4730,31 +4600,32 @@ msgstr "Χρονική _Μετάθεση Υπενθύμισης"
 msgid "location of appointment"
 msgstr "τοποθεσία του ραντεβού"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Δεν υπάρχει διαθέσιμη περίληψη."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Δεν υπάρχει διαθέσιμη περιγραφή."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες τοποθεσίας."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Έχετε %d συναγερμούς"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4766,7 +4637,7 @@ msgstr ""
 "αποστολή e-mail το Evolution θα εμφανίσει ένα παράθυρο\n"
 "διαλόγου με μια κανονική υπενθύμιση."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4783,7 +4654,7 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την εκτέλεση του προγράμματος;"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Να μην ξαναγίνει η ερώτηση για αυτό το πρόγραμμα."
 
@@ -4838,21 +4709,18 @@ msgstr "Ερώτηση επαλήθευσης για τα στοιχεία πο�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr ""
-"Χρώμα παρασκηνίου για τις εργασίες που λήγουν σήμερα, σε μορφή \"#rrggbb\"."
+msgstr "Χρώμα παρασκηνίου για τις εργασίες που λήγουν σήμερα, σε μορφή \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr ""
-"Χρώμα παρασκηνίου για τις εργασίες που έχουν λήξει, σε μορφή \"#rrggbb\"."
+msgstr "Χρώμα παρασκηνίου για τις εργασίες που έχουν λήξει, σε μορφή \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Ημερολόγια για την εκτέλεση ειδοποιήσεων"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Χρώμα για το σχεδιασμό της γραμμής  Marcus Bains στη γραμμή χρόνου (κενό για "
 "προεπιλογή)"
@@ -4886,105 +4754,92 @@ msgid "Default reminder value"
 msgstr "Προεπιλεγμένης τιμή υπενθύμισης"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-#, fuzzy
-msgid "Event Gradient"
-msgstr "Πληροφορίες γεγονότος"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Διαφάνεια γεγονότος"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Urls διαθεσιμότητας εξυπηρετητή"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Url προτύπου διαθεσιμότητας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Απόκρυψη ολοκληρωμένων εργασιών"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Απόκρυψη μονάδων εργασίας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Απόκρυψη τιμής εργασίας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Τοποθεσία οριζόντιου ταμπλό"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Η ώρα που τελειώνει η εργάσιμη ημέρα, σε 24ωρη μορφή, από 0 σε 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Η ώρα που ξεκινάει η εργάσιμη ημέρα, σε 24ωρη μορφή, από 0 σε 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Χρονικά διαστήματα που προβάλλονται στις προβολές Ημέρας, Εβδομάδας και "
 "εργάσιμης εβδομάδας σε λεπτά."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Ώρα τελευταίου συναγερμού"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Λίστα από urls εξυπηρετητών για δημοσιοποίηση διαθεσιμότητας."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Γραμμή Marcus Bains "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Χρώμα γραμμής Marcus Bains - Προβολή ημέρας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Χρώμα γραμμής Marcus Bains - Γραμμή ώρας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Λεπτό που τελειώνει η εργάσιμη μέρα, από 0 ως 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Λεπτό που ξεκινάει η εργάσιμη μέρα, από 0 ως 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Οριζόντια τοποθεσία του ταμπλό μηνιαίας προβολής"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Κάθετη τοποθεσία του ταμπλό μηνιαίας προβολής"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Αριθμός μονάδων για το καθορισμό της προεπιλεγμένης υπενθύμισης."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Αριθμός μονάδων για τον καθορισμό χρόνου απόκρυψης εργασιών."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Εργασίες που έχουν λήξει"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4992,7 +4847,7 @@ msgstr ""
 "Τοποθεσία του οριζόντιου ταμπλό, ανάμεσα στον περιηγητή ώρας ημερολογίου και "
 "στη λίστα εργασιώνόταν δεν υπάρχει μηνιαία προβολή, σε εικονοστοιχεία."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5001,15 +4856,7 @@ msgstr ""
 "ώρας ημερολογίου και τη λίστα εργασιών κατά τη μηνιαία προβολή, σε "
 "εικονοστοιχεία."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-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.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5017,7 +4864,7 @@ msgstr ""
 "Τοποθεσία του κάθετου πίνακα, ανάμεσα στη λίστα εργασιών και τον πίνακα "
 "προεπισκόπησης λίστας, σε εικονοστοιχεία."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5026,7 +4873,7 @@ msgstr ""
 "ώρας ημερολογίου και τη λίστα εργασιών κατά τη μηνιαία προβολή, σε "
 "εικονοστοιχεία."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5035,68 +4882,65 @@ msgstr ""
 "ώρας ημερολογίου και τη λίστα εργασιών όταν δεν υπάρχει μηνιαία προβολή, σε "
 "εικονοστοιχεία."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Προγράμματα που μπορούν να εκτελούνται από τους συναγερμούς."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Εμφάνιση πεδίου RSVP στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Εμφάνιση πεδίου ρόλου στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Ε_μφάνιση χρόνων τέλους ραντεβού στις προβολές εβδομάδας και μήνα"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
-"Εμφάνιση πεδίου κατηγοριών στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
+msgstr "Εμφάνιση πεδίου κατηγοριών στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Εμφάνιση συναγερμών στην περιοχή ειδοποίησης"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
-msgstr ""
-"Εμφάνιση πεδίου κατάστασης στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
+msgstr "Εμφάνιση πεδίου κατάστασης στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Προβολή του ταμπλό \"Προεπισκόπηση\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Προβολή του ταμπλό \"Προεπισκόπηση\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
-msgstr ""
-"Εμφάνιση πεδίου ζώνης ώρας στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
+msgstr "Εμφάνιση πεδίου ζώνης ώρας στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Εμφάνιση πεδίου τύπου στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Εμφάνιση αριθμών εβδομάδων στον περιηγητή ημερολογίου"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Χρώμα εργασιών που λήγουν σήμερα"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Τοποθεσία κάθετου ταμπλό εργασιών"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5106,7 +4950,7 @@ msgstr ""
 "από το κομμάτι χρήστη της διεύθυνσης email και το %d αντικαθίσταται από το "
 "τομέα."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5115,64 +4959,55 @@ msgstr ""
 "ημερολόγιο, όπως στην αμετάφραστη βάση δεδομένων olsen σαν  \"America/New "
 "York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Διαιρέσεις ώρας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Ώρα τελευταία εκτέλεσης συναγερμού, σε  time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Ζώνη ώρας "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24ωρη μορφή ώρας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Μονάδες για μια προεπιλεγμένη υπενθύμιση. \"λεπτά\", \"ώρες\" or \"ημέρες\"."
+msgstr "Μονάδες για μια προεπιλεγμένη υπενθύμιση. \"λεπτά\", \"ώρες\" or \"ημέρες\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Μονάδες για τον καθορισμό της απόκρυψης εργασιών, \"λεπτά\", \"ώρες\" ή "
 "\"ημέρες\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Εβδομάδα ξεκινάει"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ημέρα που ξεκινάει η εβδομάδα, από Κυριακή (0) σε Σάββατο (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Αν θα γίνετε χρήση ή όχι της περιοχής ειδοποίησης για την εμφάνιση "
 "συναγερμών."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Ερώτηση επαλήθευσης για τη διαγραφή ραντεβού ή εργασίας."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr ""
-"Αν θα γίνεται ερώτηση επαλήθευσης για την εξάλειψη ραντεβού και εργασιών."
+msgstr "Αν θα γίνεται ερώτηση επαλήθευσης για την εξάλειψη ραντεβού και εργασιών."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5180,100 +5015,90 @@ msgstr ""
 "Αν θα γίνεται συμπίεση των σαββατοκύριακων στη μηνιαία προβολή,  και έτσι το "
 "Σάββατο και η Κυριακή να καταλαμβάνουν το χώρο μιας ημέρας."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Αν θα εμφανίζεται η ώρα τέλους των γεγονότων στις προβολές εβδομάδας και "
 "μήνα."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Αν θα σχεδιάζεται η γραμμή  Marcus Bains (γραμμή στη τρέχουσα ώρα) στο "
 "ημερολόγιο."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Αν θα γίνεται απόκρυψη ολοκληρωμένων εργασιών στην προβολή εργασιών."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Αν θα ορισθεί μια προεπιλεγμένη υπενθύμιση για ραντεβού."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Αν θα εμφανίζεται το πεδίο RSVP στον επεξεργαστή γεγονότων/εργασιών/"
 "συναντήσεων"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Αν θα εμφανίζεται το πεδίο κατηγοριών στον επεξεργαστή γεγονότων/εργασιών/"
 "συναντήσεων"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Αν θα εμφανίζεται το πεδίο ρόλων στον επεξεργαστή γεγονότων/εργασιών/"
 "συναντήσεων"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Αν θα εμφανίζεται το πεδίο κατάστασης στον επεξεργαστή γεγονότων/εργασιών/"
 "συναντήσεων"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Αν θα εμφανίζεται η ώρα σε 24ωρη μορφή αντί για μμ/πμ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Αν θα εμφανίζεται το πεδίο ζώνης ώρας στον επεξεργαστή γεγονότων/εργασιών/"
 "συναντήσεων"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Αν θα εμφανίζεται το πεδίο τύπου στον επεξεργαστή γεγονότων/εργασιών/"
 "συναντήσεων"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Αν θα εμφανίζονται οι αριθμοί εβδομάδων στον περιηγητή ημερολογίου."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "Εργάσιμες ημέρες"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Ώρα λήξης της εργάσιμης μέρας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Λεπτό τέλους εργάσιμης ημέρας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Ώρα έναρξης της εργάσιμης μέρας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Λεπτό έναρξης της εργάσιμης μέρας"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "θερινή ώρα"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Η περίληψη περιέχει"
@@ -5282,25 +5107,39 @@ msgstr "Η περίληψη περιέχει"
 msgid "Description contains"
 msgstr "Η περιγραφή περιέχει"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Το σχόλιο περιέχει"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Η τοποθεσία περιέχει"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Αταίριαστο"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Εκτύπωση"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Ημερολόγιο"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5317,10 +5156,10 @@ msgstr "Εκκαθάριση γεγονότων παλαιότερων από"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "ημέρες"
 
@@ -5328,92 +5167,91 @@ msgstr "ημέρες"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Στο δικτυακό ιστό"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Γενέθλια και επέτειοι"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Καιρός"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "_Νέο Ημερολόγιο"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Αποτυχία αναβάθμισης ημερολογίων."
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Αδυναμία ανοίγματος του ημερολογίου '%s' για τη δημιουργία γεγονότων και "
 "συναντήσεων"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
-msgstr ""
-"Δεν υπάρχει διαθέσιμο ημερολόγιο για τη δημιουργία γεγονότων και συναντήσεων"
+msgstr "Δεν υπάρχει διαθέσιμο ημερολόγιο για τη δημιουργία γεγονότων και συναντήσεων"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Επιλογέας πηγής ημερολογίου"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Νέο Ραντεβού"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "Ρ_αντεβού"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Δημιουργία νέου ραντεβού"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Νέα συνάντηση"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "Συ_νάντηση"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Δημιουργία νέας αίτησης συνάντησης"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Νέο ολοήμερο ραντεβού"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Ολοήμερο _Ραντεβού"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Δημιουργία ένος νέου ολοήμερου ραντεβού"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Νέο ημερολόγιο"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Ημερο_λόγιο"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Δημιουργία νέου ημερολογίου"
 
@@ -5445,11 +5283,11 @@ msgstr "Η μέθοδος δεν υποστηρίζεται κατά το άνο
 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:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "Επεξεργασία ειδοποίησης"
 
@@ -5554,7 +5392,7 @@ msgstr "λεπτό(ά)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
-msgstr "αρχή του ραντεβού"
+msgstr "αρχή ραντεβού"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
@@ -5565,25 +5403,54 @@ msgid "A_dd"
 msgstr "_Προσθήκη"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Ειδοποιήσεις"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Πρόταση για αυτόματη προβολή του συνημμένου"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Πρόταση για αυτόματη προβολή της επισύναψης"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Επισύναψη αρχείου(ων)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Ιδιότητες Συνημμένου"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Περιγραφή:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "File name:"
+msgstr "Όνομα αρχείου:"
+
+#: ../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:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Επιλεγμένα ημερολόγια ως ειδοποιήσεις"
 
@@ -5603,14 +5470,13 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u και %d θα αντικατασταθούν από χρήστη και τομέα από τη διεύθυνση email."
 "</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Συναγερμοί</span>"
 
@@ -5621,7 +5487,7 @@ msgstr ""
 "span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Γενικά</span>"
@@ -5638,25 +5504,27 @@ msgstr "<span weight=\"bold\">Ώρα</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Εργάσιμη εβδομάδα</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Προσαρμογή για _θερινώ ώρα"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Ημέρα τ_ελειώνει:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Εμφάνιση"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Διαθεσιμότητα"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5666,13 +5534,13 @@ msgstr ""
 "Ώρες\n"
 "Ημέρες"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5690,227 +5558,219 @@ msgstr ""
 "Σάββατο\n"
 "Κυριακή"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Επιλογή ενός χρώματος"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_Κυρ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Επιλογή των ημερολογίων για σημείωση ειδοποίησης"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "Εμ_φάνιση υπενθύμισης"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Εμφάνιση _αριθμών εβδομάδων στον περιηγητή ημερολογίου"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "Ερ_γασίες που λήγουν σήμερα:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "_Πέμ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Πρότυπο:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "_Ζώνη ώρας:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Μορφή ώρας:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "Ε_βδομάδα ξεκινάει:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Ημέρες εργασίας:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Ώρες (ΠΜ/ΜΜ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 ώρες"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ερώτηση επαλήθευσης για τα στοιχεία που διαγράφονται"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Συμπίεση σαββατοκύριακων στη μηνιαία προβολή"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
-msgstr "Η _μέρα αρχίζει στις:"
+msgstr "Η _μέρα αρχίζει στις :"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_Παρ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "_Απόκρυψη ολοκληρωμένων εργασιών μετά"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Δευ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "Εργασίες που έχουν λή_ξει:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "_Σάβ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "Ε_μφάνιση χρόνων τέλους ραντεβού στις προβολές εβδομάδας και μήνα"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "_Διαιρέσεις ώρας:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "Τ_ρίτη"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Τετ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "πριν από κάθε ραντεβού"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Αντι_γραφή περιεχομένων ημερολογίου τοπικά για εργασία χωρίς σύνδεση"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Αντιγραφή περιεχομένων ημερολογίου τοπικά για εργασία χωρίς σύνδεση"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Αν_τιγραφή περιεχομένων λίστας τοπικά για εργασία χωρίς σύνδεση"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Αντιγραφή περιεχομένων λίστας τοπικά για εργασία χωρίς σύνδεση"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Αντιγραφή περιεχομένων λίστας memo τοπικά για εργασία χωρίς σύνδεση"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Αντιγραφή περιεχομένων λίστας τοπικά για εργασία χωρίς σύνδεση"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Χ_ρώμα:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#, fuzzy
-msgid "Task List"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
 msgstr "Λίστα Εργασιών"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#, fuzzy
-msgid "Memo List"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
 msgstr "Λίστα Memos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Ιδιότητες Ημερολογίου"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Νέο Ημερολόγιο"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Ιδιότητες Λίστας Εργασιών"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Νέα Λίστα Memo"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Προσθήκη Ημερολογίου"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Προσθήκη Λίστας Εργασιών"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "Π_ροσθήκη Ημερολογίου"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "Προσ_θήκη Λίστας Εργασιών"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "Α_νανέωση:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5969,49 +5829,49 @@ msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί
 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:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " με "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr "(Ολοκληρωμένο"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Ολοκληρωμένο "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr "(Λήξη"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Λήξη "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Συνημμένο μήνυμα - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d συνημμένο μήνυμα"
 msgstr[1] "%d συνημμένα μηνύματα"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Μετακίνηση"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Ακύρωση _Drag"
 
@@ -6019,7 +5879,7 @@ msgstr "Ακύρωση _Drag"
 msgid "Could not update object"
 msgstr "Δεν ήταν δυνατή η ενημέρωση του αντικειμένου"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6031,99 +5891,99 @@ msgid "Hide Attachment _Bar"
 msgstr "Απόκρυψη _μπάρας συνημμένων"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Εμφάνιση _μπάρας συνημμένων"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Απομάκρυνση"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Ιδιότητες"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Προσθήκη συνημμένου..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Εμφάνιση συνημμένων"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
-msgstr ""
-"Πατήστε το πλήκτρο space για να εναλλάσσεται η προβολή της γραμμής συνημμένων"
+msgstr "Πατήστε το πλήκτρο space για να εναλλάσσεται η προβολή της γραμμής συνημμένων"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Επεξεργασία Ραντεβού"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
-msgstr "Συνάντηση -  %s"
+msgstr "Συνάντηση  -  %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
-msgstr "Ραντεβού - %s"
+msgstr "Ραντεβού   -   %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "Ανατιθέ_μενη εργασία - %s"
+msgstr "Ανατιθέ_μενη εργασία  -   %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
-msgstr "Εργασία - %s"
+msgstr "Εργασία   -   %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
-msgstr "Ημερολογιακή καταχώριση - %s"
+msgstr "Ημερολογιακή καταχώριση   -   %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "συνημμένο"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν "
 "καταφθάσει μια ενημέρωση"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Δεν ήταν δυνατή η εκτέλεση της τρέχουσας έκδοση!"
 
@@ -6139,12 +5999,6 @@ msgstr "Αδύνατο το άνοιγμα προορισμού"
 msgid "Destination is read only"
 msgstr "Ο προορισμός είναι μόνο για ανάγνωση"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-"_Διαγραφή αυτού του αντικειμένου από τα γραμματοκιβώτια όλων των άλλων των "
-"παραληπτών;"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του γεγονότος λόγω σφάλματος cobra"
@@ -6171,8 +6025,7 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 
 #: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
-"Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
+msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -6207,128 +6060,139 @@ msgstr "Εξουσιοδότηση Σε:"
 msgid "Enter Delegate"
 msgstr "Εισαγωγή Αντιπροσώπου"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Ραντε_βού"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Επανεμφάνιση"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Αυτό το γεγονός έχει ειδοποιήσεις"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Ημερο_λόγιο:"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../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 "_Διοργανωτής:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "Ε_κπρόσωποι"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Παρευρι_σκόμενοι"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Γεγονός χωρίς ημερομηνία έναρξης"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Γεγονός χωρίς ημερομηνία λήξης"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λάθος"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Η ώρα έναρξης είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Η ώρα λήξης είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Το επιλεγμένο organizer δεν έχει πια ένα λογαριασμό."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Χρειάζεται ένας διοργανωτής."
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Προσθήκη"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Αδυναμία ανοίγματος του ημερολογίου '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d ημέρα πριν από ραντεβού"
 msgstr[1] "%d ημέρες πριν από ραντεβού"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d ώρα πριν από ραντεβού"
 msgstr[1] "%d ώρες πριν από ραντεβού"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d λεπτό πριν από ραντεβού"
 msgstr[1] "%d λεπτά πριν από ραντεβού"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Προσαρμογή"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "Κανένα"
 
@@ -6345,7 +6209,8 @@ msgid "15 minutes before appointment"
 msgstr "15 λεπτά πριν από ραντεβού"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "Παρευ_ρισκόμενοι..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6353,25 +6218,29 @@ msgstr "Παρευ_ρισκόμενοι..."
 msgid "Ca_tegories..."
 msgstr "_Κατηγορίες..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Προσαρμοσμένη ειδοποίηση:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "Π_εριγραφή:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Περιγραφή Γεγονότος"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "Τοπο_θεσία:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Περ_ίληψη:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "Ει_δοποίηση"
 
@@ -6393,6 +6262,14 @@ msgstr "για"
 msgid "until"
 msgstr "μέχρι"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "Ε_κπρόσωποι"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Από:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6439,7 +6316,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -6460,90 +6337,68 @@ msgid "Organizer"
 msgstr "Διοργανωτής"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Διοργανωτής:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα του memo '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "Προς"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "Ημερομηνία έ_ναρξης:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#, fuzzy
-msgid "Su_mmary"
-msgstr "Περ_ίληψη:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#, fuzzy
-msgid "T_o:"
-msgstr "Επάνω:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Ομάδα:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "Περιεχόμενο _Memo:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Επιλογές ημερολογίου</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Προσθήκη νέου ημερολογίου"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Ομάδα Ημερολογίου"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Τοποθεσία Ημερολογίου"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Όνομα Ημερολογίου"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Επιλογές Λίστας Εργασιών</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Προσθήκη Νέας Λίστας Εργασιών"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Ομάδα Λίστας Εργασιών"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Όνομα Λίστας Εργασιών"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
-"Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε;"
+msgstr "Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε;"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event. What would you like to delegate?"
@@ -6551,14 +6406,11 @@ msgstr "Αναθέτετε ένα επαναλαμβανόμενο γεγονό�
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr ""
-"Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε;"
+msgstr "Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε;"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
-"Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε;"
+msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε;"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6687,7 +6539,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>"
 
@@ -6752,15 +6604,15 @@ msgstr "<span weight=\"bold\">Κατάσταση</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Υψηλή"
 
@@ -6769,20 +6621,20 @@ msgstr "Υψηλή"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Σε Εξέλιξη"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Χαμηλή"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Κανονική"
 
@@ -6790,7 +6642,7 @@ msgstr "Κανονική"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Δεν έχει ξεκινήσει"
 
@@ -6803,7 +6655,7 @@ msgid "Stat_us:"
 msgstr "Κα_τάσταση:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Αόριστο"
 
@@ -6812,7 +6664,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:31
 msgid "_Priority:"
 msgstr "_Προτεραιότητα:"
 
@@ -6820,12 +6672,12 @@ msgstr "_Προτεραιότητα:"
 msgid "_Web Page:"
 msgstr "Ιστοσε_λίδα:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Εργασία"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Λεπτομέρειες εργασίας"
 
@@ -6838,10 +6690,6 @@ msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 msgid "Unable to open tasks in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα των εργασιών στο '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "Παρευ_ρισκόμενοι..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "_Κατηγορίες..."
@@ -6850,6 +6698,10 @@ msgstr "_Κατηγορίες..."
 msgid "Or_ganiser:"
 msgstr "_Διοργανωτής:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "Ημερομηνία έ_ναρξης:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Ζώνη ώρας:"
@@ -6858,46 +6710,46 @@ msgstr "Ζώνη ώρας:"
 msgid "_Due date:"
 msgstr "Ημερομηνία _Λήξης:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Διαθεσιμότητα Ημε_ρολογίων</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Συχνότητα Δημοσιεύσεων</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>Τοποθεσία _δημοσίευσης</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Ρυμίσεις δημοσίευσης διαθεσιμότητας"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Ημερησίως"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Χειροκίνητα"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "Απο_μνημόνευση κωδικού"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_Όνομα Χρήστη:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "Εβδο_μαδιαίως"
 
@@ -6978,42 +6830,35 @@ 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:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, 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
-msgid "Untitled"
-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
-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
-msgid "Description:"
-msgstr "Περιγραφή:"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "Memo:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Ιστοσελίδα:"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Χωρίς τίτλο"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Περίληψη:"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "Ημερομηνία Έναρξης:"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Ημερομηνία Λήξης:"
@@ -7023,7 +6868,7 @@ msgstr "Ημερομηνία Λήξης:"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Κατάσταση:"
 
@@ -7032,17 +6877,17 @@ 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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Δημόσιο"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Ιδιωτικό"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Εμπιστευτικό"
 
@@ -7051,25 +6896,24 @@ msgid "End Date"
 msgstr "Ημερομηνία λήξης"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "Ημερομηνία Έναρξης"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Περίληψη"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Απασχολημένη"
 
@@ -7083,17 +6927,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ναι"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Όχι"
@@ -7104,21 +6948,21 @@ msgstr "Όχι"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Επανάληψη"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Ανάθεση"
 
@@ -7126,7 +6970,7 @@ msgstr "Ανάθεση"
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Επιλογή φακέλου για αποθήκευση των επιλεγμένων συνημμένων..."
 
@@ -7135,11 +6979,11 @@ msgstr "Επιλογή φακέλου για αποθήκευση των επι�
 msgid "untitled_image.%s"
 msgstr "ανώνυμη_εικόνα.%s"
 
-#: ../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:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
-msgstr "Αποθήκευση _ως..."
+msgstr "Αποθήκευση _Ως..."
 
 #: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
@@ -7155,79 +6999,74 @@ msgstr "Απο_θήκευση επιλεγμένων"
 msgid "Open in %s..."
 msgstr "Άνοιγμα με %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Διαγραφή επιλεγμένων αντικειμένων"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Αναβάθμιση Αντικειμένων"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Νέα ερ_γασία"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
-msgstr "Άνοιγμα ιστο_σελίδας"
+msgstr "Άνοιγμα Ιστο_σελίδας"
 
-#: ../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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7235,52 +7074,44 @@ msgstr "Άνοιγμα ιστο_σελίδας"
 msgid "_Print..."
 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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Αποκοπή"
 
-#: ../calendar/gui/e-calendar-table.c: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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Επι_κόλληση"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
-msgstr "_Ανάθεση εργασίας"
+msgstr "_Ανάθεση Εργασίας"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Προώ_θηση ως iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Σημείωση ως μη ολοκληρωμένο"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Σημείωση επιλεγμένων εργασιών ως μη ολοκληρωμένες"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Διαγραφή Επιλεγμένων Εργασιών"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Κλικ εδώ για προσθήκη εργασίας"
@@ -7290,7 +7121,7 @@ msgstr "Κλικ εδώ για προσθήκη εργασίας"
 msgid "% Complete"
 msgstr "% Ολοκληρωμένο"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Ολοκληρώθηκε"
 
@@ -7315,101 +7146,105 @@ msgstr "Ημερομηνία έναρξης"
 msgid "Task sort"
 msgstr "Ταξινόμηση Εργασιών"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Μετακίνηση αντικειμένων"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Αντιγραφή αντικειμένων"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Νέο Ρ_αντεβού..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Νέα _συνάντηση"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Νέα ερ_γασία"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Τρέχουσα Προβολή"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Επιλογή _Σημερινής Μέρας"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "Επιλο_γή Ημερομηνίας..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Α_ντιγραφή στο Ημερολόγιο..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Με_τακίνηση στο Ημερολόγιο..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "Ανάθεση _συνάντησης..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Προγραμματισμός _Συνάντησης..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "Προώ_θηση ως iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "Α_πάντηση"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
-msgstr "Απάντηση σε _όλους"
+msgstr "Απάντηση σε _Όλους"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Να γίνει μετακινούμενη αυτή η επανά_ληψη"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
-msgstr "Διαγραφή ό_λων των εμφανίσεων"
+msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Διοργανωτής: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Διοργανωτής: %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:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Τοποθεσία: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "'Ωρα: %s %s"
@@ -7439,7 +7274,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i τμήματα λεπτών"
@@ -7450,22 +7285,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:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "πμ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "μμ"
 
@@ -7557,12 +7390,10 @@ msgstr "Σφάλμα iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Ένα άγνωστο άτομο"
 
@@ -7577,22 +7408,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Αποδοχή"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Δοκιμαστική Αποδοχή"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Άρνηση πρόσβασης"
 
@@ -7603,8 +7434,7 @@ msgid ""
 msgstr "Η συνάντηση ακυρώθηκε αλλά μπορεί να βρεθεί στα ημερολόγια σας"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "Η εργασία ακυρώθηκε αλλά μπορεί να βρεθεί στη λίστα εργασιών σας"
 
 #: ../calendar/gui/e-itip-control.c:1305
@@ -7757,7 +7587,7 @@ msgstr "ο/η <b>%s</b> ζητά πληροφορίες διαθεσιμότητ
 
 #: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Request"
-msgstr "Αίτηση διαθεσιμότητας"
+msgstr "Αίτηση Διαθεσιμότητας"
 
 #: ../calendar/gui/e-itip-control.c:1465
 #, c-format
@@ -7766,11 +7596,11 @@ msgstr "ο/η <b>%s</b> απάντησε στην αίτηση διαθεσιμ�
 
 #: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
-msgstr "Απάντηση διαθεσιμότητας"
+msgstr "Απάντηση Διαθεσιμότητας"
 
 #: ../calendar/gui/e-itip-control.c:1471
 msgid "Bad Free/Busy Message"
-msgstr "Εσφαλμένο μήνυμα διαθεσιμότητας"
+msgstr "Εσφαλμένο Μήνυμα Διαθεσιμότητας"
 
 #: ../calendar/gui/e-itip-control.c:1546
 msgid "The message does not appear to be properly formed"
@@ -7786,8 +7616,7 @@ msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει �
 
 #: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment has no viewable calendar items"
-msgstr ""
-"Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δε μπορούν να προβληθούν"
+msgstr "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δε μπορούν να προβληθούν"
 
 #: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
@@ -7799,8 +7628,7 @@ msgstr "Το αντικείμενο δεν είναι έγκυρο και δε �
 
 #: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί;"
+msgstr "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί;"
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
@@ -7813,7 +7641,7 @@ msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
@@ -7847,7 +7675,7 @@ msgstr "Δοκιμαστική αποδοχή"
 #: ../calendar/gui/e-itip-control.c:2232
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
-msgstr "Απόρριψη"
+msgstr "Απόκρυψη"
 
 #: ../calendar/gui/e-itip-control.c:2261
 msgid "Send Free/Busy Information"
@@ -7862,35 +7690,48 @@ msgid "Send Latest Information"
 msgstr "Αποστολή τελευταίων πληροφοριών"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--στο--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Μήνυμα Ημερολογίου"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Ημερομηνία:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Φόρτωση Ημερολογίου"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Φόρτωση Ημερολογίου..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Μήνυμα Διακομιστή:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "ημερομηνία τέλους"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "ημερομηνία έναρξης"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Άτομα Προεδρείου"
@@ -7909,65 +7750,65 @@ msgid "Resources"
 msgstr "Πόροι"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Άτομο"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Ομάδα"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Πόρος"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Αίθουσα"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Προεδρείο"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Απαραίτητος Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Προαιρετικός Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Μη-Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
-msgstr "Απαιτεί ενέργεια"
+msgstr "Απαιτεί Ενέργεια"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Δοκιμαστικά"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Εξουσιοδοτήθηκε"
 
@@ -7976,14 +7817,14 @@ msgstr "Εξουσιοδοτήθηκε"
 msgid "Attendee                          "
 msgstr "Παρευρισκόμενος"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
-msgstr "Σε εξέλιξη"
+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:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7991,86 +7832,86 @@ 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:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Εκτός Γραφείου"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Χωρίς Πληροφορίες"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Παρευ_ρισκόμενοι..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "Επι_λογές"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Εμφάνιση _μόνο των ωρών Εργασίας"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Εμφάνιση Σ_μίκρυνσης"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Ανα_νέωση Διαθεσιμότητας"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Αυτόματη επιλογή"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "Όλα _τα Άτομα και οι Πόροι"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Όλα τα Άτομα και ένας _Πόρος"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Απαιτούμενα Άτομα"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Απαιτούμενα Άτομα και έ_νας Πόρος"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Χρόνος Έ_ναρξης:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Χρόνος Λήξης:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Διαγραφή Επιλεγμένων Memo"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Κλικ εδώ για προσθήκη memo"
 
@@ -8078,8 +7919,8 @@ msgstr "Κλικ εδώ για προσθήκη memo"
 msgid "Memo sort"
 msgstr "Ταξινόμηση memo"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8097,7 +7938,7 @@ msgstr "Φόρτωση memo"
 msgid "Opening memos at %s"
 msgstr "Άνοιγμα memos στο %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
@@ -8106,72 +7947,66 @@ msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 msgid "Enter the password for %s"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Φόρτωση εργασιών"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Ολοκλήρωση εργασιών..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "Επιλέξτε Ζώνη Ώρας"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Αναβάθμιση ερωτήματος"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "Προσα_ρμοσμένη Προβολή"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "Απο_θήκευση προσαρμοσμένης προβολής"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "Κα_θορισμός Προβολών..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Φόρτωση ραντεβού σε %s"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Φόρτωση εργασιών σε %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, fuzzy, c-format
-msgid "Loading memos at %s"
-msgstr "Φόρτωση memo"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Άνοιγμα %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Εκκαθάριση"
 
@@ -8285,18 +8120,31 @@ msgstr "Πληροφορίες iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Πρέπει να είστε παρευρισκόμενος για αυτό το γεγονός."
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "_Νέα Λίστα Memo"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Αντιγραφή"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Ιδιότητες..."
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8304,61 +8152,46 @@ msgid_plural ", %d selected"
 msgstr[0] "%d επιλεγμένο"
 msgstr[1] "%d επιλεγμένα"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "Αποτυχία αναβάθμισης memos."
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Αδυναμία ανοίγματος της λίστας memo '%s' για τη δημιουργία γεγονότων και "
 "συναντήσεων"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "δεν υπάρχει διαθέσιμο ημερολόγιο για τη δημιουργία memo"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Επιλογέας πηγής memo"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Νέo memo"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
-msgstr "Mem_o"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr "_Memo"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Δημιουργία νέου memo"
 
-#: ../calendar/gui/memos-component.c:1172
-#, fuzzy
-msgid "New shared memo"
-msgstr "Νέo memo"
-
-#: ../calendar/gui/memos-component.c:1173
-#, fuzzy
-msgid "_Shared memo"
-msgstr "%d memo"
-
-#: ../calendar/gui/memos-component.c:1174
-#, fuzzy
-msgid "Create a shared new memo"
-msgstr "Δημιουργία νέου memo"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Νέα λίστα memo"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
 msgstr "_Λίστα memo"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Δημιουργία νέας λίστας memo"
 
@@ -8407,240 +8240,240 @@ msgstr "Αδυναμία εισαγωγής ημερολογίου '%s'"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Αδυναμία εισαγωγής των εργασιών '%s'"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1η"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2η"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3η"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4η"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5η"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6η"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7η"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8η"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9η"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10η"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11η"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12η"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13η"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14η"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15η"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16η"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17η"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18η"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19η"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20η"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21η"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22η"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23η"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24η"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25η"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26η"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27η"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28η"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29η"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30η"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31η"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Κυ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Δε"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Τρ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Τε"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Πε"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Πα"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Σα"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Επιλεγμένη ημέρα (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Επιλεγμένη εβδομάδα (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Επιλεγμένος μήνας (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Επιλεγμένο έτος (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Ραντεβού"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Εργασία"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Περίληψη: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Κατάσταση: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Προτεραιότητα: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "%i Ποσοστό Ολοκλήρωσης"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Κατηγορίες: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 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
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Προεπισκόπηση Εκτύπωσης"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Εκτύπωση Στοιχείου"
 
@@ -8699,14 +8532,14 @@ msgid "New task list"
 msgstr "Νέα λίστα εργασιών"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "Λί_στα Εργασιών"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Δημιουργία νέας λίστας εργασίας"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8719,11 +8552,11 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για τη διαγραφή των μηνυμάτων;"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Να μην ξαναγίνει η ερώτηση."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Εργασίες Εκτύπωσης"
 
@@ -9299,7 +9132,7 @@ msgid "America/Nassau"
 msgstr "Αμερική/Νασσάου"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Αμερική/Νέα Υόρκη"
 
@@ -10318,7 +10151,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Μπάρα Συνημμένων"
 
@@ -10326,43 +10159,28 @@ msgstr "Μπάρα Συνημμένων"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Δεν είναι δυνατή η επισύναψη του αρχείου %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Δεν είναι δυνατή η επισύναψη του αρχείου %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 "Τύπος MIME:"
-
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Προορισμός αποστολής"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Επιλέξτε τους φακέλους για να αποστείλετε μήνυμα σε αυτούς."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Κλικ εδώ για το βιβλίο διευθύνσεων"
 
@@ -10373,45 +10191,45 @@ msgstr "Κλικ εδώ για το βιβλίο διευθύνσεων"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Απάντηση Σε:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "Α_πό:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Θέμα:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "Πρ_ος:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Κοινοποίηση:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "Κρ_υφή κοινοποίηση:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10422,16 +10240,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "Απο_στολή Σε:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
-msgstr ""
-"Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
+msgstr "Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Αποστολή Σε:"
 
@@ -10439,18 +10256,17 @@ msgstr "Αποστολή Σε:"
 msgid "A_ttach"
 msgstr "Επι_σύναψη"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Εισαγωγή συνημμένου"
 
-#: ../composer/e-msg-composer.c:827
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:828
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
 "υπογραφής από το λογαριασμό"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10458,52 +10274,52 @@ msgstr ""
 "Αδυναμία κρυπτογράφησης εξερχόμενου μηνύματος: Δεν έχει ορισθεί "
 "πιστοποιητικό κρυπτογράφησης από το λογαριασμό"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Απόκρυψη _μπάρας συνημμένων"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Εμφάνιση _μπάρας συνημμένων"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Άγνωστος λόγος"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Μήνυμα χωρίς τίτλο"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Άνοιγμα Αρχείου"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Αυτόματη δημιουργία"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "_Υπογραφή:"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10527,8 +10343,7 @@ msgstr "Όλοι οι λογαριασμοί απομακρύνθηκαν."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
-"Είστε βέβαιοι για τη διαγραφή του μηνύματος με όνομα '{0}', που γράφετε;"
+msgstr "Είστε βέβαιοι για τη διαγραφή του μηνύματος με όνομα '{0}', που γράφετε;"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -10655,7 +10470,7 @@ msgstr "_Αποθήκευση Μηνύματος"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10723,14 +10538,18 @@ msgid "Yes, Change Status"
 msgstr "Ναι, Αλλαγή Κατάστασης"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Λήψη Μηνύματος</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Αποστολή Μηνύματος:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10742,33 +10561,33 @@ msgstr ""
 "που στέλνετε έχει αναγνωσθεί, και να καθορίσετε αν το Evolution θα στέλνει "
 "και πότε όταν κάποιος τρίτος ζητά μια απόδειξη από εσάς.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Να αποστέλλεται πάντα απόδειξη ανάγνωσης"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Να γίνεται ερώτηση αν επιθυμώ να στείλω απόδειξη ανάγνωσης"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Ποτέ να μη στέλνεται απόδειξη ανάγνωσης"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Αποδείξεις Ανάγνωσης"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Να ζητείται απόδειξη ανάγνωσης για όλα τα μηνύματα που στέλνω"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "Εκτός και αν το μήνυμα απευθύνεται σε λίστα ταχυδρομείου, και όχι σε μένα "
 "προσωπικά"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10776,7 +10595,7 @@ msgstr ""
 "Όταν λαμβάνετε ένα Email με απαίτηση απόδειξης ανάγνωσης, τι να κάνει το "
 "Evolution;"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10784,28 +10603,28 @@ msgstr ""
 "Υπάρχει ήδη αρχείο με αυτό το όνομα\n"
 "Να γίνει επικάλυψη;"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Αντικατάσταση αρχείου;"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Προειδοποίηση Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Πληροφορίες Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Ερώτημα Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr ">Εσωτερικό σφάλμα, άγνωστο σφάλμα '%s' ζητήθηκε"
@@ -10900,24 +10719,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Επιλέξτε μια ώρα για να συγκρίνετε"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Επιλογή ενός αρχείου"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Σημαντικό"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Πρός Τακτοποίηση"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Αργότερα"
 
@@ -10955,7 +10774,7 @@ msgstr "Απαντήσεις"
 
 #: ../filter/filter-rule.c:889
 msgid "Replies and parents"
-msgstr "Απαντήσεις και γονικά"
+msgstr "Απαντήσεις και μητρικά"
 
 #: ../filter/filter-rule.c:889
 msgid "No reply or parent"
@@ -10966,11 +10785,11 @@ msgid "Include threads"
 msgstr "Περιέχει αλληλουχίες"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Εισερχόμενα"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Εξερχόμενα"
 
@@ -11066,7 +10885,7 @@ msgstr "πριν"
 msgid "months"
 msgstr "μήνες"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
@@ -11099,16 +10918,14 @@ msgid "Composer Preferences"
 msgstr "Προτιμήσεις Επεξεργαστή"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Ρυθμίστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
 "ασφάλειας και της προβολής μηνυμάτων"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Ρυθμίστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
+msgstr "Ρυθμίστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -11138,24 +10955,24 @@ msgstr "Έλεγχος ρυθμίσεων επεξεργαστή μηνυμάτ�
 msgid "Evolution Mail preferences control"
 msgstr "Έλεγχος προτιμήσεων Evolution Mail"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../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:531
 msgid "Mail Accounts"
-msgstr "Λογαριασμοί αλληλογραφίας"
+msgstr "Λογαριασμοί Αλληλογραφίας"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
-msgstr "Προτιμήσεις αλληλογραφίας"
+msgstr "Προτιμήσεις Αλληλογραφίας"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
@@ -11180,19 +10997,19 @@ msgstr ""
 "και επιλέξτε στο κουτί για να την αποδεχθείτε\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
-msgstr "Επιλογή φακέλου"
+msgstr "Επιλογή Φακέλου"
 
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "Ερώτηση για κάθε μήνυμα"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Λήψη Μηνυμάτων"
 
@@ -11200,11 +11017,11 @@ msgstr "Λήψη Μηνυμάτων"
 msgid "Automatically check for _new mail every"
 msgstr "_Αυτόματος έλεγχος για νέα μηνύματα κάθε"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
-msgstr "Αποστολή μηνυμάτων"
+msgstr "Αποστολή Μηνυμάτων"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Προεπιλογές"
 
@@ -11223,11 +11040,11 @@ msgstr "Επιλογές Λήψης"
 msgid "Checking for New Mail"
 msgstr "Έλεγχος για νέα μηνύματα"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Βοηθός Λογαριασμού Evolution"
 
@@ -11247,22 +11064,22 @@ msgid "[Default]"
 msgstr "[Προεπιλογή]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Όνομα λογαριασμού"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Χωρίς τίτλο"
 
@@ -11299,7 +11116,7 @@ msgstr ""
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
-msgstr "Κανόνες _φίλτρων"
+msgstr "Κανόνες _Φίλτρων"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11308,11 +11125,11 @@ msgstr "Προσαρμογή σκορ"
 
 #: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
-msgstr "Ανάθεση χρώματος"
+msgstr "Ανάθεση Χρώματος"
 
 #: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
-msgstr "Ανάθεση βαθμού"
+msgstr "Ανάθεση Βαθμού"
 
 #: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
@@ -11328,7 +11145,7 @@ msgstr "περιέχει"
 
 #: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
-msgstr "Αντιγραφή σε φάκελο"
+msgstr "Αντιγραφή σε Φάκελο"
 
 #: ../mail/em-filter-i18n.h:9
 msgid "Date received"
@@ -11338,12 +11155,6 @@ msgstr "Ημερομηνία παραλαβής"
 msgid "Date sent"
 msgstr "Ημερομηνία αποστολής"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Διαγραφή"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Διαγράφηκε"
@@ -11432,7 +11243,7 @@ msgstr "δεν είναι"
 msgid "is not Flagged"
 msgstr "δεν έχει σημαία"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ανεπιθύμητα"
@@ -11441,7 +11252,7 @@ msgstr "Ανεπιθύμητα"
 msgid "Junk Test"
 msgstr "Δοκιμή Ανεπιθύμητων"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Ετικέτα"
 
@@ -11475,17 +11286,17 @@ msgstr "Μετακίνηση σε Φάκελο"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
-msgstr "Σύνδεση στο πρόγραμμα"
+msgstr "Σωλήνωση στο πρόγραμμα"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
-msgstr "Εκτέλεση ήχου"
+msgstr "Εκτέλεση Ήχου"
 
 #: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "Αναγνωσμένα"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Παραλήπτες"
 
@@ -11513,11 +11324,11 @@ msgstr "επιστρέφει λιγότερα από"
 msgid "Run Program"
 msgstr "Εκτέλεση Προγράμματος"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Σκορ"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Αποστολέας"
 
@@ -11549,11 +11360,11 @@ msgstr "ξεκινά με"
 msgid "Stop Processing"
 msgstr "Διακοπή Επεξεργασίας"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Θέμα"
@@ -11567,42 +11378,10 @@ msgstr "Άρση κατάστασης"
 msgid "<b>Then</b>"
 msgstr "<b>Τότε</b> "
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Δημιουργία φακέλου αναζήτησης από αναζήτηση..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Όλα τα μηνύματα"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Μη αναγνωσμένα μηνύματα"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Χωρίς ετικέτα"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Αναγνωσμένα μηνύματα"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Πρόσφατα μηνύματα"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Μηνύματα 5 τελευταίων ημερών"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Μηνύματα με συνημμένα"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Τα μηνύματα είναι επιθυμητά"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
@@ -11619,7 +11398,7 @@ msgstr[0] "Μη αναγνωσμένα μηνύματα:"
 msgstr[1] "Μη αναγνωσμένα μηνύματα:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Ιδιότητες Φακέλου"
 
@@ -11636,7 +11415,7 @@ msgid "Folder _name:"
 msgstr "_Όνομα φακέλου:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Φάκελοι αναζήτησης"
 
@@ -11651,7 +11430,7 @@ msgstr "Πρόχειρα"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
@@ -11667,77 +11446,77 @@ msgstr "Απεσταλμένα"
 msgid "Loading..."
 msgstr "Γίνεται φόρτωση..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Δέντρο φάκελου αλληλογραφίας"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Μετακίνηση φακέλου %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Αντιγραφή φακέλου %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Μετακίνηση μηνυμάτων στο φάκελο %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Αντιγραφή μηνυμάτων στο φάκελο %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Αδυναμία μετακίνησης μηνυμάτων σε ένα toplevel store"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Αντιγραφή σε Φάκελο"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Μετακίνηση σε Φάκελο"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Σάρωση φακέλων στο \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Προβολή"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Άνοιγμα σε _Νέο παράθυρο"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "Αντι_γραφή..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Μετακίνηση..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Νέος Φάκελος..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Μετονομασία..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Ά_δειασμα Απορριμμάτων"
 
@@ -11746,14 +11525,13 @@ msgstr "Ά_δειασμα Απορριμμάτων"
 msgid "Copying `%s' to `%s'"
 msgstr "Αντιγραφή `%s' στο `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Επιλογή φακέλου"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "Α_ντιγραφή"
 
@@ -11775,168 +11553,158 @@ msgstr "Δημιουργία φακέλου"
 msgid "Specify where to create the folder:"
 msgstr "Ορίστε που θα δημιουργηθεί ο φάκελος:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Απάντηση στον Αποστολέα"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Προώθηση"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "Α_ναίρεση Διαγραφής"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Μετακίνηση στο Φάκελο..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Αντιγραφή σε Φάκελο..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Σήμανση _ως Αναγνωσμένο"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως _μη αναγνωσμένο"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Σήμανση ως _Σημαντικό"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
-msgstr "Σή_μανση ως μη σημαντικό"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr "Σή_μανση ως μη Σημαντικό"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Σήμανση ως ανεπι_θύμητη αλληλογραφία"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Σήμανση ως επιθ_υμητή αλληλογραφία"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Σημείωση για παρα_κολούθηση..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "Κα_νένα"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Ση_μαία Ολοκληρώθηκε"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Εκκα_θάριση Σημαίας"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Φάκελος αναζήτησης από _Θέμα"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Φάκελος αναζήτησης από _Αποστολέα"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Φάκελος αναζήτησης από  _Παραλήπτες"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Φάκελος αναζήτησης από λίστα _ταχυδρομείου"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Φίλτρο στο Θ_έμα"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Φίλτρο στον Α_ποστολέα"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Φίλτρο στους Παρα_λήπτες"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Εκτύπωση Μηνύματος"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "Αντι_γραφή τοποθεσίας δεσμού"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Δημιουργία φακέλου α_ναζήτησης"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "Από αυτή τη διεύ_θυνση"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Σε αυτή τη διεύθυνση"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Κλικ εδώ για μήνυμα σε %s"
 
-#: ../mail/em-folder-view.c:2860
-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:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Ταιριάσματα: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "Εύρεση:"
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "Ταί_ριασμα χαρακτήρα"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Μη υπογεγραμμένο"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11944,11 +11712,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο. Δεν υπάρχει εγγύηση ότι το μήνυμα είναι "
 "αυθεντικό."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Έγκυρη υπογραφή"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11956,11 +11724,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο και έγκυρο, ο αποστολέας του μηνύματος "
 "είναι και αυτός που ισχυρίζεται ότι είναι."
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Μη έγκυρη υπογραφή"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11968,11 +11736,11 @@ msgstr ""
 "Η υπογραφή του μηνύματος δε μπορεί να επιβεβαιωθεί, μπορεί να έχει αλλοιωθεί "
 "κατά τη μεταφορά."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Έγκυρη υπογραφή, αδυναμία επιβεβαίωσης αποστολέα"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11980,11 +11748,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο με μια έγκυρη υπογραφή, αλλά δεν είναι "
 "δυνατή η επιβεβαίωση του αποστολέα."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Μη κρυπτογραφημένο"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11992,11 +11760,11 @@ msgstr ""
 "Αυτό το μήνυμα δεν είναι κρυπτογραφημένο. Το περιεχόμενο του μπορεί να "
 "αναγνωστεί κατά τη μεταφορά του στο διαδίκτυο."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Αδύναμα κρυπτογραφημένο"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12006,11 +11774,11 @@ msgstr ""
 "κρυπτογράφησης. Θα είναι δύσκολο αλλά όχι αδύνατο σε ένα τρίτο να διαβάσει "
 "το περιεχόμενο του μηνύματος μέσα σε ένα λογικό χρόνο."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Κρυπτογραφημένο"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12018,11 +11786,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι κρυπτογραφημένο. Θα είναι δύσκολο σε ένα τρίτο να "
 "διαβάσει το περιεχόμενο του μηνύματος."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Ισχυρά κρυπτογραφημένο"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12032,72 +11800,72 @@ msgstr ""
 "Θα είναι εξαιρετικά δύσκολο σε ένα τρίτο να διαβάσει το περιεχόμενο του "
 "μηνύματος μέσα σε ένα λογικό χρόνο."
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Προ_βολή Πιστοποιητικού"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Το πιστοποιητικό δεν είναι αναγνώσιμο"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ολοκληρώθηκε σε %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Έχουν λήξει:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "από %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "Προβολή μέ_σα στο μήνυμα"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "Απόκρυ_ψη"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Προσαρμογή στο πλάτος"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Εμφάνιση _αρχικού μεγέθους"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Συνημμένο"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Επιλογή φακέλου για την αποθήκευση όλων των συνημμένων..."
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "Απο_θήκευση επιλεγμένων..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
-#, fuzzy, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
+#: ../mail/em-format-html-display.c:1988
+#, c-format
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
 msgstr[0] "%d συνημ_μένο"
 msgstr[1] "%d συνημ_μένα"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "Αποθήκευ_ση"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Αποθήκευση ό_λων"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Χωρίς συνημμένο"
 
@@ -12111,88 +11879,94 @@ msgstr "Σελίδα %d από %d"
 msgid "Retrieving `%s'"
 msgstr "Παραλαμβάνεται '%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Έγκυρη υπογραφή, αδυναμία επιβεβαίωσης αποστολέα"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Δείκτης σε σελίδα FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στη σελίδα \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Δείκτης σε τοπικό αρχείο (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Μορφοποίηση μηνυμάτων"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Από"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
-msgstr "Απ. Σε"
+msgstr "Απάντηση Σε"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Προς"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Αντίγραφο:"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Ιδιαίτερη Κοινοποίηση"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
-msgstr "Λογισμικό"
+msgstr "Πρόγραμμα αλληλογραφίας"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
-msgstr "Ημ/νία"
+msgstr "Ημερομηνία"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Ομάδες συζήτησης"
@@ -12242,7 +12016,7 @@ msgstr "Μια φορά την εβδομάδα"
 msgid "Once per month"
 msgstr "Μια φορά τον  μήνα"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12254,49 +12028,47 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το Evolution να εισάγει τους φακέλους σας..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Δεν είναι δυνατή η δημιουργία νέου φακέλου `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Αδυναμία αντιγραφής φακέλου `%s' σε `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Αδυναμία σάρωσης για υπάρχοντα mailboxes για %s: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Δεν είναι δυνατό το άνοιγμα old POP keep-on-server data `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Αποτυχία δημιουργίας καταλόγου POP3 keep-on-server data `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Αδυναμία αντιγραφής POP3 keep-on-server data `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr ""
-"Αποτυχία δημιουργίας τοπικού καταλόγου αποθήκευσης αλληλογραφίας `%s': %s"
+msgstr "Αποτυχία δημιουργίας τοπικού καταλόγου αποθήκευσης αλληλογραφίας `%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr ""
-"Δεν είναι δυνατή η δημιουργία τοπικών φακέλων αλληλογραφίας σε `%s': %s"
+msgstr "Δεν είναι δυνατή η δημιουργία τοπικών φακέλων αλληλογραφίας σε `%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12313,6 +12085,10 @@ msgstr "Α_πάντηση στον αποστολέα"
 msgid "Reply to _List"
 msgstr "Απάντηση στη _Λίστα"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Άν_οιγμα δεσμού στο φυλλομετρητή"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "Απο_στολή νέου μηνύματος σε..."
@@ -12327,45 +12103,45 @@ msgstr ""
 "Αυτός ο αποθηκευτικός χώρος δεν υποστηρίζει συνδρομές, ή δεν είναι "
 "ενεργοποιημένες."
 
-#: ../mail/em-subscribe-editor.c:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Συνδρομή"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Φάκελος"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Παρακαλώ επιλέξτε διακομιστή."
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Δεν έχει επιλεγεί διακομιστής"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Να μην εμφανιστεί ξανά αυτό το μήνυμα."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Φίλτρα Μηνυμάτων"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "μήνυμα"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Αποθήκευση μηνύματος..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Προσθήκη διεύθυνσης"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Μήνυμα από %s "
@@ -12374,7 +12150,7 @@ msgstr "Μήνυμα από %s "
 msgid "Search _Folders"
 msgstr " _Φάκελοι αναζήτησης"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Πηγή  _φακέλου αναζήτησης"
 
@@ -12407,111 +12183,84 @@ msgid "Composer Window default width"
 msgstr "Προεπιλεγμένο πλάτος παραθύρου σύνταξης"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Σύμπτυξη της προβολής των διευθύνσεων στο Προς/Κοιν/Κρυφ.Κοιν"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Σύμπτυξη της προβολής των διευθύνσεων στο Προς/Κοιν/Κρυφ.Κοιν , στον αριθμό "
-"που καθορίζεται στο address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων στη σύνταξη μηνυμάτων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων στη σύνταξη μηνυμάτων."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων στην εμφάνιση μηνυμάτων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων στην εμφάνιση μηνυμάτων."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Προεπιλεγμένο στυλ προώθησης"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Προεπιλεγμένο πλάτος παραθύρου σύνταξης"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Προεπιλεγμένο πλάτος παραθύρου μηνύματος"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Προεπιλεγμένο πλάτος παραθύρου εγγραφής"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Προεπιλεγμένο στυλ απάντησης"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Προκαθορισμένο πλάτος του παραθύρου σύνταξης"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Προκαθορισμένο πλάτος του παραθύρου μηνύματος"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Προκαθορισμένο πλάτος του παραθύρου εγγραφής"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Σχεδίαση σημάνσεων ορθογραφικών σφαλμάτων καθώς πληκτρολογείτε."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Άδειασμα Φακέλων Απορριμμάτων στην έξοδο "
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr ""
-"Άδειασμα όλων των φακέλων Απορριμμάτων κατά την έξοδο από το Evolution."
+msgstr "Άδειασμα όλων των φακέλων Απορριμμάτων κατά την έξοδο από το Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Ενεργοποίηση λειτουργίας caret, έτσι ώστε να βλέπετε ένα δρομέα κατά την "
 "ανάγνωση της αλληλογραφίας."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-"Ενεργοποίηση ή απενεργοποποίηση της λειτουργίας εύρεσης κατά την "
-"πληκτρολόγηση"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Ενεργοποίηση/απενεργοποίηση λειτουργίας caret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Ύψος του ταμπλό της λίστας μηνυμάτων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Ύψος του ταμπλό της λίστας μηνυμάτων."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12519,13 +12268,7 @@ msgstr ""
 "Αν ένας χρήστης προσπαθεί να ανοίξει 10 ή περισσότερα μηνύματα μαζί, να "
 "γίνεται ερώτηση αν στα αλήθεια το θέλει."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-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.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12535,29 +12278,23 @@ msgstr ""
 "μέσα στο Evolution, οποιοιδήποτε τύποι mime που είναι σε αυτήν τη λίστα θα "
 "χρησιμοποιούνται για εμφάνιση."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-"Ενεργοποιεί/απενεργοποιεί την ειδοποίηση που εμφανίζεται στη σημείωση "
-"πολλαπλών μηνυμάτων"
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Η τελευταία φορά που έγινε άδειασμα απορριμμάτων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Λίστα από Ετικέτες και από τα συσχετιζόμενα χρώματα τους"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Λίστα αποδεκτών αδειών"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Λίστα λογαριασμών"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12566,11 +12303,11 @@ msgstr ""
 "λίστα περιλαμβάνει αλφαριθμητικά που είναι ονόματα σε υποκαταλόγους σχετικά "
 "με το /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Λίστα προσαρμοσμένων κεφαλίδων και αν θα είναι ενεργοποιημένες."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12579,19 +12316,19 @@ msgstr ""
 "αλφαριθμητικά που περιέχουν name:color όπου το χρώμα χρησιμοποιεί το HTML "
 "hex encoding."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Λίστα τύπων mime για έλεγχο για εφαρμογές προβολής συστατικού bonobo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Λίστα ονομάτων πρωτοκόλλου στα οποία έχει γίνει αποδοχή άδειας χρήσης."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Φόρτωση εικόνων για μηνύματα HTML σε http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12601,100 +12338,95 @@ msgstr ""
 "φορτώνονται ποτέ εικόνες από το δίκτυο 1 - Φόρτωση εικόνων αν ο αποστολέας "
 "είναι στις επαφές  2 - Να φορτώνονται πάντοτε εικόνες από το δίκτυο"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Καταγραφή ενεργειών φίλτρων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Καταγραφή ενεργειών φίλτρων στο καθορισμένο αρχείο καταγραφής."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Αρχείο καταγραφής για τις ενέργειες φίλτρων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Αρχείο καταγραφής για τις ενέργειες φίλτρων."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Σημείωση ως ανοιγμένα μετά από καθορισμένο χρόνο"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Σημείωση ως ανοιγμένα μετά από καθορισμένο χρόνο."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Σημείωση παραθέσεων στην\"Προεπισκόπηση\" μηνύματος"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Σημείωση παραθέσεων στην\"Προεπισκόπηση\" μηνύματος."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Προεπιλεγμένο ύψος του παραθύρου μηνύματος"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Προεπιλεγμένο πλάτος του παραθύρου μηνύματος"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Στυλ εμφάνισης μηνύματος (\"κανονικό\", \"πλήρεις κεφαλίδες\", \"πηγαίος "
 "κώδικας\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Ελάχιστο όριο ημερών μεταξύ το άδειασμα του κάδου κατα την έξοδο"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Ελάχιστο όριο μεταξύ το άδειασμα του κάδου κατα την έξοδο, σε ημέρες."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Αρχείο ήχου ειδοποίησης Νέου Μηνύματος"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Τύπος ειδοποίησης νέου μηνύματος"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Αριθμός διευθύνσεων που θα εμφανίζεται στα πεδία Προς/ Κοιν/ Κρυφ.Κοιν"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Ειδοποίηση σε κενό θέμα"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να κάνει εκκαθάριση ενός φακέλου."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς θέμα."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Ειδοποίηση όταν ο χρήστης κάνει εκκαθάριση"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Ειδοποίηση όταν ο χρήστης συμπληρώνει μόνο το πεδίο Κρυφ.Κοιν"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να ανοίξει 10 ή περισσότερα μηνύματα "
 "ταυτόχρονα"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12702,111 +12434,89 @@ msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει HTML σε επαφές που δεν "
 "επιθυμούν αλληλογραφία σε HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς παραλήπτες "
 "στο Προς ή στο Κοινοποίηση."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ανεπιθύμητο HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "Ειδοποίηση όταν ο χρήστης σημειώνει πολλαπλά μηνύματα"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Αναγνώριση δεσμών στο κείμενο και αντικατάσταση τους."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Αναγνώριση smileys στο κείμενο και αντικατάσταση τους με εικόνες."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
-msgstr ""
-"Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
+msgstr "Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Προεπιλεγμένη αποστολή μηνυμάτων σε HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Προεπιλεγμένη αποστολή μηνυμάτων σε HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Εμφάνιση κινούμενων εικόνων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Εμφάνιση κινούμενων εικόνων ως κινούμενα σχέδια."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
-"Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στη λίστα μηνυμάτων."
+msgstr "Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στη λίστα μηνυμάτων."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Εμφάνιση διαγραμμένων μηνυμάτων στη λίστα μηνυμάτων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-#, fuzzy
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr ""
-"Εμφάνιση του email του αποστολές στη στήλη σύνταξης μηνύματος της λίστας "
-"μηνυμάτων"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr ""
-"Εμφάνιση του email του αποστολέα στη στήλη μηνύματος της λίστας μηνυμάτων"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Αρχείο για αναπαραγωγή ήχου κατά την άφιξη νέου μηνύματος."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
-"Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
+msgstr "Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Έλεγχος ορθογραφίας"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Προεπιλεγμένο ύψος του παραθύρου εγγραφής"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Προεπιλεγμένο πλάτος του παραθύρου εγγραφής"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Γραμματοσειρά τερματικού"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"Η τελευταία φορά που έγινε άδειασμα απορριμμάτων, σε ημέρες από την εποχή."
+msgstr "Η τελευταία φορά που έγινε άδειασμα απορριμμάτων, σε ημέρες από την εποχή."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Η γραμματοσειρά τερματικού για για εμφάνιση αλληλογραφίας"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Η γραμματοσειρά μεταβλητού πλάτους για εμφάνιση αλληλογραφίας"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12818,109 +12528,99 @@ msgstr ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-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:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Αλληλουχία λίστας μηνυμάτων."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Αλληλουχία λίστας μηνυμάτων"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Αλληλουχία λίστας μηνυμάτων κατά Θέμα"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Λήξη χρόνου για σημείωση μηνυμάτων ως ανοιγμένα"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Λήξη χρόνου για σημείωση μηνυμάτων ως ανοιγμένα."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Αλφαριθμητικό UID του προεπιλεγμένου λογαριασμού."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Χρήση δαίμονα και πελάτη Spamasssassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Χρήση δαίμονα και πελάτη Spamasssassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Χρήση προσαρμοσμένης γραμματοσειράς"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Χρήση προσαρμοσμένης γραμματοσειράς για την εμφάνιση αλληλογραφίας"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Χρήση μόνο τοπικών δοκιμών spam."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Χρήση μόνο των τοπικών δοκιμών spam (όχι DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Γραμματοσειρά μεταβλητού πλάτους"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Κρυφ.Κοιν."
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Κρυφ.Κοιν."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Κοιν."
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Κοιν."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Από"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Από."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Αποστολή σε"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Αποστολή σε."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Απάντηση σε"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Είναι σημειωμένο το αντικείμενο μενού στο Προβολή/Απάντηση σε."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12928,14 +12628,6 @@ msgstr ""
 "Αν θα γίνεται επαναφορά ή όχι σε αλληλουχία θεμάτων όταν τα μηνύματα δεν "
 "περιέχουν κεφαλίδες Σε απάντηση ή Αναφορές."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Πλάτος του ταμπλό της λίστας μηνυμάτων"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Πλάτος του ταμπλό της λίστας μηνυμάτων."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Γίνεται Εισαγωγή δεδομένων Elm"
@@ -12967,15 +12659,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Εφαρμογή εισαγωγής φακέλων τύπου Berkeley Mailbox"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Εισάγεται`%s'"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
 
@@ -13156,31 +12848,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d μη αναγνωσμένο"
 msgstr[1] ", %d μη αναγνωσμένα"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
-msgstr "Νέος φάκελος αλληλογραφίας"
+msgstr "Νέος Φάκελος Αλληλογραφίας"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
-msgstr "Φάκελος αλληλογ_ραφίας"
+msgstr "Φάκελος Αλληλογ_ραφίας"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Δημιουργία νέου φακέλου αλληλογραφίας"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Αποτυχία αναβάθμισης ρυθμίσεων αλληλογραφίας ή φακέλων."
 
@@ -13208,226 +12900,232 @@ msgstr "Προς _Τακτοποίηση"
 msgid "_Later"
 msgstr "Α_ργότερα"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Έλεγχος για του υποστηριζόμενος τύπους "
 
-#: ../mail/mail-config.glade.h:3
+#: ../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>Sig_natures</b>"
 msgstr "<b>Υπο_γραφές:</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>Γ_λώσσες</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 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:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Πληροφορίες Λογαριασμού</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 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
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Προβαλλόμενες _Κεφαλίδες Μηνύματος</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Επιλογές Φίλτρου</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Ετικέτες και Χρώματα</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Φόρτωση Εικόνων</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Εμφάνιση Μηνύματος</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Γραμματοσειρές Μηνύματος</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Παραλήπτες  Μηνύματος</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Ειδοποίηση Νέου Μηνύματος</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../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:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Επιλογές</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Εκτυπώσιμες Γραμματοσειρές</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Απαιτούμενες Πληροφορίες</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Ασφάλεια</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Απεσταλμένα και Πρόχειρα Μηνύματα</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</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 mail"
 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 mail"
 msgstr ""
 "Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή "
 "κρυπτογραφημένων μηνυμάτων"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Επισύναψη αρχικού μηνύματος"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "_Αυτόματη εισαγωγή εικονιδίων φατσούλας"
 
-#: ../mail/mail-config.glade.h:46
+#: ../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 "Beep w_hen new mail arrives"
 msgstr "_Ήχος κατά την άφιξη νέου μηνύματος"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Κωδικοποίηση _Χαρακτήρων:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Έλεγχος για υποστηριζόμενους τύπους "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Έλεγχος ε_ισερχόμενης αλληλογραφία για ανεπιθύμητα μηνύματα"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Έλεγχος αλληλογραφίας κατά την πληκ_τρολόγηση"
 
-#: ../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 "_Εκκαθάριση"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "_Εκκαθάριση"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Χρώμα για ανορ_θόγραφες λέξεις:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "Επι_βεβαίωση στην εξάλειψη από ένα φάκελο"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13443,135 +13141,134 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Εφαρμογή\" για να αποθηκεύσετε τις ρυθμίσεις σας."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "Προε_πιλογή"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Προεπιλεγμένη κω_δικοποίηση χαρακτήρων:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Να _υπογράφονται πάντα ψηφιακά τα μηνύματα (προεπιλογή)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Να μη γίνεται παράθεση αρχικού μηνύματος"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Έγινε"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "_Φάκελος προχείρων:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "_Ενεργοποίηση"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Λογαριασμοί Email"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "Διεύ_θυνση Email:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Άδειασμα των φακέλων απορριμμά_των στην έξοδο"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Πιστοποιητικό κρ_υπτογράφησης:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Κρυπτογράφηση εξερχόμενης αλληλογραφίας (προεπιλογή)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Γραμματοσειρά στα_θερού πλάτους:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Στα_θερού πλάτους:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
-msgstr "Ιδιότητες γραμματοσειράς"
+msgstr "Ιδιότητες Γραμματοσειράς"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Μορφοποίηση μηνυμάτων σε _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "Π_λήρες όνομα:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Αλληλογραφία HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Κεφαλίδες"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Επισήμανση παρα_θέσεων με"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "Συμπεριλα_μβάνονται απομακρυσμένες δοκιμές"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Μέσα στο μήνυμα"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Πίνακας γλωσσών"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Ρύθμιση Αλληλογραφίας"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Πίνακας κεφαλίδων αλληλογραφίας"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Τοποθεσία Mailbox"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Επεξεργαστής Μηνύματος"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr ""
-"Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
+msgstr "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Ορ_γανισμός:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Αναπαραγωγή ήχου κατά την ά_φιξη νέου μηνύματος"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13580,7 +13277,7 @@ msgstr ""
 "διάστημα.\n"
 "Το όνομα θα χρησιμοποιείται μόνο για λόγους εμφάνισης."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13589,7 +13286,7 @@ msgstr ""
 "μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε το διαχειριστή δικτύου σας ή τον "
 "Παροχέα Διαδικτύου."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13600,42 +13297,38 @@ msgstr ""
 "συμπληρωθούν εκτός αν θέλετε να συμπεριλάβετε αυτές τις πληροφορίες όταν "
 "στέλνετε μηνύματα."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
-msgstr "Παρακαλώ επιλέξτε μεταξύ των παρακάτω επιλογών"
+msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Επιβε_βαίωση αποστολής μηνύματος με κρυφούς παραλήπτες (Bcc) μόνο"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Παράθεση αρχικού μηνύματος"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Σε παράθεση"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Απο_μνημόνευση κωδικού"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
-msgstr "Α_πάντηση σε:"
+msgstr "Α_πάντηση Σε:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Απομνημόνευση κ_ωδικού"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "Επιλο_γή..."
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_end message receipts:"
-msgstr "Α_ποστολή αποδείξεων μηνυμάτων:"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "_Κανονική γραμματοσειρά:"
@@ -13664,51 +13357,55 @@ msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού π
 msgid "Select sound file"
 msgstr "Επιλογή αρχείου ήχου"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "Αποστολή αποδείξεων μηνυμάτων:"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Αποστολή Αλληλογραφίας"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Φάκελος _απεσταλμένων μηνυμάτων:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Ο _διακομιστής απαιτεί πιστοποίηση"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
-msgstr "Είδος _διακομιστή: "
+msgstr "Είδος _Διακομιστή: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Πιστοποιητικό υπογρα_φής:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "Υπογρα_φή:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Υπογραφές"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Πίνακας υπογραφών"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Ορισμός ονόματος αρ_χείου:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
-msgstr "Έλεγχος ορθογραφίας"
+msgstr "Έλεγχος Ορθογραφίας"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "_Τύπος: "
 
-#: ../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."
@@ -13716,7 +13413,7 @@ 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"
@@ -13726,7 +13423,7 @@ msgstr ""
 "η υπογραφή σας. Το όνομα που θα καθορίσετε θα χρησιμοποιηθεί\n"
 "μόνο για την εμφάνιση. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13734,15 +13431,15 @@ msgstr ""
 "Πληκτρολογήστε το όνομα με το οποίο θα αναφέρεστε για το λογαριασμό.\n"
 "Για παράδειγμα: \"Work\" or \"Personal\" "
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
-msgstr "_Όνομα χρήστη:"
+msgstr "_Όνομα Χρήστη:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Μετ_αβλητού πλάτους:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13750,74 +13447,69 @@ msgid ""
 msgstr ""
 "Καλώς ήρθατε στο Βοηθό Ρύθμισης Ταχυδρομείου Evolution.\n"
 "\n"
-"Επιλέξτε \"Μπροστά\" για να ξεκινήσετε. "
+"Επιλέξτε \"Επόμενο\" για να ξεκινήσετε.. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Προσθήκη υπογραφής"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "Να γίνεται _πάντα φόρτωση των εικόνων από το διαδίκτυο"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Να μην ειδοποιούμαι για νέα μηνύματα"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr ""
-"Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
+msgstr "Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "Στυλ _προώθησης:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "Φόρτωση εικόνων από μηνύματα που προέρχονται από τις επαφές"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "Αυτός είναι ο _προεπιλεγμένος λογαριασμός"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Σήμανση μηνυμάτων ως αναγνωσμένα μετά από"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Να μην φορτώνονται ποτέ εικόνες από το διαδίκτυο"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Διαδρομή:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../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:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Ε_ρώτηση στην αποστολή μηνυμάτων με άδειο θέμα"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Στυλ α_πάντησης:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Δέσμη ενεργειών:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Show image animations"
 msgstr "Εμ_φάνιση κινούμενων εικόνων"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Σύμπτυξη των κεφαλίδων Προς/ Κοιν ?Κρυφ.Κοιν σε"
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Χρήση ασφαλούς σύνδεσης:"
@@ -13827,21 +13519,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "_Χρήση των ίδιων γραμματοσειρών με τις άλλες εφαρμογές"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "Διευθύνσεις"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "χρώμα"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "περιγραφή"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Πηγές φακέλων αναζήτησης</b>"
@@ -13855,63 +13539,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Κρυπτογράφηση</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Όλοι οι ενεργοί απομακρυσμένοι φάκελοι"
-
-#: ../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
 msgid "Case _sensitive"
 msgstr "_Διάκριση Πεζών από Κεφαλαία"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Ολοκληρώθηκε"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "Ε_ύρεση:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 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:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Σημαία για Παρακολούθηση"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Συνδρομές Φακέλων"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
-msgstr "Άδεια χρήσης"
+msgstr "Άδεια Χρήσης"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
-msgstr "Κανένα επιλεγμένο"
+msgstr "Κανένα Επιλεγμένο"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "Εξ_υπηρετητής:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Πληροφορίες ασφάλειας"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Συγκεκριμένοι φάκελοι"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13919,51 +13587,67 @@ msgstr ""
 "Τα μηνύματα που επιλέξατε για παρακολούθηση είναι τα παρακάτω.\n"
 "Παρακαλώ επιλέξτε μια ενέργεια παρακολούθησης από το μενού \"Σημαία\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Αποδοχή Άδειας"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Λήξη σε:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Σημαία:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Συνδρομή"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "Επιλέ_ξτε αυτό για να αποδεχθείτε την άδεια χρήσης"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
-msgstr "_Κατάργηση συνδρομής"
+msgstr "_Κατάργηση Συνδρομής"
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "μόνο συγκεκριμένοι φάκελοι"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "με όλους τους ενεργούς απομακρυσμένους φακέλους"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "με όλους τους τοπικούς και ενεργούς απομακρυσμένους φακέλους"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "με όλους τους τοπικούς φακέλους"
 
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
-msgstr "Φιλτράρισμα φακέλου"
+msgstr "Φιλτράρισμα Φακέλου"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Λήψη Μηνύματος"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Αποτυχία εφαρμογής εξερχόμενων φίλτρων: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13972,114 +13656,123 @@ msgstr ""
 "Αποτυχία προσθήκης στο %s: %s\n"
 "Γίνεται προσθήκη στο φάκελο 'Απεσταλμένα'."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Αποτυχία προσθήκης στο φάκελο 'Απεσταλμένα': %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Αποστολή μηνύματος %d από %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Αποτυχία αποστολής %d από %d μηνυμάτων"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Ακυρώθηκε."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Ολοκληρώθηκε."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Αποθήκευση μηνύματος στο φάκελο"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Προωθημένα μηνύματα"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Άνοιγμα αποθήκης %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Αφαιρείται ο φάκελος %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Αποθηκεύεται ο φάκελος '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Αποθηκεύεται ο λογαριασμός '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Ανανεώνεται ο φακέλος"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Εξαλείφεται ο φακέλος"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Άδειασμα κάδου σε '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
-msgstr "Τοπικοί φάκελοι"
+msgstr "Τοπικοί Φάκελοι"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Λήψη %d μηνύματος"
 msgstr[1] "Λήψη %d μηνυμάτων"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Αποθήκευση %d μηνύματος"
 msgstr[1] "Αποθήκευση %d μηνυμάτων"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Δεν είναι δυνατή η δημιουργία του αρχείου αποτελέσματος: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14088,11 +13781,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Αποθήκευση συνημμένου"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14101,69 +13794,60 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου αποτελέσματος: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
-msgstr "Γίνεται έλεγχος υπηρεσίας"
+msgstr "Γίνεται Έλεγχος Υπηρεσίας"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Γίνεται ακύρωση..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Αποστολή & Λήψη Μηνυμάτων"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
-msgstr "Ακύρωση _όλων"
+msgstr "Ακύρωση _Όλων"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Ανανέωση..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Γίνεται έλεγχος για νέα μηνύματα"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Εισαγωγή συνθηματικής φράσης για %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Εισαγωγή συνθηματικής φράσης"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
-msgstr "Εισαγωγή κωδικού πρόσβασης για %s"
+msgstr "Εισαγωγή Κωδικού Πρόσβασης για %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
-msgstr "Εισαγωγή κωδικού"
+msgstr "Εισαγωγή Κωδικού"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Ο χρήστης ακύρωσε τη λειτουργία."
 
@@ -14176,7 +13860,7 @@ msgid "Enter a name for this signature."
 msgstr "Εισάγετε ένα όνομα για αυτήν την υπογραφή."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Όνομα:"
 
@@ -14219,17 +13903,16 @@ msgstr "Αναβάθμιση φακέλων αναζήτησης για '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Ενημέρωση φακέλων αναζήτησης για '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Επεξεργασία  _φακέλων αναζήτησης"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Νέος φάκελος αναζήτησης"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "Ένας φάκελος που ονομάζεται &quot;{1}&quot; υπάρχει ήδη. Παρακαλώ "
 "χρησιμοποιείστε ένα διαφορετικό όνομα."
@@ -14243,8 +13926,8 @@ msgid ""
 msgstr ""
 "Ένας φάκελος που δεν είναι άδειος στο &quot;{1}&quot; υπάρχει ήδη.\n"
 "\n"
-"Μπορείτε να αγνοήσετε αυτό το φάκελο, να τον αντικαταστήσετε ή να προσθέσετε "
-"στα περιεχόμενα του ή να εγκαταλείψετε."
+"Μπορείτε να αγνοήσετε αυτό το φάκελο, να αντικαταστήσετε ή προσθέσετε στα "
+"περιεχόμενα του ή να εγκαταλείψετε."
 
 #: ../mail/mail.error.xml.h:5
 msgid ""
@@ -14281,8 +13964,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Είστε βέβαιοι ότι θέλετε να διαγραφεί αυτός ο λογαριασμός;"
 
 #: ../mail/mail.error.xml.h:10
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Είστε βέβαιοι ότι θέλετε να απενεργοποιηθεί αυτός ο λογαριασμός και να "
 "διαγραφούν όλοι οι διαμεσολαβητές του;"
@@ -14451,7 +14133,7 @@ msgstr "Να μη γίνει διαγραφή"
 
 #: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
-msgstr "Να μη γίνει απενεργοποίηση"
+msgstr "Να μην γίνει απενεργοποίηση"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
@@ -14503,8 +14185,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
-"Αν προχωρήσετε, όλοι οι λογαριασμοί διαμεσολαβητή θα διαγραφούν οριστικά."
+msgstr "Αν προχωρήσετε, όλοι οι λογαριασμοί διαμεσολαβητή θα διαγραφούν οριστικά."
 
 #: ../mail/mail.error.xml.h:59
 msgid ""
@@ -14619,8 +14300,7 @@ msgstr "Επικοινωνία με διακομιστή"
 
 #: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr ""
-"Ερώτημα στο διακομιστή για λίστα υποστηριζόμενων μηχανισμών πιστοποίησης."
+msgstr "Ερώτημα στο διακομιστή για λίστα υποστηριζόμενων μηχανισμών πιστοποίησης."
 
 #: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
@@ -14646,11 +14326,11 @@ msgstr "Η υπογραφή υπάρχει ήδη"
 
 #: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Οι φάκελοι συστήματος απαιτούνται από το Evolution για να λειτουργήσει σωστά "
-"και δεν μπορεί να μετονομαστούν, μετακινηθούν ή διαγραφούν."
+"Οι φάκελοι συστήματος απαιτούνται από το Ximian Evolution για να "
+"λειτουργήσει σωστά και δε μπορεί να μετονομαστούν, μετακινηθούν ή διαγραφούν."
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -14719,8 +14399,7 @@ msgstr ""
 "ενεργοποιηθεί ο λογαριασμός με τον οποίο επιλέξατε να το στείλετε."
 
 #: ../mail/mail.error.xml.h:107
-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 ""
 "Δεν είναι δυνατή η αποστολή αυτού του μηνύματος επειδή δεν έχετε καθορίσει "
 "κανένα Παραλήπτη."
@@ -14767,7 +14446,7 @@ msgstr "Χρήση προεπιλο_γών"
 
 #: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
-msgstr "Χρήση του προεπιλεγμένου φάκελου προχείρων;"
+msgstr "Χρήση ως τον προεπιλεγμένο φάκελο προχείρων;"
 
 #: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
@@ -14789,7 +14468,7 @@ msgstr "Πρέπει να δώσετε όνομα στον φάκελο αναζ
 
 #: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
-msgstr "Πρέπει να καθορίσετε ένα φάκελο."
+msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
 
 #: ../mail/mail.error.xml.h:121
 msgid ""
@@ -14804,12 +14483,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Η είσοδος σας στο διακομιστή  &quot;{0}&quot; ως &quot;{0}&quot; απέτυχε."
+msgstr "Η είσοδος σας στο διακομιστή  &quot;{0}&quot; ως &quot;{0}&quot; απέτυχε."
 
 #: ../mail/mail.error.xml.h:124
 msgid "_Append"
-msgstr "_Προσθήκη"
+msgstr "Προ_σθήκη"
 
 #: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
@@ -14821,76 +14499,76 @@ msgstr "Ε_ξάλειψη"
 
 #: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
-msgstr "_Άνοιγμα μηνυμάτων"
+msgstr "_Άνοιγμα Μηνυμάτων"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Μη ανοιγμένα"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Ανοιγμένα"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Απαντημένα"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Πολλαπλά μή ανοιγμένα μηνύματα"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
-msgstr "Πολλαπλά μηνύματα"
+msgstr "Πολλαπλά Μηνύματα"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Χαμηλότερα"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Χαμηλά"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Υψηλά"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Υψηλότερα"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr ";"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Σήμερα %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Χθες %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Δημιουργία λίστας μηνυμάτων"
 
@@ -14908,17 +14586,17 @@ msgstr "Σημειωμένο"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "Σημαία παρακολούθησης"
+msgstr "Σημαία Παρακολούθησης"
+
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Αρχική τοποθεσία"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Ελήφθη"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Απεσταλμένα μηνύματα"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Μέγεθος"
@@ -14929,7 +14607,7 @@ msgstr "Κλήση"
 
 #: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
-msgstr "Να μη γίνει προώθηση"
+msgstr "Να μη Γίνει Προώθηση"
 
 #: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
@@ -14953,7 +14631,7 @@ msgstr "Απάντηση"
 
 #: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
-msgstr "Απάντηση σε όλους"
+msgstr "Απάντηση σε Όλους"
 
 #: ../mail/message-tag-followup.c:84
 msgid "Review"
@@ -15065,30 +14743,19 @@ msgstr "Αυτόματες Επαφές"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Α_υτόματη δημιουργία εγγραφών στο βιβλίο διευθύνσεων όταν απαντάτε σε "
 "μηνύματα"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "Επιλογή βιβλίου διευθύνσεων για τις αυτόματες επαφές"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "Επαφές Instant Messaging"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
-msgstr ""
-"Περιοδικός συγχρονισμός πληροφοριών επαφών και εικόνων από το gaim buddy list"
-
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "Επιλογή βιβλίου διευθύνσεων από τη λίστα buddy του Gaim"
+msgid "Periodically synchronize contact information and images from gaim buddy list"
+msgstr "Περιοδικός συγχρονισμός πληροφοριών επαφών και εικόνων από το gaim buddy list"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
@@ -15198,6 +14865,10 @@ msgstr ""
 "Μια δοκιμαστική πρόσθετη λειτουργία που επιδεικνύει μια πρόσθετη λειτουργία "
 "μενού που σας επιτρέπει να αντιγράψετε αντικείμενα στο πρόχειρο."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Αντιγραφή διεύ_θυνσης Email:"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Εργαλείο αντιγραφής"
@@ -15207,8 +14878,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Έλεγχος αν το Evolution είναι η προεπιλεγμένη εφαρμογή αλληλογραφίας"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Κάθε φορά που ξεκινά το Evolution να ελέγχει αν είναι η προεπιλεγμένη "
 "εφαρμογή αλληλογραφίας"
@@ -15225,8 +14895,7 @@ msgstr "Προεπιλεγμένη εφαρμογή αλληλογραφίας"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
-"Θέλετε να κάνετε το Evolution την προεπιλεγμένη εφαρμογή αλληλογραφίας σας;"
+msgstr "Θέλετε να κάνετε το Evolution την προεπιλεγμένη εφαρμογή αλληλογραφίας σας;"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
@@ -15315,7 +14984,7 @@ msgid "Change the password for Exchange account"
 msgstr "Αλλαγή του κωδικού πρόσβασης για λογαριασμό Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Αλλαγή κωδικού"
 
@@ -15388,31 +15057,29 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Οι δύο κωδικοί δεν ταιριάζουν. Παρακαλώ εισάγετε ξανά τους κωδικούς."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "Επιβεβαίωση κωδικού:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "Τρέχων κωδικός:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "Νέος κωδικός:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr "Ο κωδικός σας έχει λήξει. Παρακαλώ αλλάξτε τον κωδικό σας τώρα."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, 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
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
@@ -15533,7 +15200,7 @@ msgstr "Όνομα φακέλου"
 msgid "Folder Size"
 msgstr "Μέγεθος φακέλου"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:304
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Σ_υνδρομή στους φακέλους άλλου χρήστη"
@@ -15548,14 +15215,14 @@ msgstr "Δέντρο φακέλου Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Αποχώρηση από το φάκελο..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Αποχώρηση από το φάκελο \"%s\";"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Αποχώρηση από το \"%s\""
@@ -15588,59 +15255,59 @@ msgstr "Προσθήκη χρήστη:"
 msgid "Add User"
 msgstr "Προσθήκη χρήστη"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Δικαιώματα</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Αδυναμία διαγραφής"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Αδυναμία επεξεργασίας"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Δημιουργία αντικειμένων"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Δημιουργία υποφακέλων"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Διαγραφή οποιουδήποτε αντικειμένου"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Διαγραφή των αντικειμένων μου"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Επεξεργασία οποιουδήποτε αντικειμένου"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Επεξεργασία των αντικειμένων σας"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Επαφή φακέλου"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Ιδιοκτήτης φακέλου"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Φάκελος ορατός"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Αναγνωσμένα αντικείμενα"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Ρόλος:"
 
@@ -15664,8 +15331,7 @@ msgstr "Σ_υνδρομή στο ημερολόγιο άλλου χρήστη"
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr ""
-"Μια πρόσθετη λειτουργία που χειρίζεται λειτουργίες λογαριασμών Exchange."
+msgstr "Μια πρόσθετη λειτουργία που χειρίζεται λειτουργίες λογαριασμών Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -15680,26 +15346,22 @@ msgid "Cannot display folders."
 msgstr "Αδυναμία εμφάνισης φακέλων"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Οι αλλαγές στις ρυθμίσεις του λογαριασμού Exchange \"{0}\" θα "
-"πραγματοποιηθούν, μετά την επανεκκίνηση του Evolution."
+"Οι αλλαγές στις ρυθμίσεις του λογαριασμού Exchange θα πραγματοποιηθούν, μετά "
+"τηνεπανεκκίνηση του Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Δεν ήταν δυνατή η πιστοποίηση στο διακομιστή."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Αδυναμία αλλαγής κωδικού."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15709,55 +15371,55 @@ msgstr ""
 "προέκυψε ένα άγνωστο σφάλμα. Ελέγξτε το URL, \n"
 "το όνομα χρήστη και το κωδικό σας, και προσπαθήστε ξανά."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Δεν ήταν δυνατή η σύνδεση στο διακομιστή Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Δεν ήταν δυνατή η σύνδεση στο διακομιστή {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Αδυναμία εντοπισμού δικαιωμάτων φακέλου γα εκπρόσωπο"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Αδυναμία εύρεσης Exchange Web Storage System."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Αδυναμία εντοπισμού διακομιστή {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Δεν ήταν δυνατή η δημιουργία {0} εκπροσώπου"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Δεν ήταν δυνατή η ανάγνωση δικαιωμάτων φακέλου"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Δεν ήταν δυνατή η ανάγνωση δικαιωμάτων φακέλου"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Δεν ήταν δυνατή η ανάγνωση της κατάστασης 'εκτός γραφείου'"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Δεν ήταν δυνατή η ενημέρωση των δικαιωμάτων φακέλου"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Δεν ήταν δυνατή η ενημέρωση της κατάστασης 'Εκτός γραφείου'"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 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:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15785,28 +15447,28 @@ msgstr ""
 "{0}\n"
 " "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Αποτυχία ενημέρωσης εκπροσώπων:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Ο φάκελος υπάρχει ήδη."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Ο φάκελος δεν υπάρχει"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Φάκελος χωρίς σύνδεση"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Γενικό σφάλμα"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15814,65 +15476,65 @@ msgstr ""
 "Αν το OWA εκτελείται σε διαφορετική διαδρομή, θα πρέπει να το καθορίσετε στο "
 "διάλογορύθμισης λογαριασμού."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Το Mailbox για {0} δεν βρίσκεται στο διακομιστή."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Βεβαιωθείτε ότι το URL είναι έγκυρο και προσπαθήστε ξανά."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Βεβαιωθείτε ότι το όνομα διακομιστή είναι έγκυρο και προσπαθήστε ξανά."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Βεβαιωθείτε ότι το όνομα χρήστη και ο κωδικός είναι έγκυρα και προσπαθήστε "
 "ξανά."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Δεν έχει ρυθμιστεί Global Catalog server για αυτό το λογαριασμό."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Δεν υπάρχει mailbox φια χρήστη {0} σε {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Δεν υπάρχει τέτοιος χρήστης {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Αλλάχθηκε επιτυχώς ο κωδικός πρόσβασης."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Παρακαλώ επανεκκινήστε το Evolution για να πραγματοποιηθούν οι αλλαγές"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Παρακαλώ επανεκκίνηστε το Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Παρακαλώ επιλέξτε ένα χρήστη."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Ο διακομιστής απέρριψε το κωδικό γιατί είναι πολύ αδύνατος."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Ο λογαριασμός Exchange θα απενεργοποιηθεί όταν κλείσετε το  Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Ο λογαριασμός Exchange θα απομακρυνθεί με την έξοδο από το Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Ο διακομιστής Exchange δεν είναι συμβατός με το  Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15880,7 +15542,7 @@ msgstr ""
 "Ο διακομιστής τρέχει Exchange 5.5. Exchange Connector \n"
 "και υποστηρίζει μόνο  Microsoft Exchange 2000 και 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15894,53 +15556,53 @@ msgstr ""
 "\n"
 "Ή ότι έχετε πληκτρολογήσει το κωδικό σας λανθασμένα."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Προσπαθήστε ξανά με ένα διαφορετικό κωδικό."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Αδύνατη η προσθήκη χρήστη στη λίστα ελέγχου πρόσβασης:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Αδυναμία επεξεργασίας εκπροσώπων."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Άγνωστο σφάλμα looking up {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Άγνωστο σφάλμα."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Άγνωστος τύπος"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Μη υποστηριζόμενη λειτουργία"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Είστε κοντά στην εξάντληση του ορίου χώρου για αποθήκευση αλληλογραφίας σε "
 "αυτό το διακομιστή."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Δεν μπορείτε να κάνετε τον εαυτό σας εκπρόσωπο"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Έχετε υπερβεί το όριο αποθήκευσης μηνυμάτων σε αυτό το διακομιστή."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Μπορείτε να ρυθμίσετε μόνο ένα λογαριασμό Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15948,7 +15610,7 @@ msgstr ""
 "Η τρέχουσα χρήση σας είναι: {0} KB. Προσπαθήστε να ελευθερώσετε χώρο "
 "διαγράφοντας κάποια μηνύματα."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -15956,7 +15618,7 @@ msgstr ""
 "Η τρέχουσα χρήση σας είναι : {0} KB. Δεν θα μπορείτε να στέλνετε ή να "
 "λαμβάνετε μηνύματα τώρα."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15964,19 +15626,19 @@ msgstr ""
 "Η τρέχουσα χρήση σας είναι : {0} KB. Δεν θα μπορείτε να στέλνετε μηνύματα "
 "μέχρι να ελευθερώσετε κάποιο χώρο."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Ο κωδικός σας έχει λήξει"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} δεν μπορεί να προστεθεί στη λίστα ελέγχου πρόσβασης"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} είναι ήδη εκπρόσωπος"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} είναι ήδη στη λίστα"
 
@@ -16003,14 +15665,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Αποχώρηση από τους φακέλους"
 
-#: ../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
-#, fuzzy
-msgid "Notes"
-msgstr "Σημείωση"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Checklist"
 
@@ -16061,14 +15716,13 @@ 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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Επιλογές αποστολής"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
-msgstr ""
-"Μια πρόσθετη λειτουργία για τις λειτουργίες στους λογαριασμούς Groupwise."
+msgstr "Μια πρόσθετη λειτουργία για τις λειτουργίες στους λογαριασμούς Groupwise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "Groupwise Features"
@@ -16078,40 +15732,40 @@ msgstr "Λειτουργίες Groupwise"
 msgid "Accept Tentatively"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>Χρήστες:</b> "
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 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
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "Επα_φές..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_Προσαρμογή μηνύματος ειδοποίησης"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Χωρίς κοινή χρήση"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Κοινή χρήση με ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Κοινή χρήση"
 
@@ -16180,10 +15834,7 @@ msgstr "Είσοδος στο διαμεσολαβητή"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "Σύνδεση με δια_μεσολαβητή..."
 
@@ -16248,12 +15899,12 @@ msgid "Select Calendar"
 msgstr "Επιλογή ημερολογίου"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "Ε_ισαγωγή"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "μορφή iCalendar (.ics)"
 
@@ -16311,106 +15962,104 @@ msgstr ""
 "Αδυναμία ανοίγματος της λίστας εκκρεμοτήτων του ημερολογίου του Evolution "
 "για εξαγωγή δεδομένων."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Αποτυχία φόρτωσης του ημερολογίου '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
-"Ένα ραντεβού στο ημερολόγιο '%s' έρχεται σε σύγκρουση με αυτή τη συνάντηση"
+msgstr "Ένα ραντεβού στο ημερολόγιο '%s' έρχεται σε σύγκρουση με αυτή τη συνάντηση"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Το ραντεβού βρέθηκε στο ημερολόγιο '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Αδυναμία εύρεσης ημερολογίων"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Αδυναμία εύρεσης αυτής της συνάντησης σε οποιοδήποτε ημερολόγιο"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Αδύνατη η εύρεση αυτής της εργασίας σε οποιαδήποτε λίστα εργασι'ων"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
-msgstr ""
-"Αδυναμία εύρεσης αυτής της καταχώρισης ημερολογίου σε κάποιο ημερολόγιο"
+msgstr "Αδυναμία εύρεσης αυτής της καταχώρισης ημερολογίου σε κάποιο ημερολόγιο"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Αναζήτηση για ήδη υπάρχουσα έκδοση για αυτό το ραντεβού"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Αδύνατη η ανάλυση αντικειμένου"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Αδυναμία αποστολής αντικειμένου στο ημερολόγιο '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Απεσταλμένο στο ημερολόγιο '%s' ως αποδεκτό"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Απεσταλμένο στο ημερολόγιο '%s' ως διερευνητικό"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Απεσταλμένο στο ημερολόγιο '%s' απορριπτέο"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Απεσταλμένο στο ημερολόγιο '%s' ως ακυρωμένο"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Ο διοργανωτής απομάκρυνε τον εκπρόσωπο %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Αποστολή μιας ειδοποίησης ακύρωσης στον εκπρόσωπο"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Αδυναμία αποστολής ειδοποίησης ακύρωσης στον εκπρόσωπο"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
 "έγκυρης κατάστασης"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Αδυναμία ενημέρωσης παρευρισκομένου. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Το συνημμένο ημερολόγιο δεν είναι έγκυρο"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16418,15 +16067,15 @@ msgstr ""
 "Το μήνυμα ισχυρίζεται ότι περιέχει ένα ημερολόγιο, αλλά το ημερολόγιο δεν "
 "είναι ένα έγκυρο iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Το αντικείμενο στο ημερολόγιο δεν είναι έγκυρο"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16434,11 +16083,11 @@ msgstr ""
 "Το μήνυμα περιέχει ένα ημερολόγιο, αλλά το ημερολόγιο δεν περιέχει γεγονότα,"
 "εργασίες ή πληροφορίες διαθεσιμότητας"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Το συνημμένο ημερολόγιο περιέχει πολλαπλά αντικείμενα"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16448,277 +16097,273 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "Διαγρα_φή μηνύματος μετά την ενέργεια"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Αναζήτηση συγκρούσεων"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Επιλογή ημερολογίων για αναζήτηση συγκρούσεων συζήτησης"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Σήμερα"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Σήμερα %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "Σήμερα %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:202
 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:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Αύριο"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Αύριο %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 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:228
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "Αύριο %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Αύριο  %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> μέσω %s δημοσίευσε τις ακόλουθες πληροφορίες συνάντησης:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "ο/η <b>%s</b> έχει δημοσιεύσει τις ακόλουθες πληροφορίες συνάντησης:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "ο/η <b>%s</b> έχει αναθέσει την ακόλουθη συνάντηση σε εσάς."
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "ο/η <b>%s</b> μέσω του %s  παρακαλεί την παρουσία σας στην ακόλουθη "
 "συνάντηση:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "ο/η <b>%s</b> παρακαλεί την παρουσία σας στην ακόλουθη συνάντηση:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
-"ο/η <b>%s</b> μέσω %s θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση:"
+msgstr "ο/η <b>%s</b> μέσω %s θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "ο/η <b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "ο/η <b>%s</b> θα ήθελε να λάβει τις τελευταίες πληροφορίες για την ακόλουθη "
 "συνάντηση:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "ο/η <b>%s</b> έστειλε πίσω την ακόλουθη απάντηση συνάντησης:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "ο/η <b>%s</b> μέσω του %s ακύρωσε την ακόλουθη συνάντηση:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "ο/η <b>%s</b> ακύρωσε την ακόλουθη συνάντηση."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "ο/η <b>%s</b> έχει προτείνει τις ακόλουθες αλλαγές συνάντησης."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
-"ο/η <b>%s</b> μέσω του %s έχει αρνηθεί τις ακόλουθες αλλαγές συνάντησης:"
+msgstr "ο/η <b>%s</b> μέσω του %s έχει αρνηθεί τις ακόλουθες αλλαγές συνάντησης:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "ο/η <b>%s</b> έχει αρνηθεί τις ακόλουθες αλλαγές συνάντησης."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "ο/η <b>%s</b> μέσω του %s έχει δημοσιεύσει την ακόλουθη εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "ο/η <b>%s</b> έχει δημοσιεύσει την ακόλουθη εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, 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:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "ο/η <b>%s</b> μέσω του %s έχει αναθέση σε εσάς μια εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "ο/η <b>%s</b> έχει αναθέσει σε εσάς μια εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr ""
-"ο/η <b>%s</b> μέσω του %s θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία:"
+msgstr "ο/η <b>%s</b> μέσω του %s θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "ο/η <b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -16727,155 +16372,114 @@ msgstr ""
 "ο/η <b>%s</b> θα ήθελε λάβει τις τελευταίες πληροφορίες για την ακόλουθη "
 "εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "ο/η <b>%s</b> έστειλε την ακόλουθη απάντηση εργασίας:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "ο/η <b>%s</b> μέσω του %s έχει ακυρώσει την ακόλουθη εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "ο/η <b>%s</b> έχει ακυρώσει την ακόλουθη εργασία:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "ο/η <b>%s</b> έχει προτείνει τις ακόλουθες αλλαγές ανάθεσης εργασίας:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, 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:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "ο/η <b>%s</b> έχει αρνηθεί την ακόλουθη ανάθεση εργασίας:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, fuzzy, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "ο/η <b>%s</b> μέσω του %s έχει δημοσιεύσει την ακόλουθη εργασία:"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, fuzzy, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "ο/η <b>%s</b> έχει δημοσιεύσει την ακόλουθη εργασία:"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, fuzzy, 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:491
-#, fuzzy, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "ο/η <b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση:"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, fuzzy, 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:497
-#, fuzzy, 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:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "Ά_νοιγμα ημερολογίου"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "Α_πόρριψη"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "_Αποδοχή"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "Α_πόρριψη όλων"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "Α_πόρριψη"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "Όλα _δοκιμαστικά"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "_Δοκιμαστικά"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "_Αποδοχή όλων"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "Απο_στολή πληροφοριών"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "Ανα_νέωση κατάστασης παρευρισκομένων"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "Ε_νημέρωση"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
-msgstr "Χρόνος έναρξης:"
+msgstr "Χρόνος Έναρξης:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
-msgstr "Χρόνος λήξης:"
+msgstr "Χρόνος Λήξης:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Σχόλιο:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Αποστολή ενημερώσεων στους παρευρισκομένους"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "Ε_φαρμογή σε όλες τις εμφανίσεις"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-#, fuzzy
-msgid "_Tasks :"
-msgstr "_Εργασίες:"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-#, fuzzy
-msgid "Memos :"
-msgstr "Memos"
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "Εμφαωίζει μέρη από κείμενο/ημερολόγιο στα μηνύματα."
@@ -16887,7 +16491,7 @@ msgstr "Itip Formatter"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; έχει αναθέσει τη συνάντηση. Θέλετε να προσθέσετε τον "
 "εκπρόσωπο &quot;{1}&quot; ;"
@@ -16897,8 +16501,7 @@ msgid "This meeting has been delegated"
 msgstr "Η συνάντηση έχει ανατεθεί."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί ο "
 "αποστολέας ως παρευρισκόμενος;"
@@ -16934,8 +16537,7 @@ msgid "No store available"
 msgstr "Δεν υπάρχει διαθέσιμος αποθηκευτικός χώρος"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Μια πρόσθετη λειτουργία που εφαρμόζει ένα περιβάλλον χρήσης CORBA για την "
 "απομακρυσμένη πρόσβαση δεδομένων αλληλογραφίας."
@@ -16982,14 +16584,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Μετατροπή του επιλεγμένου μηνύματος σε νέα εργασία"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Ι_διοκτήτης λίστας επαφών"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
-msgstr "Λήψη αρ_χείου λίστας"
+msgstr "Λήψη αρ_χείου λίστας "
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Λήψη πληροφοριών _χρήσης λίστας"
 
@@ -17011,14 +16616,17 @@ msgstr ""
 "αποχώρηση, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "Αποστο_λή μηνύματος σε λίστα"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Συνδρομή σε λίστα"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Κατάργηση συνδρομής από τη λίστα"
 
@@ -17104,28 +16712,15 @@ msgstr "_Επεξεργασία μηνύματος"
 msgid "_Send message"
 msgstr "_Αποστολή μηνύματος"
 
-#: ../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 "Επικοινωνία με τον ιδιοκτήτη της λίστας ταχυδρομείου από αυτό το μήνυμα"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Λήψη αρ_χείου λίστας "
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-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 "Λήψη ενός αρχείου της λίστας στην οποία ανήκει αυτό το μήνυμα"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Λήψη πληροφοριών για τη λίστα στην οποία ανήκει αυτό το μήνυμα"
 
@@ -17141,30 +16736,17 @@ msgstr "Συνδρομή στη λίστα ταχυδρομείου από αυ�
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Αποχώρηση από τη λίστα του ταχυδρομείου όπου ανήκει αυτό το μήνυμα"
 
-#: ../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/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Σήμανση όλων ως αναγνωσμένα"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Σήμανση μη_νυμάτων ως αναγνωσμένα"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
-msgstr ""
-"Χρησιμοποιείται για να σημειώσει ως αναγνωσμένα όλα τα μηνύματα σε ένα φάκελο"
+msgstr "Χρησιμοποιείται για να σημειώσει ως αναγνωσμένα όλα τα μηνύματα σε ένα φάκελο"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -17234,8 +16816,7 @@ msgstr "Περιγραφή"
 
 #: ../plugins/plugin-manager/plugin-manager.c:193
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
-"Σημείωση: Μερικές αλλαγές δεν θα πραγματοποιηθούν μέχρι την επανεκκίνηση"
+msgstr "Σημείωση: Μερικές αλλαγές δεν θα πραγματοποιηθούν μέχρι την επανεκκίνηση"
 
 #: ../plugins/plugin-manager/plugin-manager.c:202
 #: ../plugins/plugin-manager/plugin-manager.c:262
@@ -17289,7 +16870,7 @@ msgstr "Παρέχει επιλογή για εκτύπωση αλληλογρα
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
-msgstr "_Προεπισκόπηση εκτύπωσης"
+msgstr "_Προεπισκόπηση Εκτύπωσης"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
 msgid "Prints the message"
@@ -17317,7 +16898,7 @@ msgstr "Τοποθεσίες"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
-msgstr "_Δημοσίευση πληροφοριών ημερολογίου"
+msgstr "Δημοσίευση πληροφοριών ημερολογίου"
 
 #: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
@@ -17373,7 +16954,7 @@ msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
-msgstr "Είδος _υπηρεσίας:"
+msgstr "Είδος _υπηρεσίας: "
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
@@ -17416,7 +16997,7 @@ msgstr ""
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
 msgid "Save attachments"
-msgstr "Αποθήκευση συνημμένων"
+msgstr "Αποθήκευση  συνημμένων"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
@@ -17426,16 +17007,16 @@ msgstr "Αποθήκευση συνημμένων..."
 msgid "Save all attachments"
 msgstr "Αποθήκευση όλων των συνημμένων"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Επιλέξτε όνομα βάσης αποθήκευσης"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Τύπος MIME"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -17453,7 +17034,7 @@ msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:387
 msgid "Description List"
-msgstr "Περιγραφή λίστας"
+msgstr "Περιγραφή"
 
 #: ../plugins/save-calendar/csv-format.c:388
 msgid "Categories List"
@@ -17545,7 +17126,7 @@ msgid "RDF format (.rdf)"
 msgstr "μορφή RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Επιλογή αρχείου προορισμού"
 
@@ -17594,26 +17175,25 @@ msgstr ""
 "\n"
 "Παρακαλώ πατήστε το κουμπί \"Μπροστά\" για να συνεχίσετε. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Παρακαλώ επιλέξτε την πληροφορία που θέλετε να εισάγετε:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, 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:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Γίνεται εισαγωγή δεδομένων."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
-"Επισημαίνει αν η αλληλουχία των μηνυμάτων πρέπει να γυρίσει πίσω στο θέμα."
+msgstr "Επισημαίνει αν η αλληλουχία των μηνυμάτων πρέπει να γυρίσει πίσω στο θέμα."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -17670,16 +17250,14 @@ msgstr "Προκαθορισμένο πλάτος παραθύρου"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-"ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
+msgstr "ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Τελευταία ενημερωμένη έκδοση ρυθμίσεων"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Λίστα από διαδρομές για τους φακέλους που θα συγχρονίζονται στο δίσκο για "
 "εργασία χωρίς σύνδεση"
@@ -17690,21 +17268,17 @@ msgstr "Ρυθμίσεις εκτυπωτή"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
-msgstr "Ορατή πλευρική στήλη"
+msgstr "Ορατή Εργαλειοθήκη"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Παράκαμψη του διάλογος προειδοποίησης ανάπτυξης"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Εκκίνηση σε λειτουργία χωρίς σύνδεση"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Ορατή γραμμή κατάστασης"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17712,19 +17286,19 @@ msgstr ""
 "Η έκδοση του Evolution, με μέγιστο/ελάχιστο επίπεδο ρυθμίσεων (για "
 "παράδειγμα \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Το προεπιλεγμένο ύψος του κυρίως παραθύρου, σε εικονοστοιχεία."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Το προκαθορισμένο πλάτος του κυρίως παραθύρου, σε εικονοστοιχεία."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Το προκαθορισμένο πλάτος της πλευρικής στήλης, σε εικονοστοιχεία."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17732,7 +17306,7 @@ msgstr ""
 "Η τελευταία αναβαθμισμένη έκδοση του Evolution, με μέγιστο/ελάχιστο επίπεδο "
 "ρυθμίσεων (για παράδειγμα \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17742,48 +17316,43 @@ msgstr ""
 "\"και τα δύο\", \"εργαλειοθήκη\". Αν ορισθεί \"εργαλειοθήκη\". το στυλ των "
 "κουμπιών καθορίζεται από τη ρύθμιση της εργαλειοθήκης του GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
-msgstr "Ορατή εργαλειοθήκη"
+msgstr "Ορατή Εργαλειοθήκη"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Αν το Evolution θα ξεκινάει σε κατάσταση εργασίας χωρίς σύνδεση αντί να "
 "είναι με σύνδεση."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
-msgstr "Αν θα είναι μεγιστοποιημένο ή όχι το παράθυρο."
+msgstr "Αν θα είναι το παράθύρο μεγιστοποιημένο ή όχι."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Αν θα είναι ορατή η πλευρική στήλη."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Αν θα είναι ορατή η γραμμή κατάστασης."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Αν θα είναι ορατή η εργαλειοθήκη."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Αν θα παρακάπτεται ο διάλογος προειδοποίησης στις υπό ανάπτυξη εκδόσεις του "
 "Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Αν θα είναι ορατά τα κουμπιά παραθύρου."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Στυλ κουμπιών παραθύρου"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Τα κουμπιά παραθύρου είναι ορατά"
 
@@ -17793,23 +17362,22 @@ msgstr "<b>Ενεργές Συνδέσεις</b>"
 
 #: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
-msgstr "Ενεργές συνδέσεις"
+msgstr "Ενεργές Συνδέσεις"
 
 #: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
-msgstr ""
-"Πατήστε εντάξει για να κλείσετε τις συνδέσεις και να εργαστείτε χωρίς σύνδεση"
+msgstr "Πατήστε ΟΚ για να κλείσετε τις συνδέσεις και να εργαστείτε χωρίς σύνδεση"
 
 #: ../shell/e-shell-folder-title-bar.c:584
 #: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Χωρίς Τίτλο)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Επιλέξτε τον τύπο του εισαγωγέα που θα εκτελεστεί:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17823,11 +17391,11 @@ msgstr ""
 "Μπορείτε να επιλέξτε \"Αυτόματη\" αν δεν ξέρετε, και το Evolution θα "
 "δοκιμάσει να βρει τη λίστα."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Επιλέξτε τον προορισμό για αυτή την εισαγωγή"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17839,23 +17407,23 @@ msgstr ""
 "που μπορούν να εισαχθούν. Αν θέλετε να προσπαθήσετε ξανά\n"
 "πατήστε το κουμπί \"Πίσω\"\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Όνομα _Αρχείου:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Επιλογή ενός αρχείου"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Τύπος αρχείου:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Εισαγωγή δεδομένων και ρυθμίσεις από πα_λαιότερα προγράμματα"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Εισαγωγή μο_ναδικού αρχείου"
 
@@ -17915,7 +17483,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "Εργασία Ε_ντός Δικτύου"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Εργασία χωρίς σύνδεση"
 
@@ -17935,48 +17503,42 @@ msgstr "Το Evolution είναι στη διαδικασία αποσύνδεσ
 
 #: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr ""
-"Το Evolution είναι εκτός δικτύου.  Κάντε κλικ στο πλήκτρο για να συνδεθείτε."
+msgstr "Το Evolution είναι εκτός δικτύου.  Κάντε κλικ στο πλήκτρο για να συνδεθείτε."
 
 #: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Αλλαγή σε %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Άγνωστο σφάλμα συστήματος."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "ΟΚ"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Μη έγκυροι παράμετροι"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 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:685
 msgid "New"
 msgstr "Νέο"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr "Νέο"
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Νέα Δοκιμή"
@@ -18030,7 +17592,7 @@ msgstr ""
 "στο Evolution από εξωτερικά αρχεία."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18065,7 +17627,7 @@ msgstr ""
 "Ελπίζουμε τα απολαύσετε τα αποτελέσματα της σκληρής μας δουλειάς\n"
 "και περιμένουμε με ανυπομονησία τη συμβολή σας!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18073,40 +17635,35 @@ msgstr ""
 "Ευχαριστούμε\n"
 "Η ομάδα του Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Να μην ξαναγίνει η ερώτηση"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Εκκίνηση του Evolution με ενεργοποίηση του καθορισμένου συστατικού"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Εκκίνηση σε λειτουργία με σύνδεση"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Βίαιο κλείσιμο όλων των συστατικών του evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Βίαια επαναεισαγωγή από το Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
-msgstr ""
-"Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
+msgstr "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Απενεργοποίηση φόρτωσης πρόσθετων λειτουργιών."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "Ε_φαρμογή αλληλογραφίας και PIM Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18388,8 +17945,7 @@ msgstr "<b>Εκδόθηκε Σε</b>"
 
 #: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
-"<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί για τις ακόλουθες χρήσεις</b>"
+msgstr "<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί για τις ακόλουθες χρήσεις</b>"
 
 #: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -18524,16 +18080,14 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Έχετε πιστοποιητικά από οργανισμούς που πιστοποιούν εσάς:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τις παρακάτω αρχές "
 "πιστοποίησης:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
-"Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
+msgstr "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -18544,7 +18098,7 @@ msgid "_Edit CA Trust"
 msgstr "_Επεξεργασία εμπιστοσύνης 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:664
 msgid "Certificate already exists"
 msgstr "Το πιστοποιητικό υπάρχει ήδη"
 
@@ -18776,12 +18330,6 @@ 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-tasks.xml.h:2
-msgid "Copy"
-msgstr "Αντιγραφή"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Αντιγραφή επιλεγμένων επαφών σε άλλο φάκελο..."
@@ -18878,12 +18426,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:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Επιλογή Όλων"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Επιλογή _Όλων"
@@ -18953,7 +18501,7 @@ msgstr "_Μετακίνηση επαφής σε..."
 msgid "_Move Folder Contacts To"
 msgstr "_Μετακίνηση φακέλου επαφών σε..."
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Νέο"
 
@@ -19014,7 +18562,6 @@ msgid "Month"
 msgstr "Μήνας"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -19023,7 +18570,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Προεπισκόπηση του ημερολογίου προς εκτύπωση"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Προηγούμενο"
 
@@ -19111,11 +18658,11 @@ msgstr "Αποκοπή επιλογής στο πρόχειρο"
 msgid "Paste from clipboard"
 msgstr "Επικόλληση από το προχείρο"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Επικόλληση επιλεγμένου κειμένου από το πρόχειρο"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Επιλογή όλου του κειμένου"
 
@@ -19150,31 +18697,30 @@ msgstr "Κάντε κλικ εδώ για να δείτε τη διαθέσιμ�
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Εισαγωγή"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Συνημμένο..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Βοήθεια"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Εισαγωγή"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "Επι_λογές"
@@ -19204,8 +18750,7 @@ msgstr "Διαβάθμιση ως δημόσιο"
 
 #: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Κάντε κλικ εδώ για να ρυθμίσετε τις σχετικές ειδοποιήσεις με το γεγονός"
+msgstr "Κάντε κλικ εδώ για να ρυθμίσετε τις σχετικές ειδοποιήσεις με το γεγονός"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
@@ -19273,11 +18818,6 @@ msgstr "Εναλλαγή της προβολής της ώρας ως απασχ
 msgid "_Alarms"
 msgstr "Ει_δοποιήσεις"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Κατηγορίες"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19343,75 +18883,53 @@ msgid "F_older"
 msgstr "_Φάκελος"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "_Προεπισκόπηση μηνύματος"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Μετακίνηση του επιλεγμένου φακέλου σε άλλο φάκελο"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Οριστική απομάκρυνση όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
+msgstr "Οριστική απομάκρυνση όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Αναζήτηση _φακέλων"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Εμφάνιση _προεπισκόπησης μηνύματος"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Εμφάνιση προεπισκόπησης μηνυμάτων κάτω από τη λίστα μηνυμάτων"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Εμφάνιση προεπισκόπησης μηνυμάτων δίπλα από τη λίστα μηνυμάτων"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Εμφάνιση οθόνης προεπισκόπησης"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Κλασσική προβολή"
+msgstr "Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Αντιγραφή φακέλου σε..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "_Φίλτρα Μηνυμάτων"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Μετακίνηση φακέλου σε..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Νέο..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Προεπισκόπηση"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Συνδρομές"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "Κά_θετη προβολή"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Αλλαγή ονόματος αυτού του φακέλου"
@@ -19462,8 +18980,7 @@ msgid "Hide _Read Messages"
 msgstr "Απόκρυψη _Αναγνωσμένων Μηνυμάτων"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια "
 "γραμμή στη μέση"
@@ -19508,7 +19025,7 @@ msgstr "Επιλογή όλων των μηνυμάτων που εμφανίζ�
 
 #: ../ui/evolution-mail-list.xml.h:25
 msgid "Sh_ow Hidden Messages"
-msgstr "_Εμφάνιση κρυφών μηνυμάτων"
+msgstr "_Εμφάνιση Κρυφών μηνυμάτων"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
@@ -19537,16 +19054,16 @@ msgstr "_Μήνυμα"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
-msgstr "Προσ_θήκη αποστολέα στο βιβλίο διευθύνσεων"
+msgstr "Προσ_θήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
-msgstr "Ε_φαρμογή φίλτρων"
+msgstr "Ε_φαρμογή Φίλτρων"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
-msgstr "Προσθήκη αποστολέα στο βιβλίο διευθύνσεων"
+msgstr "Προσθήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
 
 #: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
@@ -19562,7 +19079,7 @@ msgstr "Έλεγχος για ανεπι_θύμητη αλληλογραφία"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
-msgstr "Συγγραφή _νέου μηνύματος"
+msgstr "Συγγραφή _Νέου Μηνύματος"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
@@ -19610,13 +19127,11 @@ msgstr "Δημιουργία κανόνα για το φιλτράρισμα μ�
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
-msgstr ""
-"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
+msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
 
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
-"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
+msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
 
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
@@ -19756,7 +19271,7 @@ msgstr "Επόμενο σ_ημαντικό μήνυμα"
 
 #: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
-msgstr "Επόμενη α_λληλουχία"
+msgstr "Επόμενη Α_λληλουχία"
 
 #: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
@@ -19764,7 +19279,7 @@ msgstr "Επόμενο _μη αναγνωσμένο μήνυμα"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
-msgstr "Επιθυμητά"
+msgstr "Επιθυμητά Μηνύματα"
 
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
@@ -19932,7 +19447,7 @@ msgstr "Ανεπι_θύμητα μηνύματα"
 
 #: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
-msgstr "_Φόρτωση εικόνων"
+msgstr "_Φόρτωση  εικόνων"
 
 #: ../ui/evolution-mail-message.xml.h:117
 msgid "_Message Source"
@@ -19952,11 +19467,11 @@ msgstr "Ε_πιθυμητά Μηνύματα"
 
 #: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
-msgstr "_Άνοιγμα σε νέο παράθυρο"
+msgstr "_Άνοιγμα σε  νέο παράθυρο"
 
 #: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
-msgstr "_Προηγούμενο μήνυμα"
+msgstr "_Προηγούμενο Μήνυμα"
 
 #: ../ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
@@ -19975,10 +19490,6 @@ msgid "_Unread"
 msgstr "_Μη αναγνωσμένα"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "Μεγέ_θυνση"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Μεγέ_θυνση"
 
@@ -19986,7 +19497,7 @@ msgstr "Μεγέ_θυνση"
 msgid "Close this window"
 msgstr "Κλείσιμο αυτού του παραθύρου"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Κύρια εργαλειοθήκη"
 
@@ -20046,8 +19557,7 @@ msgstr "Κρυπτογραφήστε αυτό το μήνυμα με PGP"
 
 #: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
-"Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
+msgstr "Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
 
 #: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
@@ -20062,6 +19572,11 @@ msgstr "Έλεγχος για λήψη ειδοποίησης παράδοσης
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Εισαγωγή"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Άνοιγμα ενός αρχείου"
@@ -20100,7 +19615,7 @@ msgstr "Αποθήκευση _ως..."
 
 #: ../ui/evolution-message-composer.xml.h:23
 msgid "Save _Draft"
-msgstr "Αποθήκευση _προχείρου"
+msgstr "Αποθήκευση _Προχείρου"
 
 #: ../ui/evolution-message-composer.xml.h:24
 msgid "Save as draft"
@@ -20228,7 +19743,7 @@ msgstr "Αποθήκευση και Κλείσιμο"
 #.
 #: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save and _Close"
-msgstr "Αποθήκευση και _κλείσιμο"
+msgstr "Αποθήκευση και _Κλείσιμο"
 
 #: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
@@ -20264,8 +19779,7 @@ msgstr "Αντιστρο_φή Επιλογής"
 
 #: ../ui/evolution-task-editor.xml.h:4
 msgid "Click change / view the status details of the task"
-msgstr ""
-"Κάντε κλικ στο αλλαγή / προβολή των λεπτομερειών κατάστασης της εργασίας"
+msgstr "Κάντε κλικ στο αλλαγή / προβολή των λεπτομερειών κατάστασης της εργασίας"
 
 #: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
@@ -20395,51 +19909,43 @@ msgstr "Εικονίδια _και κείμενο"
 msgid "Import data from other programs"
 msgstr "Εισαγωγή δεδομένων από άλλα προγράμματα"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "_Διάταξη"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
-msgstr "Νέο παρά_θυρο"
+msgstr "Νέο Παρά_θυρο"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Προτιμήσεις"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Αποστολή / Λήψη"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Αποστολή / _Λήψη"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Αποστολή μηνυμάτων σε αναμονή και λήψη νέων"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Ρύθμιση Pilot "
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Εμφάνιση πληροφοριών σχετικά με το Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Εμφάνιση πλευρική _στήλης"
+msgid "Side _Bar"
+msgstr "Πλευρική _στήλη"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Εμφάνιση γραμμής _κατάστασης"
+msgid "Status _Bar"
+msgstr "Γρα_μμή κατάστασης"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Εμφάνιση εργαλειο_θήκης"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Εμφάνιση πληροφοριών σχετικά με το Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Στείλτε Αναφορά Προβλήματος"
 
@@ -20447,71 +19953,75 @@ msgstr "Στείλτε Αναφορά Προβλήματος"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Στείλτε _Αναφορά Προβλήματος"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Δηλώστε ένα πρόβλημα με χρήση του Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Εναλλαγή της σύνδεσης στο δίκτυο."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Εργαλειο_θήκη"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Στυλ εργαλειο_θήκης"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Προβολή/Απόκρυψη της πλευρικής στήλης"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Προβολή/Απόκρυψη της γραμμής κατάστασης"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Περί"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Κλείσιμο παραθύρου"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
-msgstr "Ξέχασε τους _κωδικούς πρόσβασης"
+msgstr "Ξέχασε τους _Κωδικούς Πρόσβασης"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "Απόκρυ_ψη κουμπιών"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "_Εικονίδια μόνο"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Γρήγορη αναφορά"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "Έ_ξοδος"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Ενα_λλαγή εμφάνισης"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
-msgstr "Επιλογές συγχρονισμού..."
+msgstr "_Συγχρονισμός επιλογών..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "_Κείμενο μόνο"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "Παρά_θυρο"
 
@@ -20548,34 +20058,26 @@ msgid "_Work Week View"
 msgstr "Προ_βολή Εργάσιμων Ημερών"
 
 #: ../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 "Ως φάκελος απε_σταλμένων"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Κατά Κατά_σταση"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Κατά α_ποστολέα"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Κατά _Θέμα"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Κατά σημαία _Παρακολούθησης"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Για ε_κτεταμένη προβολή "
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Μηνύματα"
 
@@ -20591,32 +20093,28 @@ 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Ζώνες Ώρας</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>Επιλο_γή</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Επιλέξτε μια Ζώνη Ώρας"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr " Combobox ζώνης ώρας "
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20652,7 +20150,7 @@ msgid "_Edit..."
 msgstr "_Επεξεργασία..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20666,11 +20164,11 @@ msgstr "Εμφάνιση"
 msgid "Save Current View"
 msgstr "Αποθήκευση τρέχουσας προβολής"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "Δημιουργία νέας προβολής"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "Αντι_κατάσταση υπάρχουσας προβολής"
 
@@ -20705,31 +20203,26 @@ msgstr "Εργοστάσιο"
 msgid "Define New View"
 msgstr "Καθορισμός νέας προβολής"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "Όνομα της νέας προβολής:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "Τύπος προβολής:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "ΔΤΤΠΠΣΚ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20739,8 +20232,8 @@ 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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Χρώμα γεμίσματος"
 
@@ -20749,16 +20242,16 @@ msgstr "Χρώμα γεμίσματος"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "Χρώμα γεμίσματος 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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Διάστικτο γέμισμα"
 
@@ -20797,11 +20290,11 @@ msgid "Minimum Width"
 msgstr "Ελάχιστο Πλάτος"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Διάστιχο"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Τώρα"
 
@@ -20929,41 +20422,33 @@ msgstr "Κουτί επιλογής ώρας"
 msgid "Time"
 msgstr "Ώρα"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "Τ_ώρα"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Σήμερα"
-
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Αναπτυγμένα"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Αν θα αναπτύσσεται ή όχι ο expander"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Κείμενο της ετικέτας του expander"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Χρήση υπογράμμισης"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20971,91 +20456,75 @@ msgstr ""
 "Αν ορισθεί, μια υπογράμμιση στο κείμενο σημαίνει ότι ο επόμενος χαρακτήρας "
 "θα χρησιμοποιηθεί για πλήκτρο συντόμευσης"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Διάστημα μεταξύ ετικέτας και θυγατρικού"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Γραφικό συστατικό ετικέτας"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Ένα γραφικό συστατικό που θα εμφανίζεται στην θέση της συνήθους ετικέτας "
 "expander"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Μέγεθος Expander"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Μέγεθος του βέλους expander"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Διάστιχο σήμανσης"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Διάστιχο γύρω από το βέλος expander"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Αποθήκευση Αναζήτησης"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "Ανα_ζητήσεις"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Αναζητήσεις"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Αποθήκευση Αναζήτησης"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Αποθήκευση Αναζήτησης..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Επεξεργασία Αποθηκευμένων Αναζητήσεων..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Προχωρημένη Αναζήτηση..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Όλοι οι λογαριασμοί"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Τρέχων λογαριασμός"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Τρέχων φάκελος"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Τρέχων μήνυμα"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
-msgstr "Παγκόσμιος χάρτης"
+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."
@@ -21074,7 +20543,7 @@ msgstr "Συγχρονισμός Ιδιωτικών Αρχείων:"
 
 #: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
-msgstr "Κατηγορίες συγχρονισμού:"
+msgstr "Κατηγορίες Συγχρονισμού:"
 
 #: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
@@ -21088,47 +20557,45 @@ msgstr "Μοντέλο Reflow"
 msgid "Column width"
 msgstr "Πλάτος στήλης"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "Ανα_ζήτηση"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
-msgstr "Εύ_ρεση τώρα"
+msgstr "Εύ_ρεση Τώρα"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Εκκαθάριση"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Τύπος Αναζήτησης"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Ταυτότητα αντικειμένου"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "Ταυτότητα υποαντικειμένου"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Κείμενο"
 
-#. 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:911
-msgid "Show: "
-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:927
-#, fuzzy
-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:939
-#, fuzzy
-msgid " i_n "
-msgstr " μέσα "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Εύρεση _Τώρα"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -21177,8 +20644,8 @@ msgid "A_uto-delete sent item"
 msgstr "Α_υτόματη διαγραφή απεσταλμένου αντικειμένου"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Διαβάθμιση"
+msgid "C_lassification"
+msgstr "Τα_ξινόμηση"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -21202,29 +20669,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"Κανονικό\n"
+"Δημόσιο\n"
 "Ιδιωτικό\n"
 "Εμπιστευτικό\n"
-"Απόρρητο\n"
-"Άκρως απόρρητο\n"
-"Αυστηρά προσωπικό"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "Απαιτείται α_πάντηση"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "Παρακολού_θηση κατάστασης"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -21236,51 +20697,51 @@ msgstr ""
 "Κανονική\n"
 "Χαμηλή"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Όταν γίνονται αποδε_κτά: "
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Όταν ολοκληρω_θεί:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Όταν α_πορρίπτονται:    "
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "Μέ_σα"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Μετά:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "Ό_λες οι πληροφορίες"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Καθυστέρηση παράδοσης μηνύματος"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Παραδόθηκε"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "Ο_ρισμός ημερομηνίας λήξης"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Μέχρι:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "Ό_ταν είναι βολικό"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "Ό_ταν ανοίγονται:    "
 
@@ -21298,19 +20759,19 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 msgid "Click here to go to URL"
 msgstr "Κάντε κλικ εδώ για μετάβαση σε url"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "Επεξεργασία λίστας πρωτεύουσας κατηγορίας..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "Τα παρακάτω αντικείμενα ανήκουν σε αυτές τις _κατηγορίες:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "_Διαθέσιμες κατηγορίες:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "κατηγορίες"
 
@@ -21328,29 +20789,29 @@ msgstr "Επιλεγμένη Στήλη"
 
 #: ../widgets/table/e-cell-pixbuf.c:404
 msgid "Focused Column"
-msgstr "Εστιασμένη στήλη"
+msgstr "Εστιασμένη Στήλη"
 
 #: ../widgets/table/e-cell-pixbuf.c:411
 msgid "Unselected Column"
-msgstr "Μη επιλεγμένη στήλη"
+msgstr "Μη Επιλεγμένη Στήλη"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Επισημασμένη στήλη"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Υπογράμμιση στήλης"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
-msgstr "Έντονη στήλη"
+msgstr "Έντονη Στήλη"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
-msgstr "Χρώμα στήλης"
+msgstr "Χρώμα Στήλης"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Χρώμα BG Στήλης"
 
@@ -21365,7 +20826,6 @@ msgstr "_Διαθέσιμα πεδία:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Αύξουσα"
 
@@ -21376,7 +20836,6 @@ 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 "Descending"
 msgstr "Φθίνουσα"
 
@@ -21475,14 +20934,14 @@ msgstr "Εμ_φάνιση αυτών των πεδίων με σειρά:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Κώδικας DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Πλήρης Κεφαλίδα"
 
@@ -21502,19 +20961,25 @@ msgstr ""
 "Για να προσθέσετε μια στήλη στον πίνακα σας, σύρετε την στην\n"
 "τοποθεσία στην οποία  θέλετε να εμφανιστεί."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d αντικείμενο)"
-msgstr[1] "%s : %s (%d αντικείμενα)"
+msgstr "%s : %s (%d αντικείμενο)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d αντικείμενα)"
+
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d αντικείμενο)"
-msgstr[1] "%s (%d αντικείμενα)"
+msgstr "%s (%d αντικείμενο)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d αντικείμενα)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21594,69 +21059,65 @@ msgstr "Ομοιόμορφο ύψος γραμμής"
 msgid "Frozen"
 msgstr "Παγωμένο"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Προσαρμογή τρέχουσας εμφάνισης"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
-msgstr "Αύξουσα ταξινόμιση"
+msgstr "Αύξουσα Ταξινόμιση"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
-msgstr "Φθίνουσα ταξινόμηση"
+msgstr "Φθίνουσα Ταξινόμηση"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Ακύρωση ταξινόμησης"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Ομαδοποίηση Βάσει Αυτού Του Πεδίου"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Ομαδοποίηση κατά κουτί"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
-msgstr "Αφαίρεση αυτής της στήλης"
+msgstr "Αφαίρεση Αυτής της Στήλης"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
-msgstr "Προσθήκη μιας στήλης..."
+msgstr "Προσθήκη μιας Στήλης..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Στοίχιση"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Καλύτερο Ταίριασμα"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Μορφοποίηση Στηλών..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Προσαρμογή Τρέχουσας Προβολής..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Ταξινόμηση κατά"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Γραμματοσειρές"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Πληροφορίες ταξινόμησης"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21708,7 +21169,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Αυτό θα δοκιμάσει το αντικείμενο καμβά μίνι κάρτας"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Processor Γεγονότος"
 
@@ -21721,57 +21182,57 @@ 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
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Στοίχιση"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Χρήση έλλειψης"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Έλλειψης"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Αναδίπλωση γραμμής"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Χαρακτήρες Break"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Μεγ. γραμμές"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Να επιτρέπονται νέες γραμμές"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Σχεδίαση περιγραμμάτων"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Σχεδιασμός παρασκηνίου "
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Σχεδιασμός κουμπιού"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Θέση  δρομέα"
 
@@ -21779,70 +21240,59 @@ msgstr "Θέση  δρομέα"
 msgid "Emulate label resize"
 msgstr "Προσομοίωση αλλαγής μεγέθους ετικέτας"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Μέθοδοι Εισαγωγής"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Έντονα"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Strikeout"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Άγκυρα"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Πλάτος Clip"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Ύψος Clip"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Fill clip rectangle"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "Διάταξη X"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Διάταξη Y"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Πλάτος κειμένου"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Ύψος κειμένου"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "Περιεχόμενο IM"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Χειρισμός αναδυόμενου"
 
-#~ msgid "work"
-#~ msgstr "εργασία"
-
-#~ msgid "personal"
-#~ msgstr "προσωπικό"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "Το ημερολόγιο που επιλέξατε είναι μόνο για ανάγνωση"
-
-#~ msgid "Memo:"
-#~ msgstr "Memo:"
diff --git a/po/es.po b/po/es.po
index c83ca13b6a..184fb8f8a1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,4 @@
-# translation of es.po to Spanish
-# Copyright © 2000-2002, 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the evolution package.
-#: ../mail/em-format-html-display.c:681
+# translation of Evolution to Spanish
 # Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001.
 # Héctor García Álvarez <hector@scouts-es.org>, 2000-2002.
 # Ismael Olea <ismael@olea.org>, 2001, (revisiones) 2003.
@@ -9,24 +6,25 @@
 # Héctor García Álvarez <hector@scouts-es.org>, 2002.
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006.
-# Francisco Javier F. Serrador <serrador@tecknolabs.com>, 2006.
+# Copyright © 2000-2002, 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the evolution package.
 msgid ""
 msgstr ""
-"Project-Id-Version: es\n"
+"Project-Id-Version: evolution.gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-27 11:37+0200\n"
-"PO-Revision-Date: 2006-07-27 21:31+0200\n"
+"POT-Creation-Date: 2006-07-29 16:23+0200\n"
+"PO-Revision-Date: 2006-07-29 16:24+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.1\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "libreta de direcciones de Evolution"
 
@@ -40,12 +38,12 @@ msgstr "Contacto nuevo"
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "la carpeta de libretas de direcciones actual %s tiene %d tarjeta"
-msgstr[1] "la carpeta de libretas de direcciones actual %s tiene %d tarjetas"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "la carpeta de libretas de direcciones actual tiene %d tarjeta"
+msgstr[1] "la carpeta de libretas de direcciones actual tiene %d tarjetas"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -64,32 +62,32 @@ msgstr "Contacto: "
 msgid "evolution minicard"
 msgstr "minitarjeta de Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Tiene alarmas."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Tiene repeticiones."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Es una reunión."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Acontecimiento de calendario: El resumen es %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Acontecimiento de calendario: Sin resumen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "vista de acontecimientos del calendario"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Obtener el foco"
 
@@ -118,47 +116,37 @@ msgstr "Ir a una fecha"
 msgid "a table to view and select the current time range"
 msgstr "una tabla para ver y seleccionar el rango de tiempo 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Tiene %d acontecimiento."
 msgstr[1] "Tiene %d acontecimientos."
 
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "No tiene acontecimientos."
 
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista de la semana laboral: %s. %s"
 
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista diaria: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "vista de calendario para una semana laboral"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 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:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
@@ -169,20 +157,18 @@ msgstr "%A, %e de %b de %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %e de %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:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
@@ -190,10 +176,10 @@ msgstr "%a, %e de %b de %Y"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -203,11 +189,9 @@ msgstr "%e de %B de %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:732
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%e de %b"
 
@@ -337,14 +321,6 @@ msgstr "Activar predeterminados"
 msgid "Popup Menu"
 msgstr "Menú emergente"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Conmutar barra de adjuntos"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "activar"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -359,7 +335,7 @@ msgstr "La dirección «{0}» ya existe."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Cannot move contact."
-msgstr "El contacto no se puede mover."
+msgstr "No se puede mover el contacto."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Category editor not available."
@@ -378,11 +354,11 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
-msgstr "No es posible obtener el esquema de información del servidor LDAP."
+msgstr "No se pudo obtener el esquema de información del servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not remove addressbook."
-msgstr "No es posible eliminar la libreta de direcciones."
+msgstr "No se pudo eliminar la libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:8
 msgid ""
@@ -409,7 +385,7 @@ msgstr "Error al guardar {0} a {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
-msgstr "No es posible autenticar con el servidor LDAP."
+msgstr "Falló al autenticarse con el servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:13
 msgid "GroupWise Address book creation:"
@@ -434,7 +410,8 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "The image you have selected is large. Do you want to resize and store it?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La imagen que ha seleccionado es grande. ¿quiere redimensionarla y "
 "almacenarla?"
@@ -478,15 +455,15 @@ msgstr "Este servidor no soporta el esquema de información LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:25
 msgid "Unable to open addressbook"
-msgstr "Es imposible abrir la libreta de direcciones"
+msgstr "No se pudo abrir la libreta de direcciones"
 
 #: ../addressbook/addressbook.error.xml.h:26
 msgid "Unable to perform search."
-msgstr "Es imposible efectuar la búsqueda."
+msgstr "No se pudo efectuar la búsqueda."
 
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
-msgstr "Es imposible guardar {0}."
+msgstr "No se pudo guardar {0}."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Would you like to save your changes?"
@@ -497,8 +474,8 @@ msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
-"Está moviendo un contacto desde una libreta a otra, pero no puede ser "
-"eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
+"Está moviendo un contacto desde una libreta a otra, pero éste no se puede "
+"eliminar de la de origen. ¿Quiere guardar una copia en su lugar?"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
@@ -517,14 +494,15 @@ msgid ""
 msgstr "Ha hecho modificaciones a este contacto. ¿Desea guardar estos cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Sus contactos para {0} no estarán disponibles hasta que Evolution sea "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Añadir"
@@ -534,7 +512,7 @@ msgid "_Discard"
 msgstr "_Descartar"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -549,12 +527,12 @@ msgstr "Dirección de sincr. predeterminada:"
 #: ../addressbook/conduit/address-conduit.c:1241
 #: ../addressbook/conduit/address-conduit.c:1242
 msgid "Could not load addressbook"
-msgstr "No es posible cargar la libreta de direcciones"
+msgstr "No se pudo cargar la libreta de direcciones"
 
 #: ../addressbook/conduit/address-conduit.c:1310
 #: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
-msgstr "No es posible leer el bloque de la aplicación de Direcciones del Pilot"
+msgstr "No se pudo leer el bloque de la aplicación de Direcciones del Pilot"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -574,9 +552,9 @@ msgstr "Configure el autocompletado aquí"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -616,8 +594,8 @@ msgstr "Gestione sus certificados S/MIME aquí"
 #. 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:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -632,13 +610,12 @@ msgstr "En este equipo"
 #. 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:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Privado"
 
@@ -665,13 +642,13 @@ msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
 #: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Address _Book"
-msgstr "Libreta de _direcciones"
+msgstr "Libreta de direcciones"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
@@ -681,73 +658,72 @@ msgstr "Crea una libreta de direcciones nueva"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Copiar el contenido del libro localmente para operación desconectada"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:2003
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Migrando…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando «%s»:"
@@ -823,35 +799,35 @@ msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 msgid "A Folder with this name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "Libreta de direcciones _nueva"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Guardar como VCard…"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Propiedades…"
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Selector de origen de contactos"
 
@@ -860,12 +836,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
-msgstr "No es posible autenticar.\n"
+msgstr "Falló al autenticar.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contraseña para %s (usuario %s)"
@@ -915,7 +891,7 @@ msgstr ""
 "nombres."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Posición vertical del panel"
 
@@ -944,7 +920,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticación</b>"
 
@@ -994,8 +970,10 @@ msgid "Email address"
 msgstr "Dirección de correo-e"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution usará esta dirección de correo-e para autenticarle con el servidor."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1132,7 +1110,7 @@ msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
-"Este es el máximo número de entradas para descargar.  Si pone este número "
+"Este es el máximo número de entradas para descargar. Si pone este número "
 "demasiado alto ralentizará su libreta de direcciones."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
@@ -1141,7 +1119,7 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Este es el método que usará Evolution para autenticarle a usted.  Note que "
+"Este es el método que usará Evolution para autenticarle a usted. Note que "
 "establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
@@ -1193,9 +1171,9 @@ msgstr "Método de _inicio de sesión:"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Nombre:"
 
@@ -1208,7 +1186,7 @@ msgid "_Search scope:"
 msgstr "_Ámbito de búsqueda:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
@@ -1228,249 +1206,270 @@ msgstr "tarjetas"
 #: ../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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "minutos"
 
 #: ../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/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Correo-e</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Domicilio</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Mensajería instantánea</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Trabajo</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Misceláneo</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Otro</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Teléfono</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Página web</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Trabajo</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../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-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../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/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2407
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "_Nombre completo…"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Imagen"
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Dirección de correo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Apodo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Teléfono"
 
 #. 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/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/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Secretario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Cumpleaños:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1707
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/itip-formatter/itip-view.c:1654
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "Ca_tegorías…"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Categorías"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Ciudad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Archivar como:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Disponibilidad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Página personal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Jefe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Apdo. de correos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Cónyuge:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tratamiento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Charla por vídeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Quiere recibir el correo como HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Diario web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Dónde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Código postal:"
 
 #: ../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/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Dirección"
 
 #: ../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-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1814 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Editable"
 
@@ -2446,7 +2445,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:371
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nombre"
@@ -2457,7 +2456,7 @@ msgstr "Mensajería AOL"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2465,102 +2464,91 @@ msgstr "Jabber"
 msgid "Yahoo Messenger"
 msgstr "Mensajería Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Mensajería 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:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
 msgstr "Servicio"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Lugar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "Usuario"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "Domicilio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "Otro"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../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:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Libro origen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Campos requeridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Modificados"
 
-#: ../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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2780
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
-msgid "_No image"
-msgstr "_Sin imagen"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2781
+msgid "No image"
+msgstr "Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3066
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2568,23 +2556,23 @@ msgstr ""
 "Los datos del contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3077
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3092
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
 #, c-format
 msgid "%s'%s' is empty"
-msgstr "%s«%s» está vacío"
+msgstr "%s'%s' está vacío"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3118
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2601,7 +2589,7 @@ msgid "_Full name"
 msgstr "Nombre _completo"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+msgid "E-_mail"
 msgstr "_Correo-e"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
@@ -2612,7 +2600,7 @@ msgstr "_Seleccione la libreta de direcciones"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "¿Seguro que quiere\n"
 "borrar la lista de contactos (%s)?"
@@ -2629,7 +2617,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "¿Seguro que quiere\n"
 "borrar el contacto (%s)?"
@@ -2642,105 +2630,104 @@ msgstr ""
 "¿Seguro que quiere\n"
 "borrar estos contactos?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Dirección _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Ciudad:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Dirección completa"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "Código _postal:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Hijo"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Srta."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Sra."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Sta."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Nombre:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Apellidos:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_2º Nombre:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Sufijo:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Añadir cuenta de MI"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Nombre de la cuenta:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "Servicio de _MI:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2751,61 +2738,62 @@ msgstr "_Lugar:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Añadir un correo-e a la lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "Insertar direcciones de correo-e desde la libreta de direcciones"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Miembros"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Quitar una dirección de correo-e de la lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar direcciones al enviar correo-e a esta lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Nombre de la lista:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "Libro"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Miembros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
 
@@ -2828,7 +2816,7 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 "La dirección o el nombre modificados de este contacto\n"
-"ya existen en esta carpeta.  ¿Quiere añadirlo de todos modos?"
+"ya existen en esta carpeta. ¿Quiere añadirlo de todos modos?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2844,20 +2832,27 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 "El nombre o la dirección de correo-e de este contacto ya existe\n"
-"en esta carpeta.  ¿Quiere añadirlo de todos modos?"
+"en esta carpeta. ¿Quiere añadirlo de todos modos?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "La categoría es"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "El nombre empieza por"
@@ -2875,7 +2870,7 @@ msgstr[1] "%d contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
@@ -2891,7 +2886,7 @@ msgstr "Error al obtener la vista de libro"
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Modelo"
 
@@ -2899,114 +2894,113 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Error al modificar la tarjeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Fuente"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2069
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Guardar como VCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "Contacto _nuevo…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nueva…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "G_uardar como vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Enviar un _mensaje al contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Enviar un _mensaje a la lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Enviar un _mensaje a los contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Copiar a la libreta de direcciones…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver a la libreta de direcciones…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "_Pegar"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1804
 msgid "Print cards"
 msgstr "Imprimir tarjetas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "Secretario"
 
@@ -3047,7 +3041,7 @@ msgid "Company Phone"
 msgstr "Teléfono de empresa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Correo-e"
@@ -3093,22 +3087,20 @@ msgid "Journal"
 msgstr "Diario"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "Jefe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "Apodo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Nota"
 
@@ -3117,7 +3109,7 @@ msgid "Office"
 msgstr "Oficina"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organización"
 
@@ -3150,7 +3142,6 @@ msgid "Role"
 msgstr "Papel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "Cónyuge"
 
@@ -3181,7 +3172,7 @@ msgid "Web Site"
 msgstr "Sitio web"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3192,12 +3183,12 @@ msgstr "Sitio web"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Anchura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3207,12 +3198,12 @@ msgstr "Anchura"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Altura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "Tiene el foco"
 
@@ -3288,139 +3279,76 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "Correo-e de trabajo"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "Correo-e de casa"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "Otro correo-e"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Abrir enlace en el navegador"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Copiar dirección del enlace"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "_Enviar un mensaje nuevo a…"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Copiar dirección de _correo-e"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Listar miembros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Correo-e"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Department"
-msgstr "Departamento"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-msgid "Profession"
-msgstr "Profesión"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Posición"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-msgid "Video Chat"
-msgstr "Charla por vídeo"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Calendario"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "Disponibilidad"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Videoconferencia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Home Page"
-msgstr "Página personal"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "trabajo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Web Log"
-msgstr "Diario web"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "Cumpleaños"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "Aniversario"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Puesto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Página personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
-msgid "Blog"
-msgstr "Diario web"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3451,7 +3379,7 @@ msgstr "No hay definido un contacto para sí mismo"
 #. 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -3476,14 +3404,14 @@ msgstr "Protocolo no implementado"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2385
 msgid "Canceled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
-msgstr "No es posible cancelar"
+msgstr "No se pudo cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
@@ -3528,7 +3456,7 @@ msgid ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
-"No es posible abrir esta libreta de direcciones. Esto significa que esta "
+"No se pudo abrir esta libreta de direcciones. Esto significa que esta "
 "libreta no está marcada para su uso desconectado o no la ha descargado para "
 "uso desconectado. Por favor, cargue la libreta de direcciones una vez en "
 "modo conectado para descargar su contenido"
@@ -3539,7 +3467,7 @@ msgid ""
 "We were unable to open this addressbook.  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 "
+"No se pudo abrir esta libreta de direcciones. Compruebe que la ruta %s "
 "exista y que tenga permisos para acceder a ella."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:112
@@ -3547,7 +3475,7 @@ msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"No es posible abrir esta libreta de direcciones.  Esto significa que ha "
+"No se pudo abrir esta libreta de direcciones. Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
@@ -3565,7 +3493,7 @@ msgid ""
 "We were unable to open this addressbook.  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 "
+"No se pudo abrir esta libreta de direcciones. Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
@@ -3596,11 +3524,13 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "El backend de esta libreta de direcciones no pudo analizar esta consulta."
+msgstr ""
+"El backend de esta libreta de direcciones no pudo analizar esta consulta."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "El backend para esta libreta de direcciones rehusó a efectuar esta consulta."
+msgstr ""
+"El backend para esta libreta de direcciones rehusó a efectuar esta consulta."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid "This query did not complete successfully."
@@ -3611,7 +3541,7 @@ msgid "Error adding list"
 msgstr "Error al añadir la lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Error al añadir el contacto"
 
@@ -3628,7 +3558,7 @@ msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Error al eliminar el contacto"
 
@@ -3647,7 +3577,7 @@ msgstr[1] ""
 "Abrir %d contactos abrirá %d ventanas nuevas también.\n"
 "¿Quiere realmente mostrar todos estos contactos?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3656,64 +3586,64 @@ msgstr ""
 "%s ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -3808,12 +3738,12 @@ msgstr "Importador de VCard de Evolution"
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3862,7 +3792,7 @@ msgstr "Formato"
 #: ../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-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Cabecera"
@@ -3966,7 +3896,7 @@ msgstr "Escala de grises"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4022,11 +3952,11 @@ msgstr "Esto debería probar el código de impresión de los contactos"
 #: ../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 posible abrir el archivo"
+msgstr "No se pudo abrir el archivo"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
-msgstr "No no pudo obtenerse una lista de libretas de direcciones"
+msgstr "No se pudo obtener una lista de libretas de direcciones"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
@@ -4057,7 +3987,8 @@ msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño por "
 "omisión 100."
@@ -4067,7 +3998,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, por favor use la opción --"
 "help para ver el uso."
@@ -4121,25 +4053,29 @@ msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr ""
-"Toda la información en  estas entradas del diario se borrarán y no se podrán "
+"Toda la información en estas entradas del diario se borrarán y no se podrán "
 "recuperar."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid "All information in this journal will be deleted and can not be restored."
+msgid ""
+"All information in this journal will be deleted and can not be restored."
 msgstr "Toda la información en este diario se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr "Toda la información de estas citas se borrará y no puede se podrá recuperar."
+msgstr ""
+"Toda la información de estas citas se borrará y no puede se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Toda la información de de estas tareas se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información de de estas tareas se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "Toda la información de esta cita se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:8
@@ -4151,7 +4087,8 @@ msgstr ""
 "recuperar."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Toda la información acerca de esta reunión se borrará y no se podrá "
 "recuperar."
@@ -4191,17 +4128,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "¿Seguro que quiere borrar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "¿Seguro que quiere borrar esta entrada del diario?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "¿Seguro que quiere borrar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "¿Seguro que quiere borrar esta tarea?"
 
@@ -4215,7 +4149,7 @@ msgstr "¿Seguro que quiere enviar la tarea mensaje sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:23
 msgid "Cannot create a new event"
-msgstr "No es posible crear un acontecimiento nuevo"
+msgstr "No se puede crear un acontecimiento nuevo"
 
 #: ../calendar/calendar.error.xml.h:24
 msgid "Delete calendar '{0}'?"
@@ -4243,7 +4177,7 @@ msgstr "Descarga en progreso. ¿Desea guardar la tarea?"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Editor could not be loaded."
-msgstr "No es posible cargar el editor."
+msgstr "No se pudo cargar el editor."
 
 #: ../calendar/calendar.error.xml.h:31
 msgid ""
@@ -4254,7 +4188,8 @@ msgstr ""
 "permitirá aceptar esta tarea."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Se enviarán invitaciones por correo-e a todos los participantes y les "
 "permitirá confirmarlas."
@@ -4338,17 +4273,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "El calendario de Evolution ha terminado inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Las notas de Evolution han terminado inesperadamente."
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Las tareas de Evolution han terminado inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "El calendario no está marcado para usarse sin conexión."
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "El calendario que ha seleccionado es de sólo lectura"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "La lista de notas no está marcada para usarse sin conexión"
@@ -4389,7 +4324,8 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "¿Quiere enviar a todos los participantes una notificación de cancelación?"
+msgstr ""
+"¿Quiere enviar a todos los participantes una notificación de cancelación?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
@@ -4401,7 +4337,8 @@ msgstr "¿Quiere enviar esta tarea a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "¿Quiere enviar información de la reunión actualizada a los participantes?"
+msgstr ""
+"¿Quiere enviar información de la reunión actualizada a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
@@ -4418,62 +4355,49 @@ msgstr ""
 "actualizarse a una versión soportada."
 
 #: ../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 ""
-"Tiene seleccionado un calendario de sólo lectura. Cambie a la vista de "
-"calendario y resalte un calendario que pueda aceptar citas."
-
-#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Ha cambiado esta cita, pero no la ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr "Ha realizado cambios a esta tarea, pero no la ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Ha realizado cambios a esta nota, pero no los ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Sus calendarios no estarán disponibles hasta que reinicie Evolution."
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "Sus notas no estarán disponibles hasta que reinicie Evolution."
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Sus tareas no estarán disponibles hasta que reinicie Evolution."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "_Enviar notificación"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
@@ -4490,25 +4414,25 @@ msgstr "Dividir acontecimientos de días múltiples:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "No se ha podido iniciar el servidor evolution-data-server"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1529
 #: ../calendar/conduits/calendar/calendar-conduit.c:1532
 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 se pudo leer información de la aplicación de calendario del Pilot"
 
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 msgid "Could not read pilot's Memo application block"
-msgstr "No es posible leer los datos de la aplicación Memo del Pilot"
+msgstr "No se pudo leer los datos de la aplicación Memo del Pilot"
 
 #: ../calendar/conduits/memo/memo-conduit.c:976
 #: ../calendar/conduits/memo/memo-conduit.c:979
 msgid "Could not write pilot's Memo application block"
-msgstr "No es posible escribir los datos de la aplicación Memo del Pilot"
+msgstr "No se pudo escribir los datos de la aplicación Memo del Pilot"
 
 #: ../calendar/conduits/todo/todo-conduit.c:239
 msgid "Default Priority:"
@@ -4517,20 +4441,20 @@ msgstr "Prioridad predeterminada:"
 #: ../calendar/conduits/todo/todo-conduit.c:1112
 #: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
-msgstr "No es posible leer los datos de la aplicación ToDo del Pilot"
+msgstr "No se pudo leer los datos de la aplicación ToDo del Pilot"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1151
 #: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
-msgstr "No es posible escribir el bloque de aplicación ToDo del Pilot"
+msgstr "No se pudo escribir el bloque de aplicación ToDo del Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4571,21 +4495,21 @@ msgid "Memo_s"
 msgstr "_Notas"
 
 #: ../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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Notas"
 
 #: ../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/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tareas"
@@ -4603,16 +4527,16 @@ msgstr "_Tareas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servicio de notificación por alarma del Calendario de Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4621,7 +4545,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:275
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -4632,10 +4556,10 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -4645,16 +4569,16 @@ msgstr "_Posponer durante:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4666,31 +4590,32 @@ msgstr "_Posponer"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Tiene %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4702,7 +4627,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4719,17 +4644,17 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
 #: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
-msgstr "No es posible inicializar Bonobo"
+msgstr "No se pudo inicializar Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
-msgstr "No es posible crear la fábrica del servicio de la alarma de notificación"
+msgstr "No se pudo crear la fábrica del servicio de la alarma de notificación"
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4778,14 +4703,16 @@ msgstr "Color de fondo para las tareas que vencen hoy, en formato «#rrggbb»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Color de fondo para las tareas que están retrasadas, en formato «#rrggbb»."
+msgstr ""
+"Color de fondo para las tareas que están retrasadas, en formato «#rrggbb»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Los calendarios ejecutarán alarmas durante"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Color para dibujar la línea de Marcus Bains en la barra de Tiempo (vacía por "
 "omisión)."
@@ -4804,7 +4731,8 @@ msgstr "Confirmar compactación"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr "Días en los cuales debe indicarse el inicio y fin de las horas de trabajo."
+msgstr ""
+"Días en los cuales debe indicarse el inicio y fin de las horas de trabajo."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
@@ -4819,108 +4747,96 @@ msgid "Default reminder value"
 msgstr "Valor predeterminado del recordatorio"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Degradado de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Transparencia de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "URLs del servidor de disponibilidad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "URL de la plantilla de disponibilidad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Degradado de los eventos en las vistas de calendario."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Ocultar tareas terminadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Ocultar Lista de tareas nueva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Ocultar el valor de la tarea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Posición horizontal del panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora en la que acaba la jornada laboral, en formato de veinticuatro horas, "
 "de 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora a la que empieza la jornada laboral, en formato de veinticuatro horas, "
 "de 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Los intervalos de tiempo mostrados en las vistas diarias y semanales, en "
 "minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Hora de la última alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URLs del servidor para publicación de disponibilidad."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Línea de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Color de la línea de Marcus Bains - Vista de día"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Color de la línea de Marcus Bains - Barra de tiempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto en el que acaba la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto en el que empieza la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Posición del panel horizontal de la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Posición del panel vertical en la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Número de unidades para determinar un recordatorio predeterminado."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Número de unidades para determinar cuándo ocultar tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Color para las tareas fuera de plazo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4928,7 +4844,7 @@ msgstr ""
 "Posición del panel horizontal, entre la vista y la fecha del navegador del "
 "calendario y lista de tareas cuando no está en la vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4936,15 +4852,7 @@ msgstr ""
 "Posición del panel horizontal, entre la vista y el navegador de fechas del "
 "calendario y la lista de tareas en la vista de mes, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Posición del panel vertical, entre las listas del calendario el calendario "
-"del navegador de fechas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4952,7 +4860,7 @@ msgstr ""
 "Posición del la hoja vertical, entre la lista de tareas y el la hoja de "
 "vista previa de tareas, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4960,7 +4868,7 @@ msgstr ""
 "Posición de la hoja vertical, entre la vista y el navegador del calendario y "
 "la lista de tareas en la vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4969,69 +4877,74 @@ msgstr ""
 "calendario y la lista de tareas cuando no está en la vista mensual, en "
 "píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que se permite que sean ejecutados por las alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostrar las horas de finalización de las citas en las vistas semanales y "
 "mensuales"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 "Mostrar el campo de categorías en el editor de acontecimientos/reuniones/"
 "tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Mostrar el visor de la alarma en una bandeja de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar el panel de vista previa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
+msgstr ""
+"Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar los números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Color para las tareas que vencen hoy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Posición del panel vertical de tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5041,7 +4954,7 @@ msgstr ""
 "reemplaza por la parte del usuario de la dirección de correo y %d se "
 "reemplaza por el dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5050,61 +4963,58 @@ msgstr ""
 "calendario, como una localización sin correspondencia en una base de datos "
 "de franjas horarias Olsen, como en \"América/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Divisiones de hora"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la última alarma sonó, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Zona horaria "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr "Transparencia de los acontecimientos en las vistas del calendario, un valor entre 0 (transparente) y 1 (opaco)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de veinticuatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para el recordatorio predeterminado, \"minutes\", \"hours\" o \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cuándo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Comienzo de la semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
+msgstr ""
+"El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alarmas."
+msgstr ""
+"Indica si se debe usar o no la bandeja de notificación para mostrar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica si debe pedir confirmación al borrar una cita o tarea."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica si debe pedir confirmación al compactar citas y tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5112,100 +5022,96 @@ msgstr ""
 "Indica si se deben comprimir los fines de semana, lo cual pone al sábado y "
 "al domingo en el mismo espacio que un día laborable."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica si debe mostrar la hora de finalización de los acontecimientos en las "
 "vistas semanales y mensuales."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
-msgstr "Indica si debe establecer un recordatorio predeterminado para las citas."
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para las citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Confirmar» en el editor de acontecimiento/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Categorías» en el editor de acontecimientos/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Rol» en el editor de acontecimientos/tareas/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Estado» en el editor de acontecimientos/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
 "usar am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Zona horaria» en el editor de "
 "acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Tipo» en el editor de acontecimientos/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
-msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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 debe mostrar los números de la semana en el navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Hora de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minuto de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Hora de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minuto de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "Hora de verano"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "El resumen contiene"
@@ -5214,25 +5120,39 @@ msgstr "El resumen contiene"
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "El lugar contiene"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "No coincidente"
 
 #: ../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:74 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Calendario"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5249,10 +5169,10 @@ msgstr "Purgar acontecimientos anteriores a"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "días"
 
@@ -5260,89 +5180,90 @@ msgstr "días"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "En la web"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Cumpleaños y aniversarios"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Meteorología"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "Calendario _nuevo"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Falló al actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, 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 se pudo abrir el calendario «%s» para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay un calendario disponible para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Selector de origen del calendario"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Crea una solicitud de reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
@@ -5494,25 +5415,26 @@ msgid "A_dd"
 msgstr "Aña_dir"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Sugerir mostrar automáticamente el adjunto"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alarmas"
 
@@ -5532,13 +5454,14 @@ 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>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertas</span>"
 
@@ -5547,7 +5470,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Servidor de disponibilidad predeterminado</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
@@ -5564,25 +5487,27 @@ msgstr "<span weight=\"bold\">Tiempo</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Semana laboral</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Ajustar a la hora de _verano"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "La jornada _acaba a las:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Mostrar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:586
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Disponibilidad"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Viernes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5592,13 +5517,13 @@ msgstr ""
 "Horas\n"
 "Días"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Lunes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5616,229 +5541,230 @@ msgstr ""
 "Sábado\n"
 "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Elija un color"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione los calendarios para las alarmas de notificación"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un recordatorio"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_asks due today:"
 msgstr "Ta_reas que vencen hoy:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "T_hu"
 msgstr "_Jue"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Jueves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Miércoles"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Wee_k starts on:"
 msgstr "La _semana empieza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Work days:"
 msgstr "Días laborables:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ación al borrar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Fri"
 msgstr "_Vie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Tue"
 msgstr "_Mar"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Wed"
 msgstr "M_ié"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "_Copiar el contenido del calendario localmente para operación desconectada"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr ""
-"Co_piar el contenido del la lista de tareas localmente para operación "
-"desconectada"
+"Copiar el contenido del calendario localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr ""
-"Copia_r el contenido de la lista de notas localmente para operación "
+"Copiar el contenido del la lista de tareas localmente para operación "
 "desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Copiar el contenido de la nota localmente para operación desconectada"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_olor:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
 msgstr "Lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memo List"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Añadir calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Añadir lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Añadir calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Añadir lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "_Refrescar:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5864,7 +5790,7 @@ msgstr "%s  Ha hecho cambios. ¿Olvido los cambios y cierro el editor?"
 #: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  No ha hecho cambios, ¿cerrar el editor?"
+msgstr "%s  No ha hecho cambios, ¿quiere cerrar el editor?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
@@ -5881,12 +5807,14 @@ msgstr "Esta entrada del diario ha cambiado."
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
+msgstr ""
+"%s  Ha realizado cambios. ¿Quiere olvidar estos cambios y actualizar el "
+"editor?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
+msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 
 #: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
@@ -5913,37 +5841,37 @@ msgstr " (Vence "
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaje adjunto - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaje adjunto"
 msgstr[1] "%d mensajes adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
 #: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
-msgstr "No es posible actualizar el objeto"
+msgstr "No se pudo actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5955,144 +5883,142 @@ msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Mostrar adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Pulse la barra espaciadora para cambiar la barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:310
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
-msgstr "Imposible usar la versión actual."
+msgstr "No se pudo usar la versión actual."
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
-msgstr "No es posible abrir el origen"
+msgstr "No se pudo abrir el origen"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
-msgstr "No es posible abrir el destino"
+msgstr "No se pudo abrir el destino"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
 msgstr "El destino es de sólo lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "¿_Borrar este elemento de todos los otros buzones del destinatario?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
-msgstr "El acontecimiento no pudo borrarse debido a un error de CORBA"
+msgstr "El acontecimiento no se pudo borrar debido a un error de CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
-msgstr "La tarea no pudo borrarse debido a un error de CORBA"
+msgstr "La tarea no se pudo borrar debido a un error de CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
-msgstr "La entrada del diario no pudo borrarse debido a un error de CORBA"
+msgstr "La entrada del diario no se pudo borrar debido a un error de CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
-msgstr "El elemento no pudo borrarse debido a un error de CORBA"
+msgstr "El elemento no se pudo borrar debido a un error de CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
-msgstr "El acontecimiento no pudo borrarse porque el se ha denegado el permiso"
+msgstr ""
+"El acontecimiento no se pudo borrar porque el se ha denegado el permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
-msgstr "La tarea no pudo borrarse porque se ha denegado el permiso"
+msgstr "La tarea no se pudo borrar porque se ha denegado el permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "La entrada del diario no pudo borrarse porque se ha denegado el permiso"
+msgstr ""
+"La entrada del diario no se pudo borrar porque se ha denegado el permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -6100,19 +6026,19 @@ msgstr "El elemento no pudo borrarse porque el permiso se ha denegado"
 
 #: ../calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
-msgstr "El acontecimiento no pudo borrarse debido a un error"
+msgstr "El acontecimiento no se pudo borrar debido a un error"
 
 #: ../calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
-msgstr "La tarea no pudo borrarse debido a un error"
+msgstr "La tarea no se pudo borrar debido a un error"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
-msgstr "La entrada del diario no pudo borrarse debido a un error"
+msgstr "La entrada del diario se pudo borrar debido a un error"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
-msgstr "El elemento no pudo borrarse debido a un error"
+msgstr "El elemento no se pudo borrar debido a un error"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
@@ -6127,11 +6053,11 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:559
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:563
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Repetición"
@@ -6142,9 +6068,8 @@ msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alarmas."
 
 #: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../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 "Or_ganizador:"
@@ -6166,14 +6091,13 @@ msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalización"
 
 #: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1268
 msgid "End date is wrong"
-msgstr "La fecha de finalización  está equivocada"
+msgstr "La fecha de finalización está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1291
 msgid "Start time is wrong"
@@ -6181,16 +6105,14 @@ msgstr "La hora de inicio está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1298
 msgid "End time is wrong"
-msgstr "La  hora de finalización  está equivocada"
+msgstr "La hora de finalización está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta."
 
 #: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
@@ -6208,7 +6130,7 @@ msgstr "_Añadir"
 #: ../calendar/gui/dialogs/event-page.c:2623
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "No es posible abrir el calendario «%s»."
+msgstr "No se pudo abrir el calendario «%s»."
 
 #: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
@@ -6236,19 +6158,24 @@ msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: ../calendar/gui/dialogs/event-page.c:2963
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1691
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1507 ../widgets/misc/e-dateedit.c:1721
 msgid "None"
 msgstr "Ninguno"
 
@@ -6265,7 +6192,8 @@ msgid "15 minutes before appointment"
 msgstr "15 minutos antes de la cita"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "_Participantes…"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6286,12 +6214,16 @@ msgstr "_Descripción:"
 msgid "Event Description"
 msgstr "Descripción del acontecimiento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+msgid "Locat_ion:"
+msgstr "_Lugar:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Resu_men:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Alarm"
 msgstr "_Alarma"
 
@@ -6359,7 +6291,7 @@ msgstr "Confirmar"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -6380,87 +6312,69 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "No es posible abrir las notas en «%s»."
-
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "Para"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "Fecha de ini_cio:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "Resu_men"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-msgid "T_o:"
-msgstr "_Para:"
+msgstr "No se pudieron abrir las notas en «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "Contenido de la _nota:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opciones del calendario</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Añadir un calendario nuevo"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Grupo del calendario"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Dirección del calendario"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Nombre del calendario"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Opciones de lista de tareas</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Añadir lista de tareas nueva"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Agrupar lista de tareas"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Nombre de la lista de tareas"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
+msgstr ""
+"Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event. What would you like to delegate?"
@@ -6471,8 +6385,10 @@ msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando una tarea que se repite. ¿Qué quiere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "Está modificando una entrada del diario que se repite. ¿Qué quiere modificar?"
+msgid ""
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr ""
+"Está modificando una entrada del diario que se repite. ¿Qué quiere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6492,7 +6408,7 @@ msgstr "Todas las instancias"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
+msgstr "Esta cita tiene repeticiones que no pueden ser editadas por Evolution."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
@@ -6599,7 +6515,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Excepciones</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>Vista previa</b>"
 
@@ -6664,15 +6580,15 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Terminado"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Alta"
 
@@ -6681,20 +6597,20 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2379
 msgid "In Progress"
 msgstr "En proceso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Baja"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
@@ -6702,7 +6618,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2376
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -6715,7 +6631,7 @@ msgid "Stat_us:"
 msgstr "_Estado:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -6724,7 +6640,7 @@ msgid "_Date completed:"
 msgstr "_Fecha de terminación:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
@@ -6748,11 +6664,7 @@ msgstr "La fecha de vencimiento es errónea"
 #: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "No es posible abrir las tareas en «%s»."
-
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Participantes…"
+msgstr "No se pudieron abrir las tareas en «%s»."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
@@ -6762,6 +6674,10 @@ msgstr "_Categorías…"
 msgid "Or_ganiser:"
 msgstr "Or_ganizador:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "Fecha de ini_cio:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Zona horaria:"
@@ -6770,46 +6686,46 @@ msgstr "Zona horaria:"
 msgid "_Due date:"
 msgstr "Fecha de _vencimiento:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Calendarios de _disponibilidad</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Frecuencia de publicación</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
-msgstr "<b>_Lugar de publicación</b>"
+msgstr "<b>_Dirección de publicación</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Opciones de publicación de disponibilidad"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Diariamente"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Manual"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_Contraseña:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "_Recordar contraseña"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_Usuario:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Semanalmente"
 
@@ -6890,42 +6806,35 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
-msgid "Untitled"
-msgstr "Sin título"
-
-#: ../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
-msgid "Start Date:"
-msgstr "Fecha de inicio:"
-
-#: ../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
-msgid "Description:"
-msgstr "Descripción:"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "Notas:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Página web:"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Sin título"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "Fecha de inicio:"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Fecha de vencimiento:"
@@ -6935,7 +6844,7 @@ msgstr "Fecha de vencimiento:"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:907
 msgid "Status:"
 msgstr "Estado:"
 
@@ -6943,18 +6852,26 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridad:"
 
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Descripción:"
+
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -6963,25 +6880,24 @@ msgid "End Date"
 msgstr "Fecha de terminación"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Resumen"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Libre"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupada"
 
@@ -6995,17 +6911,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sí"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
@@ -7016,21 +6932,21 @@ msgstr "No"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1716
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:669
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Asignado"
 
@@ -7038,7 +6954,7 @@ msgstr "Asignado"
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 
@@ -7047,9 +6963,9 @@ msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
@@ -7067,132 +6983,119 @@ msgstr "_Guardar seleccionados"
 msgid "Open in %s..."
 msgstr "Abrir en %s…"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../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:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c: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:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "_Tarea nueva"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: ../calendar/gui/e-calendar-table.c: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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Im_primir…"
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ../calendar/gui/e-calendar-table.c: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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Marcar como incompleto"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Marcar tareas seleccionadas como incompletas"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -7202,7 +7105,7 @@ msgstr "Pulse para añadir una tarea"
 msgid "% Complete"
 msgstr "% Terminado"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Terminado"
 
@@ -7227,101 +7130,105 @@ msgstr "Fecha de inicio"
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Moviendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "_Cita nueva…"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "_Reunión nueva"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "_Tarea nueva"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Vista _actual"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Seleccionar _hoy"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha…"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Concertar una reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repetición _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2349
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s (%s)"
@@ -7351,7 +7258,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisiones de %02i minutos"
@@ -7362,21 +7269,19 @@ msgstr "divisiones de %02i minutos"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1538
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:858
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "pm"
@@ -7469,12 +7374,10 @@ msgstr "Error de iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
@@ -7489,22 +7392,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Declined"
 msgstr "Rechazado"
 
@@ -7517,7 +7420,8 @@ msgstr ""
 "calendarios"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
@@ -7713,21 +7617,24 @@ msgstr "El objeto es inválido y no puede ser actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
+msgstr ""
+"Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "El estado del participante no pudo actualizarse debido a un estado inválido\n"
+msgstr ""
+"El estado del participante no se pudo actualizar debido a un estado "
+"inválido\n"
 
 #: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1080
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
-"El estado del participante no pudo actualizarse porque ya no existe el "
+"El estado del participante no se pudo actualizar porque ya no existe el "
 "elemento"
 
 #: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
@@ -7773,35 +7680,48 @@ msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--a--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Mensaje de calendario"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Fecha:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Cargando calendario"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Cargando calendario…"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensaje del servidor:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "fecha de fin"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "fecha de inicio"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Presidencia"
@@ -7820,65 +7740,65 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Participante requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "No participan"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Necesita acción"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Provisional"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1713
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -7887,14 +7807,14 @@ msgstr "Delegado"
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "En proceso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -7902,86 +7822,86 @@ msgstr "%A, %d de %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Participantes…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Borrar las notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pulse para añadir una nota"
 
@@ -7989,8 +7909,8 @@ msgstr "Pulse para añadir una nota"
 msgid "Memo sort"
 msgstr "Ordenar nota"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8008,7 +7928,7 @@ msgstr "Cargando notas"
 msgid "Opening memos at %s"
 msgstr "Abriendo notas en %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados…"
 
@@ -8017,20 +7937,20 @@ msgstr "Borrando los objetos seleccionados…"
 msgid "Enter the password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Terminando tareas…"
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Compactando"
 
@@ -8041,48 +7961,42 @@ msgstr "Seleccione la zona horaria"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1522
 msgid "%d %B"
 msgstr "%e de %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Actualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "Vista _personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_Guardar vista personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Definir vistas…"
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, c-format
-msgid "Loading memos at %s"
-msgstr "Cargando notas en %s"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Compactando"
 
@@ -8196,18 +8110,14 @@ msgstr "Información de iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "Lista de notas _nueva"
-
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8215,58 +8125,46 @@ msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionado"
 msgstr[1] ", %d seleccionados"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "Fallo al actualizar las notas."
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
-"No es posible abrir la lista de notas «%s» para crear acontecimientos y "
+"No se pudo abrir la lista de notas «%s» para crear acontecimientos y "
 "reuniones"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "No hay un calendario disponible para crear notas"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Selector de origen de notas"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Nota nueva"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
 msgstr "_Nota"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Crea una nota nueva"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "Nota nueva compartida"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "Nota _compartida"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "Crea una nota compartida nueva"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
 msgstr "_Lista de notas"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
@@ -8301,19 +8199,20 @@ msgstr ""
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "No es posible migrar la configuración antigua desde evolution/config.xmldb"
+msgstr ""
+"No se pudo migrar la configuración antigua desde evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:794
 #, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr "No es posible migrar el calendario «%s»"
+msgstr "No se pudo migrar el calendario «%s»"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:962
 #, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "No es posible migrar las tareas en «%s»"
+msgstr "No se pudieron migrar las tareas en «%s»"
 
 #: ../calendar/gui/print.c:574
 msgid "1st"
@@ -8571,7 +8470,7 @@ msgstr "Fallo al actualizar las tareas."
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
-"No es posible abrir la lista de tareas «%s» para crear acontecimientos y "
+"No se pudo abrir la lista de tareas «%s» para crear acontecimientos y "
 "reuniones"
 
 #: ../calendar/gui/tasks-component.c:890
@@ -8607,14 +8506,14 @@ msgid "New task list"
 msgstr "Lista de tareas nueva"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "_Lista de tareas"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8626,11 +8525,11 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
@@ -9206,7 +9105,7 @@ msgid "America/Nassau"
 msgstr "América/Nassau"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "América/Nueva York"
 
@@ -10207,25 +10106,25 @@ msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
+#: ../widgets/misc/e-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fKib"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
+#: ../widgets/misc/e-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fMib"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
+#: ../widgets/misc/e-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fGib"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:974
 msgid "Attachment Bar"
 msgstr "Barra de adjuntos"
 
@@ -10233,43 +10132,43 @@ msgstr "Barra de adjuntos"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:242 ../widgets/misc/e-attachment.c:258
+#: ../widgets/misc/e-attachment.c:449 ../widgets/misc/e-attachment.c:467
 #, c-format
 msgid "Cannot attach file %s: %s"
-msgstr "No es posible adjuntar el archivo %s: %s"
+msgstr "No se pudo adjuntar el archivo %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:250 ../widgets/misc/e-attachment.c:458
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
-msgstr "No es posible adjuntar el archivo %s: no es un archivo normal"
+msgstr "No se pudo adjuntar el archivo %s: no es un archivo normal"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Propiedades de adjuntos"
 
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Nombre del archivo:"
 
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Destino donde publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Pulse aquí para acceder a la libreta de direcciones"
 
@@ -10280,45 +10179,45 @@ msgstr "Pulse aquí para acceder a la libreta de direcciones"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_De:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10329,15 +10228,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquí para seleccionar las carpetas en las que publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Publicar en:"
 
@@ -10345,74 +10244,76 @@ msgstr "Publicar en:"
 msgid "A_ttach"
 msgstr "_Adjuntar"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Inserta un adjunto"
 
-#: ../composer/e-msg-composer.c:827
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:828
+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"
+"No se puede firmar el mensaje saliente: No hay establecido un certificado de "
+"firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"No es posible encriptar el mensaje saliente: no hay establecido un "
-"certificado de encriptado para esta cuenta"
+"No se puede encriptar el mensaje saliente: no hay establecido un certificado "
+"de encriptado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
-msgstr "No es posible abrir el archivo"
+msgstr "No se pudo abrir el archivo"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
-msgstr "No no pudo obtenerse el mensaje del editor"
+msgstr "No se pudo obtener el mensaje del editor"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Abrir archivo"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Auto-generado"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+msgstr ""
+"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -10430,11 +10331,13 @@ msgstr "Todas las cuentas han sido eliminadas."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
+msgstr ""
+"¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
+msgstr ""
+"Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:18
@@ -10453,23 +10356,23 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
-msgstr "No es posible crear la ventana de redacción."
+msgstr "No se pudo crear la ventana de redacción."
 
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
-msgstr "No es posible crear un mensaje."
+msgstr "No se pudo crear un mensaje."
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "No es posible leer el archivo de firma «{0}»."
+msgstr "No se pudo leer el archivo de firma «{0}»."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "No no pudo obtenerse un mensaje al que adjuntar desde {0}."
+msgstr "No se pudo obtener un mensaje al que adjuntar desde {0}."
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "No es posible autoguardar el archivo «{0}»."
+msgstr "No se pudo autoguardar el archivo «{0}»."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
@@ -10497,7 +10400,8 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
+msgstr ""
+"El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid ""
@@ -10514,13 +10418,13 @@ msgid ""
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 msgstr ""
-"No es posible activar el componente del editor HTML.\n"
+"No se pudo activar el componente del editor HTML.\n"
 "\n"
 "Asegúrese de que tiene la versión correcta de gtkhtml y libgtkthml instalada."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "Unable to activate the address selector control."
-msgstr "No es posible activar el control de selección de direcciones."
+msgstr "No se pudo activar el control de selección de direcciones."
 
 #: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
@@ -10552,7 +10456,7 @@ msgstr "_Guardar mensaje"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10573,7 +10477,6 @@ msgid "calendar information"
 msgstr "información de calendario"
 
 #: ../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"
@@ -10584,17 +10487,14 @@ msgstr ""
 "¿Quiere cambiar su estado a «En la oficina»? "
 
 #: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Mensaje para cuando esté fuera de la oficina</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Estado:</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"
@@ -10604,12 +10504,10 @@ msgstr ""
 "persona que le envíe correo mientras esté fuera de la oficina. </small>"
 
 #: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr "Ahora estoy en la oficina"
 
 #: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Ahora no estoy en la oficina"
 
@@ -10618,24 +10516,26 @@ msgid "No, Do not Change Status"
 msgstr "No, no cambiar el estado"
 
 #: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
 msgstr "Asistente para fuera de la oficina"
 
 #: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
 msgstr "Sí, cambiar estado"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Recepción de correo</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Envío de correo:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10647,33 +10547,33 @@ msgstr ""
 "hacer Evolution cuando a usted le solicite alguien un acuse de recibo.</"
 "small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Siempre devolver una confirmación de lectura"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Preguntarme si deseo devolver una confirmación de lectura"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Nunca devolver una confirmación de lectura"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Confirmación de lectura"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Pedir una confirmación de lectura para todos los mensajes que envíe"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "A no ser que el mensaje se envíe a una lista de correo y no a mí "
 "personalmente"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10681,7 +10581,7 @@ msgstr ""
 "Cuando reciba un correo con una solicitud de notificación de lectura, ¿qué "
 "debería hacer Evolution?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10689,39 +10589,39 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Quiere sobreescribirlo?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Advertencia de Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Información de Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Consulta de Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Error interno, solicitado un error desconocido «%s»"
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
-msgstr "No es posible abrir el archivo «{0}»."
+msgstr "No se pudo abrir el archivo «{0}»."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file &quot;{0}&quot;."
-msgstr "No es posible guardar el archivo «{0}»."
+msgstr "No se pudo guardar el archivo «{0}»."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
@@ -10731,7 +10631,7 @@ msgstr "¿Quiere sobreescribirlo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "El archivo existe «{0}»."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
@@ -10806,24 +10706,24 @@ msgstr "%e-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione una fecha con la que comparar"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Elija un archivo"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Más tarde"
 
@@ -10872,11 +10772,11 @@ msgid "Include threads"
 msgstr "Incluir conversaciones"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -10886,7 +10786,7 @@ msgstr "Error en la expresión regular «{0}»."
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "No es posible compilar la expresión regular «{1}»."
+msgstr "No se puede compilar la expresión regular «{1}»."
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
@@ -10900,7 +10800,7 @@ msgstr "Falta la fecha."
 msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Falta el nombre."
 
@@ -10972,7 +10872,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "segundos"
 
@@ -11005,7 +10905,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í"
@@ -11042,22 +10943,22 @@ msgstr "Control de configuración del redactor de correo de Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Control de preferencias de Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
@@ -11084,7 +10985,7 @@ msgstr ""
 "y marque la casilla para aceptarlo.\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -11092,46 +10993,46 @@ msgstr "Seleccionar carpeta"
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2014
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "_Comprobar si hay correo nuevo automáticamente cada"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Seguridad"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Comprobación de correo nuevo"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
@@ -11151,22 +11052,22 @@ msgid "[Default]"
 msgstr "[Predeterminada]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Nombre de la cuenta"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Sin nombre"
 
@@ -11243,7 +11144,7 @@ msgid "Date sent"
 msgstr "Fecha de envío"
 
 #: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
 #: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Borrar"
@@ -11336,8 +11237,8 @@ msgstr "no es"
 msgid "is not Flagged"
 msgstr "no está marcado"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
@@ -11345,7 +11246,7 @@ msgstr "Spam"
 msgid "Junk Test"
 msgstr "Detección de spam"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11389,7 +11290,7 @@ msgstr "Reproducir un sonido"
 msgid "Read"
 msgstr "Leído"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Destinatarios"
 
@@ -11417,11 +11318,11 @@ msgstr "devuelve menor que"
 msgid "Run Program"
 msgstr "Ejecutar programa"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuación"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Remitente"
 
@@ -11453,11 +11354,11 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Asunto"
@@ -11471,59 +11372,27 @@ msgstr "Quitar estado"
 msgid "<b>Then</b>"
 msgstr "<b>Entonces</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear una carpeta de búsqueda desde la búsqueda…"
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Todos los mensajes"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Mensajes no leídos"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Sin etiqueta"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Mensajes leídos"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Mensajes recientes"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days' Messages"
-msgstr "Mensajes de los últimos 5 días"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Mensajes con adjuntos"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Mensajes que no son spam"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
 msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "Mensajes en total:"
+msgstr[0] "Mensaje en total:"
 msgstr[1] "Mensajes en total:"
 
 #. 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] "Mensajes no leído:"
+msgstr[0] "Mensaje no leído:"
 msgstr[1] "Mensajes no leídos:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
 
@@ -11540,7 +11409,7 @@ msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Carpetas de búsqueda"
 
@@ -11555,7 +11424,7 @@ msgstr "Borradores"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
@@ -11571,77 +11440,77 @@ msgstr "Correo enviado"
 msgid "Loading..."
 msgstr "Cargando…"
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Árbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "No es posible dejar el(los) mensaje(s) en el almacén de nivel superior"
+msgstr "No se pudo dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:27
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Ver"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Copiar…"
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Mover…"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "Carpeta _nueva…"
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -11650,14 +11519,13 @@ msgstr "_Vaciar papelera"
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando «%s» a «%s»"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -11679,168 +11547,158 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:126
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta…"
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
-msgstr "Marcar como no _importante"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr "Marcar como no im_portante"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no spam"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Ninguno"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Carpeta de búsqueda según el a_sunto"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Carpeta de búsqueda según el re_mitente"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Carpeta de búsqueda según los des_tinatarios"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Carpeta de búsqueda según la _lista de correo"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
-msgstr "No no pudo obtenerse el mensaje"
+msgstr "No se pudo obtener el mensaje"
+
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Copiar dirección del enlace"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Pulse para ocultar/mostrar las direcciones"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:503
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "Buscar:"
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "_Coincidir con capitalización"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11848,11 +11706,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Firma válida"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11860,11 +11718,11 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11872,11 +11730,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Firma válida, no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11884,11 +11742,11 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Desencriptado"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11896,11 +11754,11 @@ msgstr ""
 "Este mensaje no está encriptado. Su contenido puede verse en tránsito a "
 "través de Internet."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Encriptado, débil"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11910,11 +11768,11 @@ msgstr ""
 "Debería ser difícil, pero no imposible para un espía ver el contenido de "
 "este mensaje empleando algo de tiempo."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Encriptado"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11922,11 +11780,11 @@ msgstr ""
 "Este mensaje está encriptado. Sería difícil para un espía ver el contenido "
 "de este mensaje."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11936,72 +11794,72 @@ msgstr ""
 "muy difícil que un espía vea el contenido de este mensaje en empleando un "
 "tiempo razonable."
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Ajustar al ancho"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _original"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Seleccione la carpeta donde guardar todos los adjuntos…"
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Guardar seleccionados…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d a_djunto"
-msgstr[1] "%d a_djuntos"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] "%d ad_junto"
+msgstr[1] "%d ad_juntos"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Guardar"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Sin adjunto"
 
@@ -12015,88 +11873,94 @@ msgstr "Página %d de %d"
 msgid "Retrieving `%s'"
 msgstr "Obteniendo «%s»"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Firma válida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) válido en «%s»"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Para"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Transporte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Fecha"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
@@ -12108,11 +11972,11 @@ msgstr "%s adjunto"
 
 #: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
+msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
 
 #: ../mail/em-format.c:1271 ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
+msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
 
 #: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
@@ -12146,7 +12010,7 @@ msgstr "Una vez por semana"
 msgid "Once per month"
 msgstr "Una vez por mes"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12158,52 +12022,52 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas…"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "No es posible crear la carpeta nueva: «%s»: %s"
+msgstr "No se pudo crear la carpeta nueva: «%s»: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "No es posible copiar el la carpeta «%s» a «%s»: %s"
+msgstr "No se pudo copiar la carpeta «%s» a «%s»: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "No es posible buscar buzones existentes en «%s»: %s"
+msgstr "No se pudo buscar buzones existentes en «%s»: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "No es posible abrir los datos antiguos POP keep-on-server «%s»: %s"
+msgstr "No se pudo abrir los datos antiguos POP keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Fallo al crear directorio de datos POP3 keep-on-server  «%s»: %s"
+msgstr "No se pudo crear el directorio de datos POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "No es posible copiar los datos POP3 keep-on-server «%s»: %s"
+msgstr "No se pudieron copiar los datos POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "No es posible crear el almacén de correo local  «%s»: %s"
+msgstr "Falló al crear el almacén de correo local «%s»: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "No es posible crear las carpetas de correo local en: «%s»: %s"
+msgstr "No se pudieron crear las carpetas de correo local en: «%s»: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
-"No es posible leer la configuración de la instalación anterior de Evolution, "
+"No se pudo leer la configuración de la instalación anterior de Evolution, "
 "«evolution/config.xmldb» no existe o está corrompido."
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
@@ -12211,10 +12075,14 @@ msgid "_Reply to sender"
 msgstr "_Responder al remitente"
 
 #: ../mail/em-popup.c:558 ../mail/em-popup.c:569
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Abrir enlace en el navegador"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Enviar un mensaje nuevo a…"
@@ -12223,49 +12091,49 @@ msgstr "_Enviar un mensaje nuevo a…"
 msgid "_Add to Address Book"
 msgstr "_Añadir a la libreta de direcciones"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacén no soporta suscripciones, o no están activadas."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "mensaje"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Guardar mensaje…"
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Añadir dirección"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
@@ -12274,7 +12142,7 @@ msgstr "Correos de %s"
 msgid "Search _Folders"
 msgstr "Carpetas de _búsqueda"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Origen de la carpeta de búsqueda"
 
@@ -12307,112 +12175,84 @@ msgid "Composer Window default width"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Comprimir la visualización de direcciones en A/CC/CCO"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Comprime la visualización de direcciones en A/CC/CCO al número especificado "
-"en address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Altura predeterminada de la ventana del redacción de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Altura predeterminada de la ventana del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Anchura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Anchura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Dibujar indicadores de errores tipográficos en las palabras mientras se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Activa o desactiva la característica de búsqueda al teclear"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Activa la característica de búsqueda en la barra para que puede iniciar una "
-"búsqueda interactiva tecleando el texto. El uso es para que pueda encontrar "
-"fácilmente una carpeta en esa barra lateral tan sólo tecleando el nombre de "
-"la carpeta y la selección salta automáticamente a esa carpeta."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
-msgstr "Activar/desactivar modo cursor"
+msgstr "Habilitar/deshabilitar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12420,15 +12260,7 @@ msgstr ""
 "Si el usuario intenta abrir diez o más mensajes al mismo tiempo, preguntar "
 "al usuario si quiere realmente hacerlo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Si el panel de «Vista previa» está activado, entonces lo muestra en el "
-"lateral en vez de verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12436,30 +12268,26 @@ msgid ""
 msgstr ""
 "Si no hay un visor integrado para un tipo mime particular dentro de "
 "Evolution, cualquier tipo mime que aparezca en esta lista que se mapee a un "
-"visor de componentes bonobo en la base de datos de GNOME puede usarse para "
+"visor de componentes bonobo en la base de datos de Gnome puede usarse para "
 "mostrar el contenido."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Desactiva/activa la pregunta cuando se marcan varios mensajes."
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12468,11 +12296,11 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceras personalizadas y si están activadas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12481,19 +12309,19 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de componentes bonobo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imágenes para mensajes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12503,203 +12331,183 @@ msgstr ""
 "Nunca cargar imágenes desde la red 1 - Cargar imágenes si el remitente está "
 "en la libreta de direcciones 2 - Siempre cargar imágenes desde la red"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la «vista previa» del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Altura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Anchura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización del mensaje (\"normal\", \"full headers\" (cabeceras "
 "completas), \"source\" (fuente))"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre el vaciado de la papelera a la salida"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado de la papelera a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Archivo de sonido para notificar correo nuevo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Tipo de notificación de correo nuevo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Número de direcciones a mostrar en PARA/CC/CCO"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente compactar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.in.h:57
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cuando el usuario intente abrir diez o más mensajes a la vez"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al enviar mensajes en HTML a contactos quizá no los quieran."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "Preguntar cuando se marquen varios mensajes"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Ejecutar la prueba de spam en el correo entrante"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Envía el correo en HTML por omisión."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Muestra las imágenes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Muestra los mensajes borrados (tachados) en la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Muestra los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr ""
-"Muestra el correo-e del remitente la columna de composición de mensajes en "
-"la lista de mesajes"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr ""
-"Muestra el correo-e del remitente en la columna de mensajes en la lista de "
-"mensajes"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproduce un archivo de sonido cuando llegue correo nuevo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
+msgstr ""
+"Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "La última vez que se vació la papelera, en días desde la época."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "La tipografía de terminal para mostrar el correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "La letra de anchura variable para mostrar el correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12711,111 +12519,99 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt; - poner a activado si la cabecera "
 "se debe mostrar en la vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Esto establece el número de direcciones a mostrar en la vista de lista de "
-"mensajes predeterminada, más allá de los cuales se muestra un «...»."
-
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
-msgstr "Agrupar la lista de mensajes."
+msgstr "Agrupar la lista de mensajes por conversaciones."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Agrupar la lista de mensajes por conversaciones"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Temporización para marcar un mensaje como visto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Temporización para marcar un mensaje como visto."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Usar el demonio y cliente de Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Usar el demonio y cliente de Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Usar tipografía personalizada"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Usar tipografía personalizada para mostrar el correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Usar sólo los tests de spam locales."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa sólo los tests de spam locales (sin DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Usar distribución lado a lado o ancha"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Tipografía de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "El elemento del menú «Ver/Cco» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "El elemento del menú «Ver/Cco» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "El elemento del menú «Ver/Cc» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "El elemento del menú «Ver/Cc» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "El elemento del menú «Ver/Desde» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "El elemento del menú «Ver/Desde» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "El elemento del menú «Ver/Publicar en» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "El elemento del menú «Ver/Publicar en» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "El elemento del menú «Ver/Responder a» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "El elemento del menú «Ver/Responder a» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12823,14 +12619,6 @@ msgstr ""
 "Indica si se debe o no volver al agrupado de conversaciones por asuntos "
 "cuando los mensajes no contienen cabeceras «In-Reply-To» o «References»."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Anchura del panel de lista de mensajes"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Anchura del panel de lista de mensajes."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Importando datos de Elm"
@@ -12862,15 +12650,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetas en formato buzón de Berkeley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Por favor espere"
 
@@ -13052,31 +12840,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d no leído"
 msgstr[1] ", %d no leídos"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Carpeta de correo nueva"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falló al actualizar la configuración de correo o carpetas."
 
@@ -13104,220 +12892,227 @@ msgstr "_Tareas pendientes"
 msgid "_Later"
 msgstr "_Más tarde"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL no está soportado en esta compilación de Evolution</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>_Firmas</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Idiomas</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
+msgstr ""
+"<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Información de la cuenta</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipo de autenticación</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autenticación</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Redacción de mensajes</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuración</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Comportamiento predeterminado</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Borrar correo</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Cabeceras de correo mostradas</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opciones de filtrado</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiquetas y colores</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Carga de imágenes</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Presentación del mensaje</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Tipografías del mensaje</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Notificaciones de recepción de mensajes</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notificación de correo nuevo</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Información opcional</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opciones</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tipografía para impresión</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Información requerida</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Seguridad</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Mensajes enviados y borradores</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuración del servidor</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Administración de cuentas"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Añadir firma _nueva…"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Añadir _script"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "También encriptar a _mí mismo cuando envíe correo encriptado"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Siempre enviar _copia de carbón (Cc) a:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Siempre enviar copia de carbón _oculta (Cco) a:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre _confiar en las claves de mi almacén al encriptar"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Siempre encriptar a _mí mismo cuando envíe correo encriptado"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Adjuntar mensaje original"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "_Insertar emoticonos automáticamente"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "Emitir un _pitido cuando llegue correo nuevo"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Detectar si el correo entrante es _spam"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Comprobar orto_grafía mientras se escribe"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Detecta si el correo entrante es spam"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Vaciar"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Vacia_r"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Colores"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmar antes de compactar una carpeta"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13333,135 +13128,135 @@ msgstr ""
 "\n"
 "Pulse «Aplicar» para guardar su configuración."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Firmar _digitalmente los mensajes salientes (por omisión)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "No citar el mensaje original"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Hecho"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Carpeta de _borradores:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "_Activar"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Cuentas de correo-e"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "Dir_ección de correo-e:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Certificado de _encriptado:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Encriptar mensajes _salientes (por omisión)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Tipografía de anchura _fija:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Anchura _fija:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Propiedades de tipografías"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "Nombre _completo:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correo en HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Cabeceras"
 
 # Esta cadena debe permanecer así
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Resaltar texto _citado con este color:"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "I_ncluir tests remotos"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Tabla de idiomas"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Tabla de cabeceras de correo"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Dirección del buzón"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Editor de mensajes"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: No se le pedirá una contraseña hasta que conecte por primera vez"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Reproducir un archivo de _sonido cuando llegue correo nuevo"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13469,7 +13264,7 @@ msgstr ""
 "Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
 "Este nombre se usará sólo para mostrarlo."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13478,7 +13273,7 @@ msgstr ""
 "no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13488,42 +13283,38 @@ msgstr ""
 "«opcionales» no hace falta que los rellene, a menos que quiera incluir esta "
 "información en el correo-e que envíe."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Por favor seleccione entre las siguientes opciones"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al enviar mensajes que tan sólo tengan definido el _Cco"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citar el mensaje original"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Recordar contraseña"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Recordar _contraseña"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "S_eleccionar…"
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_end message receipts:"
-msgstr "_Enviar confirmaciones de mensajes:"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
@@ -13552,51 +13343,55 @@ msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "Enviar confirmaciones de mensajes:"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Tabla de firmas"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: ../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."
@@ -13604,7 +13399,7 @@ msgstr ""
 "La lista de idiomas de aquí refleja únicamente los idiomas para los cuáles "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.glade.h: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"
@@ -13614,7 +13409,7 @@ msgstr ""
 "firma. El nombre que especifique se usará\n"
 "únicamente para mostrarlo por pantalla. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13622,15 +13417,15 @@ msgstr ""
 " Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 " Por ejemplo: «Trabajo» o «Personal»"
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13640,71 +13435,68 @@ msgstr ""
 "\n"
 "Pulse «Adelante» para comenzar. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imágenes desde Internet"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_No notificarme cuando llegue correo nuevo"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr ""
+"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Cargar imágenes en el correo de los contactos"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imágenes desde Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al enviar mensajes con el asunto vacío"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Script:"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "_Mostrar animaciones"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Reducir las cabeceras Para / Cc / Cco a "
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Usar conexión segura:"
@@ -13713,23 +13505,15 @@ msgstr "_Usar conexión segura:"
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "direcciones"
-
 # Esta traducción debe mantenerse así
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr " "
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "descripción"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Orígenes de la carpeta de búsqueda</b>"
@@ -13743,63 +13527,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Cifrado</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Todas las carpetas remotas activas"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Todas las carpetas locales y remotas activas"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Todas las carpetas locales"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "_Discriminar según capitalización"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Terminado"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "_Buscar:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Buscar en el mensaje"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Suscripciones de carpetas"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Acuerdo de licencia"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Ninguno seleccionado"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Información de seguridad"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Carpetas específicas"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13807,158 +13575,192 @@ msgstr ""
 "Los mensajes que ha seleccionado para seguir se listan abajo.\n"
 "Por favor, seleccione una acción de seguimiento desde el menú «Marcar»."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Aceptar licencia"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Vence el:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Subscribe"
+msgstr "_Suscribir"
+
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
+#: ../mail/mail-dialogs.glade.h:24
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "Des_uscribir"
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "sólo carpetas especificadas"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "con todas las carpetas remotas activas"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "con todas las carpetas locales y remotas activas"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "con todas las carpetas locales"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
+msgstr "Falló al aplicar los filtros al correo saliente: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
-"No es posible anexar a %s: %s\n"
-"Se anexará a la carpeta local «Correo enviado» en su lugar."
+"Falló al anexar a %s: %s\n"
+"Anexando a la carpeta local «Correo enviado» en su lugar."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "No es posible anexar a la carpeta local «Correo enviado»: %s"
+msgstr "Falló al anexar a la carpeta local «Correo enviado»: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falló al enviar %d de %d mensajes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Guardando mensaje en la carpeta"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo almacén %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Compactando carpeta"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaje"
 msgstr[1] "Descargando %d mensajes"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"No se pudo crear el archivo de salida: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13967,82 +13769,73 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
-"No es posible crear el archivo de salida: %s:\n"
+"No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
-msgstr "No es posible escribir datos: %s"
+msgstr "No se pudo escribir datos: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Cancelando…"
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Actualizando…"
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Esperando…"
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Introduzca la contraseña para %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Introduzca la contraseña"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "El usuario canceló la operación."
 
@@ -14055,14 +13848,14 @@ msgid "Enter a name for this signature."
 msgstr "Introduzca un nombre para esta firma."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nombre:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "No es posible crear el directorio spool «%s»: %s"
+msgstr "No se pudo crear el directorio spool «%s»: %s"
 
 #: ../mail/mail-tools.c:150
 #, c-format
@@ -14098,17 +13891,19 @@ msgstr "Actualizando carpetas de búsqueda para «%s: %s»"
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando carpetas de búsqueda para «%s»"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Editar carpeta de búsqueda"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Carpeta de búsqueda nueva"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr ""
+"Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
 
 #: ../mail/mail.error.xml.h:2
 msgid ""
@@ -14134,7 +13929,8 @@ msgstr ""
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
-msgstr "Ya existe una firma con el nombre «{0}». Por favor, use un nombre diferente."
+msgstr ""
+"Ya existe una firma con el nombre «{0}». Por favor, use un nombre diferente."
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -14153,8 +13949,10 @@ msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
 #: ../mail/mail.error.xml.h:10
-msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "¿Seguro que quiere desactivar esta esta cuenta y borrar todos sus proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"¿Seguro que quiere desactivar esta esta cuenta y borrar todos sus proxies?"
 
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
@@ -14202,51 +14000,51 @@ msgstr "Firma en blanco"
 
 #: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "No es posible añadir la carpeta de búsqueda «{0}»."
+msgstr "No se puede añadir la carpeta de búsqueda «{0}»."
 
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "No es posible copiar la carpeta: «{0}» a «{1}»."
+msgstr "No se pudo copiar la carpeta: «{0}» a «{1}»."
 
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "No es posible crear la carpeta: «{0}»."
+msgstr "No se pudo crear la carpeta: «{0}»."
 
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
-msgstr "No es posible crear el directorio de guardado temporal."
+msgstr "No se pudo crear el directorio de guardado temporal."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "No es posible crear el directorio de guardado, debido a «{1}»"
+msgstr "No se pudo crear el directorio de guardado, debido a «{1}»"
 
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "No es posible borrar la carpeta «{0}»."
+msgstr "No se puede borrar la carpeta «{0}»."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "No es posible borrar la carpeta de sistema «{0}»."
+msgstr "No se pudo borrar la carpeta de sistema «{0}»."
 
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "No es posible editar la carpeta de búsqueda «{0}» porque no existe."
+msgstr "No se puede editar la carpeta de búsqueda «{0}» porque no existe."
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "No es posible mover la carpeta «{0}» a «{1}»."
+msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
-msgstr "No es posible abrir el origen «{1}»"
+msgstr "No se pudo abrir el origen «{1}»"
 
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
-msgstr "No es posible abrir el origen «{2}»."
+msgstr "No se pudo abrir el origen «{2}»."
 
 #: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
-msgstr "No es posible abrir el destino «{2}»."
+msgstr "No se pudo abrir el destino «{2}»."
 
 #: ../mail/mail.error.xml.h:33
 msgid ""
@@ -14254,33 +14052,33 @@ msgid ""
 "problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
-"No es posible leer el archivo de licencia «{0}», debido a un problema de "
+"No se pudo leer el archivo de licencia «{0}», debido a un problema de "
 "instalación. No será posible usar este proveedor hasta que pueda aceptar "
 "esta licencia."
 
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "No es posible renombrar «{0}» a «{1}»."
+msgstr "No se puede renombrar «{0}» a «{1}»."
 
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "No es posible renombrar o mover la carpeta de sistema «{0}»."
+msgstr "No se pudo renombrar o mover la carpeta de sistema «{0}»."
 
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
-msgstr "No es posible guardar los cambios en la cuenta."
+msgstr "No se puede guardar los cambios en la cuenta."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "No es posible guardar al directorio «{0}»."
+msgstr "No se pudo guardar al directorio «{0}»."
 
 #: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "No es posible guardar al archivo «{0}»."
+msgstr "No se pudo guardar al archivo «{0}»."
 
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "No es posible establecer el script de firma «{0}»."
+msgstr "No se puede establecer el script de firma «{0}»."
 
 #: ../mail/mail.error.xml.h:40
 msgid ""
@@ -14293,7 +14091,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
-msgstr "No es posible guardar el archivo de firma."
+msgstr "No se pudo guardar el archivo de firma."
 
 #: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
@@ -14416,34 +14214,30 @@ msgid "Mark all messages as read"
 msgstr "Marca todos los mensajes como leídos"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Mark all messages in subfolders as read?"
-msgstr "¿Desea marcar todos los mensajes en las aubcarpetas como leídos?"
+msgid "Mark all messages as read in the selected folder"
+msgstr "Marca todos los mensajes como leídos en la carpeta seleccionada"
 
 #: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "Mar_car como leído"
-
-#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningún origen."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiados mensajes a la vez puede llevar mucho tiempo."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Compruebe su configuración de la cuenta e inténtelo otra vez."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Active la cuenta o envíe usando otra cuenta."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14452,7 +14246,7 @@ msgstr ""
 "Puede buscar direcciones de correo pulsando en el botón «Para:» al lado de "
 "la caja de entrada."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14464,57 +14258,57 @@ msgstr ""
 "{0}\n"
 "¿Enviar de todas formas?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduzca un nombre único para identificar esta firma."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Por favor espere."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Consultando al servidor"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Se está consultando al servidor por una lista de mecanismos de autenticación "
 "soportados."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Se solicitó una notificación de lectura."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "¿Seguro que quiere borrar la carpeta «{0}» y todas sus subcarpetas?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Carpetas de búsqueda autoactualizadas."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Enviar confirmación"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "La firma ya existe"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Evolution requiere las carpetas de sistema para funcionar correctamente y no "
-"pueden renombrarse, moverse o borrarse."
+"Ximian Evolution requiere las carpetas de sistema para funcionar "
+"correctamente y no pueden renombrarse, moverse o borrarse."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14530,7 +14324,7 @@ msgstr ""
 "destinatarios en su mensaje. Para evitar esto, debería añadir al menos un "
 "destinatario a Para: o Cc: "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14544,7 +14338,7 @@ msgstr ""
 "   «{1}» \n"
 "y se han actualizado."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14558,11 +14352,11 @@ msgstr ""
 "      «{1}»\n"
 "Y se han actualizado."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "El archivo de script debe existir y ser ejecutable."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14571,7 +14365,7 @@ msgstr ""
 "vaya al editor de carpetas de búsqueda para añadirla explícitamente, si es "
 "necesario."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14579,11 +14373,13 @@ msgstr ""
 "El mensaje no puede enviarse porque la cuenta con la que eligió enviar no "
 "está activada"
 
-#: ../mail/mail.error.xml.h:108
-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:107
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Este mensaje no puede enviarse porque no ha especificado ningún destinatario"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14591,11 +14387,11 @@ msgstr ""
 "Este servidor no soporta este tipo de autenticación requerido y quizá no "
 "soporte ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta firma ha cambiado, pero no ha sido guardada."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14603,51 +14399,51 @@ msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada y sus "
 "subcarpetas."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
-msgstr "No es posible conectarse con el servidor GroupWise."
+msgstr "No se pudo conectar con el servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"No es posible abrir la carpeta de borradores para esta cuenta. ¿Quiere usar "
-"la carpeta de borradores del sistema?"
+"No se pudo abrir la carpeta de borradores para esta cuenta. ¿Quiere usar la "
+"carpeta de borradores del sistema?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
-msgstr "No es posible leer el archivo de licencia."
+msgstr "No se pudo leer el archivo de licencia."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Usar _predeterminada"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "¿Desea usar la carpeta de borradores predeterminada?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nombre a esta carpeta de búsqueda."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14657,98 +14453,94 @@ msgstr ""
 "Hágalo seleccionando las carpetas individualmente, y/o seleccionando todas "
 "las carpetas locales, todas las carpetas remotas, o ambas."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
 #: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "_No marcar como leído"
-
-#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "C_ompactar"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %e %l:%M %p"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%e %b %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2064
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3446
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -14768,15 +14560,15 @@ msgstr "Marcado"
 msgid "Follow Up Flag"
 msgstr "Marca de seguimiento"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Ubicación original"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Recibido"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Mensajes enviados"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Tamaño"
@@ -14797,19 +14589,19 @@ msgstr "Seguimiento"
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:41
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
 #: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
-msgstr "No es necesaria una respuesta"
+msgstr "Respuesta innecesaria"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:79
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Responder a todos"
 
@@ -14843,7 +14635,7 @@ msgstr "El asunto o el remitente contiene"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
-msgstr "Libretas local de direcciones"
+msgstr "Libretas locales de direcciones"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Provides core functionality for local address books."
@@ -14854,8 +14646,8 @@ msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from evolution."
 msgstr ""
-"Un complemento de formato que muestra los adjuntos de sonido en línea y "
-"permite reproducirlos directamente desde evolution."
+"Un complemento formateador que muestra los adjuntos de sonido en línea y "
+"permite reproducirlos directamente desde Evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -14899,7 +14691,8 @@ msgstr ""
 "Un complemento para respaldar y restaurar los datos de Evolution y la "
 "configuración."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
 msgstr "Complemento para respaldar y restaurar"
 
@@ -14922,14 +14715,15 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid "_Automatically create entries in the addressbook when responding to mail"
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones cuando se "
 "responda al correo"
 
 #: ../plugins/bbdb/bbdb.c:460
 msgid "Select Address book for Automatic Contacts"
-msgstr "Seleccione la libreta para contactos automáticos"
+msgstr "Seleccione la libreta de Contactos Automáticos"
 
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
@@ -14937,19 +14731,20 @@ msgstr "Contactos de mensajería instantánea"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid "Periodically synchronize contact information and images from gaim buddy list"
+msgid ""
+"Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
 "Sincronizar periódicamente la información de contacto y las imágenes desde "
 "la lista de amigos de Gaim"
 
 #: ../plugins/bbdb/bbdb.c:496
 msgid "Select Address book for Gaim buddy list"
-msgstr "Seleccione la libreta para la lista de contactos de Gaim"
+msgstr "Seleccione la libreta para los contactos de Gaim"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
-msgstr "Sincronizar con la lista de _contactos de MI ahora"
+msgstr "Sincronizar con la lista de _compañeros ahora"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
@@ -14957,7 +14752,7 @@ msgid ""
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"Rellena automáticamente su libreta de contactos con los nombres y "
+"Rellena automáticamente su libreta de direcciones con los nombres y "
 "direcciones de correo-e cuando contesta a los correos. También rellena la "
 "información de contacto de MI de su lista de amigos."
 
@@ -15054,6 +14849,10 @@ msgstr ""
 "Un complemento de prueba que demuestra un menú emergente que le permite "
 "copiar cosas al portapapeles."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Copiar dirección de _correo-e"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Herramienta de copia"
@@ -15063,14 +14862,16 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Comprobar si Evolution es la aplicación de correo predeterminada"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
 "predeterminado."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Comprueba si Evolution es el cliente de correo predeterminado al iniciar."
+msgstr ""
+"Comprueba si Evolution es el cliente de correo predeterminado al iniciar."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -15136,7 +14937,7 @@ msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
-"Esta opción conectará con el servidor Exchange usando autenticación con  "
+"Esta opción conectará con el servidor Exchange usando autenticación con "
 "contraseña estándar de texto simple."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
@@ -15167,9 +14968,9 @@ msgid "Change the password for Exchange account"
 msgstr "Cambia la contraseña para la cuenta de Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
-msgstr "Cambia la contraseña"
+msgstr "Cambiar contraseña"
 
 #. Delegation Assistant
 #: ../plugins/exchange-operations/exchange-account-setup.c:335
@@ -15242,31 +15043,29 @@ msgstr ""
 "Las dos contraseñas no coinciden. Por favor, vuelva a introducir las "
 "contraseñas."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "Confirme la contraseña:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "Contraseña actual:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "Contraseña nueva:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr "Su contraseña actual ha caducado. Cambie su contraseña ahora."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Su contraseña caducará en los siguientes %d días"
 
-#. 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
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -15292,30 +15091,30 @@ msgstr "¿Desea quitar el delegado %s?"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:680
 msgid "Could not access Active Directory"
-msgstr "No es posible acceder al Active Directory"
+msgstr "No se pudo acceder al Active Directory"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:692
 msgid "Could not find self in Active Directory"
-msgstr "No es posible encontrar a sí mismo en el Active Directory"
+msgstr "No se pudo encontrar a sí mismo en el Active Directory"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "No es posible encontrar al delegado %s en el Active Directory"
+msgstr "No se pudo encontrar al delegado %s en el Active Directory"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
-msgstr "No es posible quitar al delegado %s"
+msgstr "No se pudo quitar al delegado %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
-msgstr "No es posible actualizar la lista de delegados."
+msgstr "No se pudo actualizar la lista de delegados."
 
 #: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
 msgid "Could not add delegate %s"
-msgstr "No es posible añadir el delegado %s"
+msgstr "No se pudo añadir el delegado %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:963
 msgid "Error reading delegates list."
@@ -15386,7 +15185,7 @@ msgstr "Nombre de la carpeta"
 msgid "Folder Size"
 msgstr "Tamaño de la carpeta"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
 #: ../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"
@@ -15401,14 +15200,14 @@ msgstr "Árbol de carpetas de Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Desuscribirse de la carpeta…"
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "¿Seguro que desea desuscribirse de la carpeta «%s»?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Desuscribirse de «%s»"
@@ -15441,66 +15240,62 @@ msgstr "Añadir usuario:"
 msgid "Add User"
 msgstr "Añadir usuario"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Permisos</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
-msgstr "No es posible borrar"
+msgstr "No se puede borrar"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
-msgstr "No es posible editar"
+msgstr "No se puede editar"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Crear elementos"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Crear subcarpetas"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Delegar cualquier elemento"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Borrar los elementos propios"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Editar cualquier elemento"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Editar los elementos propios"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Contacto de la carpeta"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Dueño de la carpeta"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Visibilidad de la carpeta"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Leer elementos"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Rol: "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "No, no cambiar el estado"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 msgid "Select User"
 msgstr "Seleccionar usuario"
@@ -15531,91 +15326,87 @@ 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 se puede 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."
-msgstr "No es posiblen mostrar carpetas."
+msgstr "No se pueden mostrar carpetas."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "No es posible efectuar la operación."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Los cambios a las opciones de la cuenta Exchange «{0}» sólo tendrán lugar "
-"después de reiniciar Evolution."
+"Los cambios a la configuración de la cuenta Exchange tendrán lugar después "
+"de salir y reiniciar Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
-msgstr "No es posible autenticar con el servidor."
+msgstr "No se pudo autenticar con el servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
-msgstr "No es posible cambiar la contraseña."
+msgstr "No se pudo cambiar la contraseña."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
-"No es posible configurar la cuenta de Exchange porque \n"
+"No se puede configurar la cuenta de Exchange porque \n"
 "ocurrió un error desconocido. Compruebe el URL,\n"
 "usuario y contraseña e inténtelo otra vez."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
-msgstr "No es posible conectar con el servidor Exchange."
+msgstr "No se pudo conectar con el servidor Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
-msgstr "No es posible conectar con el servidor {0}."
+msgstr "No se pudo conectar con el servidor {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "No se pudieron determinar los permisos de la carpeta para delegados."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
-msgstr "No es posible encontrar el sistema de almacenamiento Web de Exchange."
+msgstr "No se pudo encontrar el sistema de almacenamiento Web de Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
-msgstr "No es posible localizar el servidor {0}."
+msgstr "No se pudo localizar el servidor {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
-msgstr "No es posible hacer de {0} un delegado"
+msgstr "No se pudo hacer de {0} un delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "No se pudieron leer los permisos de la carpeta"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "No se pudieron leer los permisos de la carpeta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
-msgstr "No es posible leer el estado de disponibilidad"
+msgstr "No se pudo leer el estado de disponibilidad"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
-msgstr "No es posible actualizar los permisos de la carpeta."
+msgstr "No se pudo actualizar los permisos de la carpeta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
-msgstr "No es posible actualizar el estado de disponibilidad"
+msgstr "No se pudo actualizar el estado de disponibilidad"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "La cuenta de Exchange está desconectada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15642,32 +15433,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Falló al actualizar delegados:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "La carpeta ya existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "La carpeta no existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Carpeta desconectada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "Error genérico"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Global Catalog Server is not reachable"
-msgstr "No es posible llegar al Servidor de Catálogo Global"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15675,69 +15462,66 @@ msgstr ""
 "Si OWA se está ejecutando en una ruta diferente, debe especificarla en el "
 "diálogo de configuración de cuenta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "El buzón de {0} no está en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Asegúrese de que la URL es correcta e intente de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Asegúrese de que el nombre del servidor esté escrito correctamente e "
 "inténtelo de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
-msgstr "Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
+msgstr ""
+"Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "No hay un servidor de Catálogo Global configurado para esta cuenta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "No hay buzón para el usuario {0} en {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "No existe ese usuario {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Contraseña cambiada con éxito."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Sever name is correct."
-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:51
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Por favor, reinicie Evolution para que los cambios tengan efecto"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Por favor, reinicie Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Seleccione un usuario."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "El servidor rechazó la contraseña porque es demasiado débil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "La cuenta de Exchange se desactivará cuando salga de Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "La cuenta de Exchange se eliminará cuando salga de Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "El servidor Exchange no es compatible con Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15745,7 +15529,7 @@ msgstr ""
 "El servidor está funcionando con Exchange 5.5. Exchange Connector\n"
 "sólo soporta Microsoft Exchange 2000 y 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15759,51 +15543,52 @@ msgstr ""
 "\n"
 "O quizá tan sólo ha escrito mal la contraseña."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Inténtelo con una contraseña diferente."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
-msgstr "No  puede añadirse el usuario a la lista de control de acceso:"
+msgstr "No se pudo añadir el usuario a la lista de control de acceso:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
-msgstr "Imposible editar delegados."
+msgstr "No de pudieron editar los delegados."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Error desconocido al buscar {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Tipo desconocido"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Operación no soportada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr "Está cerca de su cuota disponible para almacenar correo en este servidor."
+msgstr ""
+"Está cerca de su cuota disponible para almacenar correo en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "No puede hacerse así mismo su propio delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Ha excedido su cuota para almacenar correo en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Sólo puede configurar una sola cuenta de Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15811,13 +15596,13 @@ msgstr ""
 "Su uso actual es: {0} Kib. Intente hacer algo de espacio borrando algunos "
 "mensajes."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "Su uso actual es: {0} Kib. No podrá ni enviar ni recibir correo ahora."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15825,25 +15610,25 @@ msgstr ""
 "Su uso actual es: {0} Kib. No podrá enviar correo hasta que haga algo de "
 "espacio borrando algunos mensajes."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Su contraseña ha caducado."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
-msgstr "{0} no  puede añadirse a la lista de control de acceso"
+msgstr "{0} no se puede añadir a la lista de control de acceso"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} ya es un delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} ya está en la lista"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr "Subscribirse a las  tareas de otros usuarios"
+msgstr "Subscribirse a las tareas de otros usuarios"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
@@ -15864,17 +15649,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Desuscribirse de carpetas"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "Des_uscribir"
-
-#: ../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
-msgid "Notes"
-msgstr "Notas"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
@@ -15919,21 +15694,13 @@ msgstr "_Activar"
 msgid "_Junk List"
 msgstr "Lista de _spam"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
-msgid "Message retracted successfully"
-msgstr "Mensaje retractado con éxito"
-
-#: ../plugins/groupwise-features/mail-retract.c:60
-msgid "Retract Mail"
-msgstr "Retractar correo"
-
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Añadir opciones de envío a los mensajes de Groupwise"
 
 #: ../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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Opciones de envío"
 
@@ -15949,40 +15716,40 @@ msgstr "Características Groupwise"
 msgid "Accept Tentatively"
 msgstr "Aceptar provisionalmente"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>Usuarios:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Notificación de carpeta compartida"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Los participantes recibirán la notificación siguiente.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Contactos…"
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_Personalizar el mensaje de notificación"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Sin compartir"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Compartir con…"
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Compartir"
 
@@ -16023,7 +15790,7 @@ msgid "Subscribe to my _notifications"
 msgstr "Suscribirse a _mis notificaciones"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Leído"
 
@@ -16060,11 +15827,13 @@ msgstr "Sesión _proxy…"
 
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
+msgstr ""
+"La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
+msgstr ""
+"La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
@@ -16115,7 +15884,7 @@ msgid "Select Calendar"
 msgstr "Seleccione el calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importar"
 
@@ -16158,15 +15927,16 @@ msgstr "Falló la exportación de los datos."
 
 #: ../plugins/ipod-sync/sync.c:231
 msgid "Could not open addressbook!"
-msgstr "No es posible abrir la libreta de direcciones"
+msgstr "No se pudo abrir la libreta de direcciones"
 
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
-msgstr "No se puedo abrir la libreta de direcciones de Evolution para exportar datos."
+msgstr ""
+"No se puedo abrir la libreta de direcciones de Evolution para exportar datos."
 
 #: ../plugins/ipod-sync/sync.c:291
 msgid "Could not open calendar/todo!"
-msgstr "No es posible abrir el calendario/tareas"
+msgstr "No se pudo abrir el calendario/tareas"
 
 #: ../plugins/ipod-sync/sync.c:292
 msgid "Could not open the Evolution calendar/todo list to export data."
@@ -16175,103 +15945,103 @@ msgstr ""
 "datos."
 
 #: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
-msgstr "No es posible cargar el calendario «%s»"
+msgstr "Falló al cargar el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Una cita en el calendario «%s» entra en conflicto con esta reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Se encontró la cita en el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:494
 msgid "Unable to find any calendars"
-msgstr "No es posible encontrar ningún calendario"
+msgstr "No se pudo encontrar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:501
 msgid "Unable to find this meeting in any calendar"
-msgstr "No es posible encontrar esta reunión en ningún calendario"
+msgstr "No se pudo encontrar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:505
 msgid "Unable to find this task in any task list"
-msgstr "No es posible encontrar esta tarea en ninguna lista de tareas"
+msgstr "No se pudo encontrar esta tarea en ninguna lista de tareas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:509
 msgid "Unable to find this journal entry in any journal"
-msgstr "No es posible encontrar esta entrada del diario en ningún diario"
+msgstr "No se pudo encontrar esta entrada del diario en ningún diario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:582
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Unable to parse item"
-msgstr "No es posible interpretar el elemento"
+msgstr "No se pudo interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:833
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "No es posible enviar el elemento al calendario «%s»: %s"
+msgstr "No se pudo enviar el elemento al calendario «%s»: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:844
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:848
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:853
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario «%s» como declinado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:858
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:951
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:958
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:960
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "No es posible enviar una notificación de cancelación al delegado"
+msgstr "No se pudo enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1045
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
-"El estado de asistencia no pudo actualizarse debido a que el estado es "
+"El estado de asistencia no se pudo actualizar debido a que el estado es "
 "inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr "No es posible actualizar la asistencia. %s"
+msgstr "No se pudo actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1076
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1203
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1204
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16279,15 +16049,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1239
+#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1330
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16295,11 +16065,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningún "
 "acontecimiento, tarea o información de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1265
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16309,269 +16079,272 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:2061
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Hoy"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Hoy a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "Hoy a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:202
 msgid "Today %l:%M:%S %p"
 msgstr "Hoy a las %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Mañana"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Mañana a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañana a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañana a las %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañana a las %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A, %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 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:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y a las %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e de %B de %Y, %l:%M %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> ha publicado información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ha publicado la siguiente información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ha delegado la reunión siguiente en usted:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
+msgstr ""
+"<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita su presencia en la siguiente reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desea apuntarse a una reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desea apuntarse a una reunión existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> desea recibir la última información de la reunión siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> a través de %s ha cancelado la siguiente reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ha cancelado la reunión siguiente."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ha propuesto los cambios siguientes para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ha declinado los siguientes cambios para la reunión a través de %s:"
+msgstr ""
+"<b>%s</b> ha declinado los siguientes cambios para la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ha declinado los cambios siguientes para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ha publicado la siguiente tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ha publicado la tarea siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> solicita la asignación de %s para la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> a través de %s le ha asignado una tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> le ha asignado a usted una tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> a través de %s desea añadirse a una tarea existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> desea añadirse a una tarea existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -16580,152 +16353,116 @@ msgstr ""
 "<b>%s</b> quiere recibir la última información para la siguiente tarea "
 "asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> a través de %s ha cancelado la siguiente asignación de tarea:"
+msgstr ""
+"<b>%s</b> a través de %s ha cancelado la siguiente asignación de tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ha cancelado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
+msgstr ""
+"<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> a través de %s ha declinado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ha declinado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> ha publicado la siguiente nota a través de %s:"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> ha publicado la nota siguiente:"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> desea añadir algo a una nota existente a través de %s:"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> desea añadir algo a una nota existente:"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> a través de %s ha cancelado la siguiente nota compartida:"
-
-#: ../plugins/itip-formatter/itip-view.c:497
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> ha cancelado la siguiente nota compartida:"
-
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "_Declinar"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "_Declinar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "_Declinar"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "_Actualizar el estado del participante"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "_Actualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:890
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:899
 msgid "End time:"
 msgstr "Hora de fin:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:915
+#: ../plugins/itip-formatter/itip-view.c:965
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:979
 msgid "Send u_pdates to attendees"
 msgstr "Mandar _actualizaciones a los participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:988
 msgid "A_pply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "_Tareas:"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-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."
@@ -16737,9 +16474,9 @@ msgstr "Formateador iTip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
-"&quot;{0}&quot; ha delegado la reunión. ¿Quiere añadir al delegado &quot;{1}"
+"&quot;{0}&quot; ha delegado la reunión. Quiere añadir al delegado &quot;{1}"
 "&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16747,7 +16484,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
@@ -16781,7 +16519,8 @@ msgid "No store available"
 msgstr "No hay almacén disponible"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Un complemento que implementa un interfaz Corba para acceder a los datos de "
 "correo de forma remota."
@@ -16828,14 +16567,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Convierte el mensaje seleccionado en una tarea nueva"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "_Responsable de la lista de contactos"
 
 #: ../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 "Obtener _archivador de la lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Obtener información de _uso de la lista"
 
@@ -16857,14 +16599,17 @@ msgstr ""
 "desuscribirse, …)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Publicar un mensaje a la lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Suscribirse a la lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "Des_uscribirse de la lista"
 
@@ -16918,7 +16663,7 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"La acción no pudo realizarse . Esto significa que la cabecera para esta "
+"La acción no se pudo realizar. Esto significa que la cabecera para esta "
 "acción no contenía ninguna acción que pudiésemos tratar.\n"
 "\n"
 "Cabecera: {0}"
@@ -16938,7 +16683,7 @@ msgid ""
 "This message does not contain the header information required for this "
 "action."
 msgstr ""
-"Este mensaje no  contiene la información de cabecera requerida para esta "
+"Este mensaje no contiene la información de cabecera requerida para esta "
 "acción."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -16949,10 +16694,6 @@ msgstr "_Editar mensaje"
 msgid "_Send message"
 msgstr "_Enviar mensaje"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "_Responsable de la lista de contactos"
-
 #: ../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 ""
@@ -16960,24 +16701,18 @@ msgstr ""
 "mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Obtener _archivador de la lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Obtener información de _uso de la lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Obtener un archivador de la lista a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
+msgstr ""
+"Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
+msgstr ""
+"Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
@@ -16987,24 +16722,12 @@ msgstr "Suscribirse a la lista de correo a la que pertenece este mensaje"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Desuscribirse de la lista de correo a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Publicar un mensaje a la lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Suscribirse a la lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "_Desuscribirse de la lista"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Marca todo como leído"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Marcar los mensajes como _leídos"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -17129,7 +16852,7 @@ msgstr "Da una opción para imprimir el correo desde el editor"
 
 #: ../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:75 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Vista preliminar de impresión"
@@ -17256,7 +16979,8 @@ msgstr ""
 "Un complemento para guardar todos los adjuntos o partes de un mensaje a la "
 "vez."
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
 msgid "Save attachments"
 msgstr "Guarda los adjuntos"
 
@@ -17272,13 +16996,12 @@ msgstr "Guarda todos los adjuntos"
 msgid "Select save base name"
 msgstr "Seleccione el nombre base para guardar"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:360
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../plugins/save-attachments/save-attachments.c:368
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Guardar"
 
@@ -17388,7 +17111,7 @@ msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Seleccione el archivo de destino"
 
@@ -17437,19 +17160,19 @@ msgstr ""
 "\n"
 "Por favor pulse el botón «Adelante» para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione la información que quiera importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importando datos."
 
@@ -17490,7 +17213,8 @@ msgstr "Componente de Prueba de Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr "Una descripción de impresora GNOME de la configuración actual de impresora"
+msgstr ""
+"Una descripción de impresora Gnome de la configuración actual de impresora"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
@@ -17521,7 +17245,8 @@ msgid "Last upgraded configuration version"
 msgstr "Última versión de la configuración actualizada"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de rutas a las carpetas que se sincronizarán al disco para usar "
 "desconectado"
@@ -17538,15 +17263,11 @@ msgstr "La barra lateral es visible"
 msgid "Skip development warning dialog"
 msgstr "Saltar el diálogo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "La barra de estado es visible"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17554,19 +17275,19 @@ msgstr ""
 "La versión de configuración de Evolution, con nivel de configuración mayor/"
 "menor (por ejemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada de la ventana principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "La anchura predeterminada de la ventana principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "La anchura predeterminada para la barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17574,57 +17295,54 @@ msgstr ""
 "La última versión de configuración de Evolution actualizada, con nivel de "
 "configuración mayor/menor (por ejemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
 "El estilo de los botones de la ventana. Puede ser \"text\", \"icons\", \"both"
-"\", \"toolbar\". Si  se selecciona \"toolbar\", el estilo de los botones se "
-"determina por la configuración de la barra de herramientas de GNOME."
+"\", \"toolbar\". Si se selecciona \"toolbar\", el estilo de los botones se "
+"determina por la configuración de la barra de herramientas de Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "La barra de herramientas es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica si Evolution se iniciará en modo desconectado en vez de en modo "
 "conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Indica si la ventana deberían o no maximizarse."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Indica si la barra lateral debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Indica si la barra de estado debería ser visible."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Indica si la barra de herramientas debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica si se omite el diálogo de advertencia en las versiones de desarrollo "
 "de Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Indica si la los botones de la ventana deberían ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Estilo de los botones de ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
@@ -17645,11 +17363,11 @@ msgstr "Pulse «Aceptar» para cerrar estas conexiones y desconectarse"
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17662,11 +17380,11 @@ msgstr ""
 "\n"
 "Si no lo sabe, puede elegir «Automático» y Evolution tratará de encargarse."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importación"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17678,23 +17396,23 @@ msgstr ""
 "configuración que se pueda importar. Si quiere intentarlo de nuevo, pulse\n"
 "el botón «Atrás».\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nombre del _archivo:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas _antiguos"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importar un _único archivo"
 
@@ -17708,7 +17426,8 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: ../shell/e-shell-utils.c:125
 msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr ""
+"El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: ../shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
@@ -17724,7 +17443,8 @@ msgstr "'.' y '..' son nombres reservados de carpetas."
 
 #: ../shell/e-shell-window-commands.c:71
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: ../shell/e-shell-window-commands.c:79
 #, c-format
@@ -17737,7 +17457,7 @@ msgstr "Bug Buddy no está instalado."
 
 #: ../shell/e-shell-window-commands.c:136
 msgid "Bug buddy could not be run."
-msgstr "No es posible ejecutar Bug Buddy."
+msgstr "No se ha podido ejecutar Bug Buddy."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
@@ -17750,7 +17470,7 @@ msgstr "Francisco Javier F. Serrador"
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
@@ -17794,21 +17514,16 @@ msgstr "Argumentos inválidos"
 
 #: ../shell/e-shell.c:1266
 msgid "Cannot register on OAF"
-msgstr "No es posible registrar en OAF"
+msgstr "No se pudo registrar en OAF"
 
 #: ../shell/e-shell.c:1268
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Nuevo"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Nuevo "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Prueba nueva"
@@ -17860,7 +17575,7 @@ msgstr ""
 "importación de archivos externos dentro de Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17896,7 +17611,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribución.\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17904,39 +17619,35 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "No preguntarme más veces"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la reemigración desde Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Envía la salida de depuración de todos los componentes a un archivo."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Desactiva la carga de cualquier complemento."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- El cliente de correo-e y GIP Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18139,7 +17850,7 @@ msgstr "Número de serie"
 
 #: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
-msgstr "Caduca"
+msgstr "Caducidad"
 
 #: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
@@ -18158,7 +17869,7 @@ msgstr "Introduzca la contraseña para «%s»"
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
-msgstr "Introduzca una contraseña nueva para  la base de datos de certificados"
+msgstr "Introduzca una contraseña nueva para la base de datos de certificados"
 
 #: ../smime/gui/component.c:72
 msgid "Enter new password"
@@ -18172,7 +17883,7 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 "Emitido a:\n"
-"  Asunto: %s\n"
+"   Asunto: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:122
 #, c-format
@@ -18181,7 +17892,7 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 "Emitido por:\n"
-"  Asunto: %s\n"
+"     Asunto: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
@@ -18352,7 +18063,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:"
@@ -18458,7 +18170,7 @@ msgstr "Clave pública del propósito"
 
 #: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
-msgstr "Erro: No es posible procesar la extensión"
+msgstr "Erro: No se pudo procesar la extensión"
 
 #: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
@@ -18579,7 +18291,7 @@ msgstr "Asunto predeterminado para el mensaje."
 #: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
-msgstr "No es posible ejecutar: «%s»: %s\n"
+msgstr "No se pudo ejecutar: «%s»: %s\n"
 
 #: ../tools/killev.c:76
 #, c-format
@@ -18596,7 +18308,7 @@ msgstr "Cambia las propiedades de la carpeta seleccionada"
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "Co_piar todos los contactos a..."
+msgstr "Co_piar todos los contactos a…"
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
@@ -18656,7 +18368,7 @@ msgstr "Reenviar contacto"
 
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
-msgstr "Mo_ver todos los contactos a..."
+msgstr "Mo_ver todos los contactos a…"
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
@@ -18704,12 +18416,12 @@ msgstr "Guarda los contactos seleccionados en una VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Guarda los contactos de la carpeta seleccionada como VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Seleccionar todo"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _todo"
@@ -18751,13 +18463,13 @@ msgid "View the current contact"
 msgstr "Ver el contacto actual"
 
 #: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-list.xml.h:29 ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "A_cciones"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "_Copiar contacto a..."
+msgstr "_Copiar contacto a…"
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
@@ -18773,13 +18485,13 @@ msgstr "_Reenviar contacto…"
 
 #: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
-msgstr "_Mover contacto a..."
+msgstr "_Mover contacto a…"
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
 msgstr "_Mover contactos de la carpeta a"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:44
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Nuevo"
 
@@ -18839,8 +18551,7 @@ msgstr "Lista"
 msgid "Month"
 msgstr "Mes"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:57
-#: ../widgets/misc/e-calendar.c:201
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Siguiente"
 
@@ -18848,8 +18559,8 @@ msgstr "Siguiente"
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza el calendario a imprimir"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:73
-#: ../widgets/misc/e-calendar.c:177
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Anterior"
 
@@ -18937,11 +18648,11 @@ msgstr "Corta la selección al portapapeles"
 msgid "Paste from clipboard"
 msgstr "Pega del portapapeles"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Pega texto desde el portapapeles"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
@@ -18965,36 +18676,40 @@ msgstr "Pulse aquí para guardar la vista actual"
 msgid "Click here to view help available"
 msgstr "Pulse aquí para ver la ayuda 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-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:2
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:6
-msgid "I_nsert"
-msgstr "_Insertar"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:14
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:41
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
-msgstr "Ay_uda"
+msgstr "A_yuda"
+
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Insertar"
 
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
@@ -19093,11 +18808,6 @@ msgstr "Se activa cuando se deben mostrar la hora como ocupada"
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorías"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19157,86 +18867,63 @@ msgstr "Crea o edita reglas para el filtrado de mensajes nuevos"
 msgid "Empty _Trash"
 msgstr "_Vaciar papelera"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Carpeta"
 
 #: ../ui/evolution-mail-global.xml.h:9
-msgid "Message _List As"
-msgstr "La lista del _mensaje como"
+msgid "Message _Preview"
+msgstr "Vista _previa del mensaje"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Mueve la carpeta seleccionada a otra carpeta"
 
-#: ../ui/evolution-mail-global.xml.h:11
+#. 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:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "_Carpetas de búsqueda"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Mostrar vista _previa del mensaje"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Muestra la vista previa del mensaje bajo la lista de mensajes"
-
-#: ../ui/evolution-mail-global.xml.h:15
-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"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Muestra una ventana de vista previa de mensajes"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "Vista _clásica"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Copiar carpeta a…"
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "_Filtros de mensajes"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Mover carpeta a…"
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_New Search _Folder (FIXME)"
-msgstr "Carpeta de _búsqueda nueva"
-
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Nueva…"
 
-#: ../ui/evolution-mail-global.xml.h:24
-msgid "_Preview"
-msgstr "_Vista previa"
-
-#: ../ui/evolution-mail-global.xml.h:25
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Suscripciones"
 
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Vertical View"
-msgstr "Vista _vertical"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
-msgstr "Cambia el nombre de esta carpeta"
+msgstr "Cambiar el nombre de esta carpeta"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
@@ -19254,93 +18941,96 @@ msgstr "Contrae todas las conversaciones"
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copiar mensaje(s) seleccionado(s) al portapapeles"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Corta el(los) mensaje(s) seleccionado(s) al portapapeles"
 
-#: ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas las conversaciones"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "C_ompactar"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
 msgstr "Expandir todas las conversaciones"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
 msgstr "Ocultar mensajes s_eleccionados"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _leídos"
 
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
-
 #: ../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"
+
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar _todos los mensajes como leídos"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr "Pegar mensaje(s) desde el portapapeles"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove this folder"
 msgstr "Elimina permanentemente esta carpeta"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select Message _Thread"
 msgstr "Seleccionar con_versación del mensaje"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Select _All Messages"
 msgstr "Seleccionar _todos los mensajes"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Selecciona todos los mensajes que no están seleccionados actualmente"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Selecciona todos los mensajes en la misma conversación que el mensaje "
 "seleccionado"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
 msgstr "Selecciona todos los mensajes visibles"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Sh_ow Hidden Messages"
 msgstr "_Mostrar mensajes ocultos"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
 msgstr "Muestra los mensajes que han estado ocultos temporalmente"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Oculta temporalmente todos los mensajes que han sido leídos"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
 msgstr "Oculta temporalmente los mensajes seleccionados"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Threaded Message list"
 msgstr "Lista de mensajes por conversaciones"
 
@@ -19348,7 +19038,7 @@ msgstr "Lista de mensajes por conversaciones"
 msgid "_Group By Threads"
 msgstr "A_grupar por conversaciones"
 
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensaje"
@@ -19362,438 +19052,435 @@ msgstr "_Añadir remitente a la libreta"
 msgid "A_pply Filters"
 msgstr "Aplicar _filtros"
 
-#: ../ui/evolution-mail-message.xml.h:3
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
-msgstr "Añade el remitente a la libreta de direcciones"
+msgstr "Añadir remitente a la libreta de direcciones"
 
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
 msgstr "_Todas las cabeceras del mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
 msgstr "Detectar _spam"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
 msgstr "Redactar un mensaje _nuevo"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Responde a todos los destinatarios del mensaje seleccionado"
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to the clipboard"
 msgstr "Copiar los mensajes seleccionados al portapapeles"
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Crear _regla"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "Crea una carpeta de búsqueda para estos destinatarios"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "Crea una carpeta de búsqueda para esta lista de correo"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "Crea una carpeta de búsqueda para este remitente"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "Crea una carpeta de búsqueda para este asunto"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
 msgstr "Corta los mensajes seleccionados al portapapeles"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Reduce el tamaño del texto"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Muestra el mensaje siguiente importante"
 
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Muestra el mensaje siguiente"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
 msgstr "Muestra la siguiente conversación"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "Muestra el siguiente mensaje no leído"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Muestra el anterior mensaje importante"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Muestra el mensaje anterior"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Muestra el anterior mensaje no leído"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
 msgstr "Reenviar _como…"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtro según la _lista de correo…"
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtro según el _remitente…"
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtro según los _destinatarios…"
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtro según el _asunto…"
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "Filtra los mensajes seleccionados por el estado de spam"
+msgstr "Filtrar los mensajes seleccionados por el estado de spam"
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
 msgstr "Marca los mensajes seleccionados para seguimiento"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Se_guimiento…"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
-msgstr "Fuerza la carga de imágenes en el correo HTML"
+msgstr "Forzar la carga de imágenes en el correo HTML"
 
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenvía el mensaje seleccionado en el cuerpo de un mensaje nuevo"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenvía el mensaje seleccionado citado como una respuesta"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Reenvía a alguien el mensaje seleccionado"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenvía a alguien el mensaje seleccionado como un adjunto"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Incrementar el tamaño del texto"
 
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
 msgstr "Mar_car como"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages as having been read"
 msgstr "Marca los mensajes seleccionados como leídos"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages as important"
 msgstr "Marca los mensajes seleccionados como importantes"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages as junk"
 msgstr "Marca los mensajes seleccionados como spam"
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected messages as not being junk"
 msgstr "Marca los mensajes seleccionados como no spam"
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
 msgstr "Marca los mensajes seleccionados como no leídos"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages as unimportant"
 msgstr "Marca los mensajes seleccionados como no importantes"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Marca los mensajes seleccionados para borrar"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
 msgstr "Mueve los mensajes seleccionados a otra carpeta"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "Mensaje siguiente _importante"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "_Conversación siguiente"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Mensaje siguiente _no leído"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr "No es spam"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "Abre una ventana para escribir un mensaje de correo"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
 msgstr "Abre los mensajes seleccionados en una ventana nueva"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abre los mensajes seleccionados en el editor para editarlo"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "Mensaje ante_rior no leído"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
 msgstr "Pega los mensajes desde el portapapeles"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
 msgstr "_Publicar un mensaje nuevo en la carpeta"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "Publicar una _respuesta"
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "Publica un mensaje en una carpeta pública"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr "Publica una respuesta a un mensaje en una carpeta pública"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Mensaje an_terior importante"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "Vista previa del mensaje que va a imprimirse"
 
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "Imprime este mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
 
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Restablecer el texto a su tamaño original"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the selected messages as a text file"
 msgstr "Guarda los mensajes como un archivo de texto"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "Carpeta de búsqueda según la _lista de correo…"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "Carpeta de búsqueda según los destinatarios…"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "Carpeta de búsqueda según el a_sunto…"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "Carpeta de búsqueda según el remite_nte…"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Busca un texto en el cuerpo del mensaje mostrado"
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "Seleccionar _todo el texto"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "Selecciona todo el texto de un mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "Establecer la configuración de la página para la impresora actual"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../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"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages in the normal style"
 msgstr "Muestra los mensajes en el estilo normal"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Muestra los mensajes con todas las cabeceras de correo-e"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "Muestra mensaje de correo-e en bruto"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Undelete the selected messages"
 msgstr "Recupera los mensajes seleccionados"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "_No importante"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr "Activar _cursor"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Clear Flag"
 msgstr "_Quitar marca"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
 msgstr "_Borrar el mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
 msgstr "B_uscar en el mensaje…"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Flag Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Incluido en línea"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
 msgstr "_Spam"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
 msgstr "Cargar _imágenes"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Message Source"
 msgstr "Mensaje en _bruto"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
 msgstr "_No es spam"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "Mensaje a_nterior"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Guardar mensaje…"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Recuperar mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_No leído"
 
-#: ../ui/evolution-mail-message.xml.h:130
-msgid "_Zoom"
-msgstr "_Ampliar"
-
 #: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom In"
 msgstr "_Ampliar"
@@ -19802,7 +19489,7 @@ msgstr "_Ampliar"
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
@@ -19842,8 +19529,13 @@ msgstr "_Abrir nota"
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
+#.
+#. <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:3
+#: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
@@ -19860,7 +19552,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encriptar este mensaje con su certificado de encriptación S/MIME"
 
 #: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr "_Formato"
 
@@ -19872,6 +19564,11 @@ msgstr "Obtener notificación de entrega cuando su mensaje sea leído"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Insertar"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Abrir un archivo"
@@ -19921,7 +19618,6 @@ msgid "Save in folder..."
 msgstr "Guardar en carpeta…"
 
 #: ../ui/evolution-message-composer.xml.h:26
-#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
@@ -19938,7 +19634,7 @@ msgid "Send"
 msgstr "Enviar"
 
 #: ../ui/evolution-message-composer.xml.h:30
-#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "Enviar el correo en formato HTML"
 
@@ -20026,19 +19722,22 @@ msgstr "Campo «_Para»"
 msgid "C_lose"
 msgstr "_Cerrar"
 
-#: ../ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:17
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
-#: ../ui/evolution-signature-editor.xml.h:9
+#.
+#. <menuitem name="FileSave" verb="" _label="_Save"/>
+#.
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save and _Close"
 msgstr "Guardar y _cerrar"
 
-#: ../ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
 msgstr "Guardar el archivo y cerrar la ventana de diálogo"
 
@@ -20148,11 +19847,11 @@ msgstr "Acerca de Evolution…"
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
-msgstr "Cambia la configuración de Evolution"
+msgstr "Cambiar la configuración de Evolution"
 
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
-msgstr "Cambia la visibilidad de la barra de herramientas"
+msgstr "Cambiar las visibilidad de la barra de herramientas"
 
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
@@ -20177,146 +19876,142 @@ msgid "Display window buttons with text only"
 msgstr "Mostrar los botones de la ventana sólo con texto"
 
 #: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Preguntas _frecuentes sobre Evolution"
-
-#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Olvida las contraseñas almacenadas así que se le preguntarán de nuevo"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
 msgid "Hide window buttons"
 msgstr "Ocultar los botones de la ventana"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:13
 msgid "I_mport..."
 msgstr "_Importar…"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
 msgstr "Iconos _y texto"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
 #: ../ui/evolution.xml.h:17
-msgid "La_yout"
-msgstr "_Distribución"
-
-#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "Prefere_ncias"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Enviar / _Recibir"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Envía el correo en la cola y obtiene el nuevo"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Configuración del Pilot"
 
-#: ../ui/evolution.xml.h:25
-msgid "Show Side _Bar"
-msgstr "Mostrar barra _lateral"
-
-#: ../ui/evolution.xml.h:26
-msgid "Show _Status Bar"
-msgstr "Mostrar barra de _estado"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show _Toolbar"
-msgstr "Mostrar barra de _herramientas"
-
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Muestra información acerca de Evolution"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:24
+msgid "Side _Bar"
+msgstr "Barra _lateral"
+
+#: ../ui/evolution.xml.h:25
+msgid "Status _Bar"
+msgstr "Barra de _estado"
+
+#: ../ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Envía un informe de fallos"
 
-#: ../ui/evolution.xml.h:30
+#. <menuitem name="HelpFAQ" verb=""
+#. _label="Evolution _FAQ"/>
+#.
+#. <separator/>
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Enviar informe de _fallos"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Envía un informe de fallos usando Bug Buddy"
+msgstr "Enviar un informe de fallos usando Bug Buddy"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Cambiar si se está trabajando desconectado."
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Barra de _herramientas"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "_Estilo de la barra de herramientas"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Ver/Ocultar la barra de lateral"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Ver/Ocultar la barra de estado"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "Acerca _de"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "O_lvidar contraseñas"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Ocultar botones"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Sólo _iconos"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Opciones de _sincronización…"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Sólo _texto"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Ventana"
 
@@ -20353,34 +20048,26 @@ msgid "_Work Week View"
 msgstr "Vista de la semana _laboral"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Como carpeta de enviados para la vista _ancha"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Como carpeta de _enviados"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Por es_tado"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Por re_mitente"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Por _asunto"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Por marca de _seguimiento"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Para la vista _ancha"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Mensajes"
 
@@ -20396,32 +20083,28 @@ msgstr "Con fecha de _vencimiento"
 msgid "With _Status"
 msgstr "Con _estado"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Zonas horarias</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Selección</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Seleccione una zona horaria"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "Caja combo para la zona horaria "
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20457,7 +20140,7 @@ msgid "_Edit..."
 msgstr "_Editar…"
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20471,11 +20154,11 @@ msgstr "Instancia"
 msgid "Save Current View"
 msgstr "Guardar vista actual"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "_Crear vista nueva"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Reemplazar vista existente"
 
@@ -20510,31 +20193,26 @@ msgstr "Fábrica"
 msgid "Define New View"
 msgstr "Definir vistas nuevas"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "Nombre de la vista nueva:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "Tipo de vista"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Sugerir mostrar adjuntos automáticamente"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "LMXJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20544,8 +20222,8 @@ msgstr "Calendario mensual"
 
 #: ../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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Color de relleno"
 
@@ -20554,16 +20232,16 @@ msgstr "Color de relleno"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "Color de relleno 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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Punteo de relleno"
 
@@ -20602,11 +20280,11 @@ msgid "Minimum Width"
 msgstr "Ancho mínimo"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Espaciado"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Ahora"
 
@@ -20734,14 +20412,6 @@ msgstr "Caja combo para seleccionar la hora"
 msgid "Time"
 msgstr "Hora"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "_Ahora"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Hoy"
-
 #. 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"
@@ -20752,23 +20422,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expandido"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Indica si el expansor está o no expandido"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Texto de la etiqueta del expansor"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Usar subrayado"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20776,80 +20446,64 @@ msgstr ""
 "Si se establece, un subrayado en el texto indica que el siguiente carácter "
 "debería usarse para la combinación de teclas mnemotécnica"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Espacio para poner entre la etiqueta y el descendiente"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Etiqueta del widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para mostrar en lugar de la etiqueta usual del expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Tamaño del expansor"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Tamaño de la flecha del expansor"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indicador de espacio"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Espaciado alrededor de la flecha del expansor"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Guardar búsqueda"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Búsquedas"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Búsquedas"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Guardar búsqueda"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Guardar búsqueda…"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Editar búsquedas guardadas…"
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "Búsqueda _avanzada…"
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Todas las cuentas"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Cuenta actual"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Carpeta actual"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Mensaje actual"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Elija una imagen"
@@ -20891,45 +20545,45 @@ msgstr "Modelo de reflujo"
 msgid "Column width"
 msgstr "Anchura de columna"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Buscar"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Buscar ahora"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Vaciar"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Tipo de búsqueda"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "ID de subelemento"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Texto"
 
-#. 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:911
-msgid "Show: "
-msgstr "Mostrar: "
-
-#. 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:927
-msgid "Sear_ch: "
-msgstr "_Buscar: "
-
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:939
-msgid " i_n "
-msgstr " e_n "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Buscar _ahora"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20978,8 +20632,8 @@ msgid "A_uto-delete sent item"
 msgstr "_Autoborrar el elemento enviado"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Clasificación"
+msgid "C_lassification"
+msgstr "Clasi_ficación"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -21003,85 +20657,79 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"Normal\n"
-"Propietario\n"
+"Público\n"
+"Privado\n"
 "Confidencial\n"
-"Secreto\n"
-"Alto secreto\n"
-"Sólo para tus ojos"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "_Respuesta solicitada"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "Seguimiento de es_tado"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
 "Standard\n"
 "Low"
 msgstr ""
-"Indefinido\n"
+"Sin definir\n"
 "Alto\n"
 "Estándar\n"
 "Bajo"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Al ace_ptar:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Al _terminar:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Al _rehusar:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "_Dentro"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Después de:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Toda la información"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Retrasar la entrega del mensaje"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Entregado"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "_Establecer fecha de caducidad"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Hasta:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Cuando convenga"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "_Al abrir:"
 
@@ -21099,19 +20747,19 @@ msgstr "%s (%d%% completado)"
 msgid "Click here to go to URL"
 msgstr "Pulse aquí para ir a la URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "Editar lista de categorías maestra…"
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "Elemento(s) pertenecientes a estas _categorías:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "_Categorías disponibles:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "categorías"
 
@@ -21135,23 +20783,23 @@ msgstr "Columna enfocada"
 msgid "Unselected Column"
 msgstr "Columna deseleccionada"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1786
 msgid "Strikeout Column"
 msgstr "Tachar columna"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1793
 msgid "Underline Column"
 msgstr "Subrayar columna"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1800
 msgid "Bold Column"
 msgstr "Columna en negrita"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Color Column"
 msgstr "Color de la columna"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1821
 msgid "BG Color Column"
 msgstr "Color de fondo de la columna"
 
@@ -21166,7 +20814,6 @@ msgstr "Campos _disponibles:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -21177,7 +20824,6 @@ msgstr "Quitar todo"
 
 #: ../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 "Descending"
 msgstr "Descendente"
 
@@ -21275,14 +20921,14 @@ msgstr "_Mostrar estos campos en orden:"
 #: ../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-header-item.c:1805
 msgid "DnD code"
 msgstr "Código 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-header-item.c:1819
 msgid "Full Header"
 msgstr "Encabezado completo"
 
@@ -21302,19 +20948,25 @@ msgstr ""
 "Para añadir una columna a su tabla, arrástrela en\n"
 "la ubicación en la cual quiere que aparezca."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d elemento)"
-msgstr[1] "%s : %s (%d elementos)"
+msgstr "%s : %s (%d elemento)"
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d elemento)"
-msgstr[1] "%s (%d elementos)"
+msgstr "%s (%d elemento)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d elementos)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21394,69 +21046,65 @@ msgstr "Altura uniforme de la fila"
 msgid "Frozen"
 msgstr "Congelado"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Ordenar ascendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Ordenar descendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Agrupar por este campo"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Agrupar por caja"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Quitar esta columna"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Añadir una columna…"
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Alineación"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Ajuste automático"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Formatear columnas…"
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Personalizar vista actual…"
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Ordenar por"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Tipografía"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Ordenar información"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21508,7 +21156,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Esto debería probar el elemento de lienzo de minitarjetas"
 
 #: ../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:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Procesador de acontecimientos"
 
@@ -21521,57 +21169,57 @@ msgid "GDKFont"
 msgstr "Tipografía GDK"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Justificación"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Usar elipsis"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Elipsis"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Ajuste de línea"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Caracteres de ruptura"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Líneas máximas"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Permitir nuevas líneas"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Dibujar bordes"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Dibujar fondo"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Dibujar botón"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Posición del cursor"
 
@@ -21579,59 +21227,79 @@ msgstr "Posición del cursor"
 msgid "Emulate label resize"
 msgstr "Emular redimensionado de etiqueta"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Tachar"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Ancla"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Ancho del clip"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Alto del clip"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Rellenar el rectángulo del clip"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "Desplazamiento en X"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Desplazamiento en Y"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Anchura del texto"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Altura del texto"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "Contexto IM"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "Cale_ndar:"
+#~ msgstr "Cale_ndario:"
+
+#~ msgid "Dele_gatees"
+#~ msgstr "_Delegados"
+
+#~ msgid "From:"
+#~ msgstr "De:"
+
+#~ msgid "Message _List As"
+#~ msgstr "_Lista de mensaje como"
+
+#~ msgid "_New Search _Folder (FIXME)"
+#~ msgstr "Carpeta de búsqueda nueva"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "Preguntas _frecuentes de Evolution"
+
+#~ msgid "Properties..."
+#~ msgstr "Propiedades…"
diff --git a/po/et.po b/po/et.po
index fb64b763ea..7d5ae7e637 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,20 +4,19 @@
 # Copyright (C) 2001-2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 #
-# Ilmar Kerm <ikerm@hot.ee>, 2001.
-# Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005, 2006.
-# Kaarel Jõgi <kaarel@gg.ee>, 2002.
-# Priit Laes <amd@store20.com>, 2003-2005.
+# Ilmar Kerm <ikerm@hot.ee>, 2001
+# Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005, 2006
+# Kaarel Jõgi <kaarel@gg.ee>, 2002
+# Priit Laes <amd@store20.com>, 2003-2005
 #
 # Riigi- ja linnanimed: Marek Sepp <marek.sepp@ttu.ee>, 2001, 2002
 #
-#: ../mail/em-format-html-display.c:680
 msgid ""
 msgstr ""
-"Project-Id-Version: Evolution HEAD\n"
+"Project-Id-Version: Evolution 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 07:02+0200\n"
-"PO-Revision-Date: 2006-07-25 11:29+0300\n"
+"POT-Creation-Date: 2006-02-16 06:14+0100\n"
+"PO-Revision-Date: 2006-07-19 12:09+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +26,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolutioni aadressiraamat"
 
@@ -41,12 +40,12 @@ msgstr "Uus kontakt"
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "käesolev aadressiraamatu kaust %s sisaldab %d kaardi"
-msgstr[1] "käesolev aadressiraamatu kaust %s sisaldab %d kaarti"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "käesolev aadressiraamatu kaust sisaldab %d kaardi"
+msgstr[1] "käesolev aadressiraamatu kaust sisaldab %d kaarti"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -65,32 +64,32 @@ msgstr "Kontakt:"
 msgid "evolution minicard"
 msgstr "evolutioni minikaart"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr "On alarmidega."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "See omab kordumisi."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "See on kohtumine."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendrisündmus: Kokkuvõte on %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendrisündmus: Kokkuvõte puudub."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr "calendrivaate sündmus"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr "Haara fookus"
 
@@ -119,42 +118,32 @@ msgstr "Mine kuupäevale"
 msgid "a table to view and select the current time range"
 msgstr "tabel praeguse ajavahemiku kuvamiseks ja valimiseks"
 
-#. 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:146 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Sellel on %d sündmus."
 msgstr[1] "Sellel on %d sündmust."
 
-#. 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:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
 msgstr "Sellel pole sündmusi."
 
-#. 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:152
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Töönädala vaade: %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:155
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päeva vaade: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
 msgstr "kalendrivaade töönädala jaoks"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:188
 msgid "calendar view for one or more days"
 msgstr "kalendrivaade ühe või enama päeva jaoks"
 
@@ -171,10 +160,8 @@ msgstr "%A, %d. %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -205,10 +192,8 @@ msgstr "%d. %B %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -234,21 +219,21 @@ msgstr ""
 msgid "Click here, you can find more events."
 msgstr "Täiendavate sündmuste lisamiseks klõpsa siia"
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:155
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Kuu vaade: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:159
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Nädala vaade: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
 msgstr "kalendrivaade kuu jaoks"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
 msgstr "kalendrivaade ühe või enama nädala jaoks"
 
@@ -338,14 +323,6 @@ msgstr "Aktiveeri vaikimisi"
 msgid "Popup Menu"
 msgstr "Hüpikmenüü"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Manuseriba sisse- ja väljalülitamine"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr ""
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -518,7 +495,7 @@ msgid ""
 msgstr ""
 "Sinu {0} kontakte pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -530,7 +507,7 @@ msgid "_Discard"
 msgstr "_Hülga"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -570,9 +547,9 @@ msgstr "Seadista automaatlõpetamist siit"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../addressbook/gui/component/addressbook-view.c:1334
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "Kontaktid"
 
@@ -633,7 +610,7 @@ msgstr "Kohalikus arvutis"
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Isiklik"
 
@@ -660,7 +637,7 @@ msgid "Create a new contact list"
 msgstr "Uue kontaktide nimekirja loomine"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
@@ -672,77 +649,76 @@ msgstr "_Aadressiraamat"
 msgid "Create a new address book"
 msgstr "Uue aadressiraamatu loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:406
+#: ../addressbook/gui/component/addressbook-component.c:382
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Tõrge aadressiraamatu seadistuste või kataloogide uuendamisel."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Baas"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "L_iik:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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: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:2021
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Üldine"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Serveri andmed"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Üksikasjad"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Otsing"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Allalaadimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -814,35 +790,34 @@ msgstr "Kausta nimes ei tohi sisalduda '/' sümbol"
 msgid "A Folder with this name already exists"
 msgstr "Sellise nimega kaust on juba olemas"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Uus aadressiraamat"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Salvesta vKaardina..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Omadused..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Kontaktide allika valimine"
 
@@ -851,12 +826,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "Tõrge autentimisel.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Sisesta %s parool (kasutaja %s)"
@@ -902,7 +877,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Nimedevaliku dialoogis viimatikasutatud kausta URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Püstpaani asukoht"
 
@@ -1170,8 +1145,8 @@ msgstr "_Sisselogimismeetod:"
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:163
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -1184,7 +1159,7 @@ msgid "_Search scope:"
 msgstr "_Otsingu ulatus"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1203,10 +1178,13 @@ msgstr "kaardid"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2021
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2020
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1217,15 +1195,17 @@ msgstr "minutit"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h: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
@@ -1270,13 +1250,13 @@ msgstr "<b>Töö</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1285,7 +1265,7 @@ msgstr "Kontakt"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -1327,8 +1307,8 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Töö"
 
@@ -1350,15 +1330,15 @@ msgid "_Birthday:"
 msgstr "_Sünnipäev:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "Kalen_der:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "Kate_gooriad..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Kategooriad"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1445,8 +1425,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Postiindeks:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Aadress"
 
@@ -1454,15 +1434,15 @@ msgstr "Aadress"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2440,7 +2420,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nimi"
@@ -2451,7 +2431,7 @@ msgstr "AOL kiirsuhtlusklient"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2461,7 +2441,7 @@ msgstr "Yahoo Kiirsuhtlusklient"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2470,8 +2450,8 @@ msgid "Service"
 msgstr "Teenus"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:478
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Asukoht"
@@ -2491,17 +2471,17 @@ msgid "Other"
 msgstr "Muu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "Groupwise"
 
@@ -2530,20 +2510,20 @@ msgid "Changed"
 msgstr "Muudetud"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktiredaktor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2790
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2757
 msgid "Please select an image for this contact"
 msgstr "Palun vali selle kontakti jaoks pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
-msgid "_No image"
-msgstr "Pilti _ei ole"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
+msgid "No image"
+msgstr "Pilti ei ole"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2551,31 +2531,15 @@ msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
-#, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' on vigases vormingus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
-#, c-format
-msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' on vigases vormingus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3119
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#, c-format
-msgid "%s'%s' is empty"
-msgstr "%s'%s' on tühi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3145
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "Täisnime r_edigeerimine"
 
@@ -2583,11 +2547,11 @@ msgstr "Täisnime r_edigeerimine"
 msgid "_Full name"
 msgstr "Täis_nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "E-_post:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Vali aadressiraamat"
 
@@ -2595,10 +2559,10 @@ msgstr "_Vali aadressiraamat"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Kas sa tõesti soovid\n"
-"kustutada kontaktide loendit (%s)?"
+"kustutada kontaktide loendit (%s) ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
@@ -2612,7 +2576,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Kas sa tõesti soovid\n"
 "kustutada kontakti (%s)?"
@@ -2723,10 +2687,9 @@ msgid "_IM Service:"
 msgstr "_KS teenus:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-calendar.c:234
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "_Location:"
 msgstr "Asuko_ht:"
 
@@ -2739,7 +2702,7 @@ msgid "Add an email to the List"
 msgstr "Lisa sõnum loendisse"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
@@ -2771,24 +2734,24 @@ msgstr "_Vali"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Sisesta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Raamat"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "On uus loend"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Liikmed"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Kontaktiloendi liikmed"
 
@@ -2829,18 +2792,25 @@ msgstr ""
 "Selle kontakti nimi või e-posti aadress on selles kaustas\n"
 "juba olemas. Kas sa soovid seda siiski lisada?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Kategooria on"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-post algab"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Nimi algab"
@@ -2858,9 +2828,9 @@ msgstr[1] "%d kontakti"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Päring"
 
@@ -2882,109 +2852,108 @@ msgstr "Mudel"
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Allikas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:486
+#: ../calendar/gui/e-meeting-list-view.c:480
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tüüp"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2068
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "A_va"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Uus kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Uus kontaktide _loend..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Salvesta VKaardina"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Edasta kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Edasta kontaktid"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "_Saada kontaktile sõnum"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "_Saada sõnum postiloendisse"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "_Saada kontaktidele sõnum"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Prindi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Kopeeri aadressiraamatusse..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "_Tõsta aadressiraamatusse..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3158 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "_Aseta"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1803
 msgid "Print cards"
 msgstr "Prindi kaardid"
 
@@ -3017,7 +2986,7 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3029,7 +2998,7 @@ msgid "Company Phone"
 msgstr "Firma telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-post"
@@ -3079,7 +3048,7 @@ msgid "Manager"
 msgstr "Juht"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
@@ -3088,7 +3057,7 @@ msgid "Nickname"
 msgstr "Hüüdnimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Märkus"
 
@@ -3097,7 +3066,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisatsioon"
 
@@ -3123,7 +3092,7 @@ msgstr "Raadio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:497
+#: ../calendar/gui/e-meeting-list-view.c:491
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
@@ -3162,7 +3131,7 @@ msgstr "Koduleht"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
+#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
 #: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:656
@@ -3170,7 +3139,7 @@ msgstr "Koduleht"
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Laius"
@@ -3178,14 +3147,14 @@ msgstr "Laius"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 #: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-field-chooser-item.c:663
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Kõrgus"
@@ -3215,7 +3184,7 @@ msgstr "Suurim välja nime pikkus"
 msgid "Column Width"
 msgstr "Veeru laius"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3229,7 +3198,7 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltklõps."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3243,7 +3212,7 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltklõps."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3253,7 +3222,7 @@ msgstr ""
 "\n"
 "Otsi kontakti."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3263,7 +3232,7 @@ msgstr ""
 "\n"
 "Selles vaates kirjed puuduvad."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -3275,89 +3244,68 @@ msgstr "Valitud"
 msgid "Has Cursor"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Ava _viit veebilehitsejas"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "Kopeeri _lingi asukoht"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Saada uus sõnum aadressile..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Kopeeri _e-posti aadress"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(kaart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "kaart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-post"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Ametikoht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Videovestlus"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Videokonverents"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "töö"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Koduleht"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
-msgstr "Veebilogi"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "isiklik"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Koduleht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3388,7 +3336,7 @@ msgstr "Enda kontakti ei ole kirjeldatud"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
@@ -3413,7 +3361,7 @@ msgstr "Toetamata protokoll"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Katkestatud"
 
@@ -3539,7 +3487,7 @@ msgid "Error adding list"
 msgstr "Viga loendi lisamisel"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Viga kontakti lisamisel"
 
@@ -3556,7 +3504,7 @@ msgid "Error removing list"
 msgstr "Viga loendi eemaldamisel"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
@@ -3575,7 +3523,7 @@ msgstr[1] ""
 "%d kontakti avamisega kaasneb %d uue akna avamine.\n"
 "Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3584,69 +3532,69 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
 #. 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontakti"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Aadressiraamatu valimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "nimekiri"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Kontakti ümbertõstmine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Kontakti kopeerimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Kontaktide ümbertõstmine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Kontaktide kopeerimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Kontaktandmed"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktandmed - %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Pöördumine aadressiraamatu poole..."
 
@@ -3715,19 +3663,19 @@ msgstr "Evolutioni CSV ja Tab-i importija"
 msgid "Importing ..."
 msgstr "Importimine ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:761
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP andmevahetusvorming (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:762
 msgid "Evolution LDIF importer"
 msgstr "Evolutioni LDIF importija"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:554
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:555
 msgid "Evolution VCard Importer"
 msgstr "Evolutioni VKaardi importija"
 
@@ -3736,12 +3684,12 @@ msgstr "Evolutioni VKaardi importija"
 msgid "Print envelope"
 msgstr "Prindi ümbrik"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Kontaktide trükkimine"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Kontakti trükkimine"
 
@@ -3790,7 +3738,7 @@ msgstr "Vorming"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Päis"
@@ -3894,9 +3842,9 @@ msgstr "Varjutamine"
 
 #. 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:955
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:205
 msgid "Size:"
 msgstr "Suurus:"
 
@@ -4129,17 +4077,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Kas sa tõesti soovid kustutada seda sündmust?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Kas sa tõesti soovid kustutada seda päevikukirjet?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Kas sa tõesti soovid kustutada seda koosolekut?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Kas sa tõesti soovid kustutada seda ülesannet?"
 
@@ -4386,7 +4331,7 @@ msgid "_Save Changes"
 msgstr "_Salvesta muudatused"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "_Saada"
 
@@ -4411,8 +4356,8 @@ msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Andmeserverit pole võimalik käivitada (evolution-data-server)"
 
@@ -4446,12 +4391,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki pole võimalik kirjutada"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalendrid"
 
@@ -4499,14 +4444,14 @@ msgid "Memos"
 msgstr "Märkmed"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../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:387
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
+#: ../plugins/exchange-operations/exchange-folder.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Ülesanded"
@@ -4524,13 +4469,16 @@ msgstr "_Ülesanded"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutioni kalendri alarmteadete teenus"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutit"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4542,7 +4490,7 @@ msgid_plural "hours"
 msgstr[0] "tund"
 msgstr[1] "tundi"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Algusaeg"
 
@@ -4553,10 +4501,10 @@ msgstr "Sündmused"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Asukoht:"
 
@@ -4566,16 +4514,16 @@ msgstr "_Edasilükkamise aeg:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Redaktor"
 
@@ -4587,31 +4535,32 @@ msgstr "_Lükka edasi"
 msgid "location of appointment"
 msgstr "sündmuse asukoht"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Kokkuvõte puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Asukoha kohta puuduvad andmed."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sul on %d alarmi"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4623,7 +4572,7 @@ msgstr ""
 "saatmist e-posti teel.  Evolution kuvab selle asemel\n"
 "hariliku meeldetuletusdialoogi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4639,7 +4588,7 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
@@ -4655,34 +4604,67 @@ msgstr "Alarmteavituse teenuse factory't pole võimalik luua"
 msgid "invalid time"
 msgstr "vigane aeg"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#. Can't be zero
+#: ../calendar/gui/alarm-notify/util.c:58
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d tund"
-msgstr[1] "%d tundi"
+msgid "(%ld seconds)"
+msgstr "(%ld sekundit)"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuti"
-msgstr[1] "%d minutit"
+msgid "(%d %s %d %s)"
+msgstr "(%d %s %d %s)"
 
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
+msgid "second"
+msgstr "teine"
+
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "sekundit"
+
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekund"
-msgstr[1] "%d sekundit"
+msgid "(%d %s)"
+msgstr "(%d %s)"
+
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
+#, c-format
+msgid " %u second"
+msgstr "%u sekund"
+
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
+#, c-format
+msgid " %u seconds"
+msgstr "%u sekundit"
+
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#, c-format
+msgid " %u minute"
+msgstr "%u minut"
+
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#, c-format
+msgid " %u minutes"
+msgstr "%u minutit"
+
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#, c-format
+msgid "%u hour"
+msgstr "%u tund"
+
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#, c-format
+msgid "%u hours"
+msgstr "%u tundi"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -4738,102 +4720,90 @@ msgid "Default reminder value"
 msgstr "Meeldetuletaja vaikimisi väärtus"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Sündmuse kalle"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Sündmuse läbipaistvus"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Vaba/hõivatud serveri URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Vaba/hõivatud malli URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Sündmuste kalle kalendrivaates."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Peida lõpetatud ülesanded"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Ülesandeühikute peitmine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Ülesandeväärtuste peitmine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Rõhtpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Tööpäeva lõpuaeg, 24-tunnises vormingus, vahemikus 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Tööpäeva algusaeg, 24-tunnises vormingus, vahemikus 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Päeva ja töönädala vaates näidatavad vahemikud minutites."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Viimase alarmi aeg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Serveri url-ide loend vaba/hõivatud andmete avaldamiseks."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains'i joon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains'i joone värv - päeva vaade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains'i joone värv - ajariba"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut, millal tööpäev lõpeb, 0 kuni 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut, millal tööpäev algab, 0 kuni 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Kuuvaate rõhtpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Kuuvaate püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Meeldetuletaja vaikimisi ühikute arv."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Ülesannete peitmiseks vaikimisi ühikute arv."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Tähtaja ületanud ülesannete värvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4841,7 +4811,7 @@ msgstr ""
 "Rõhtpaani asukoht pikslites - kuupäevanavigeerimise kalendri ja ülesannete "
 "loendi vahel, kui ei olda kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4849,14 +4819,14 @@ msgstr ""
 "Rõhtpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui oldakse kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr ""
 "Rõhtpaani asukoht pikslites - ülesande- ja ülesande eelvaatepaanide vahel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4864,7 +4834,7 @@ msgstr ""
 "Püstpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui oldakse kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4872,72 +4842,72 @@ msgstr ""
 "Püstpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui ei olda kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmid, mida on lubatud alarmide poolt käivitada."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "RSVP välja kuvamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Rollivälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Kategooriavälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Alarmide kuvamine teavitussalves"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Olekuvälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"Eelvaatlus\" paani kuvamine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"Eelvaatlus\" paani kuvamine."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Ajavööndi välja näitamine sündmuste/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Liigivälja näitamine sündmuste/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Nädalanumbrite näitamine kuupäevavalikus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Tänase tähtajaga ülesannete värvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Ülesannete püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4945,64 +4915,56 @@ msgstr ""
 "Vaikimisi ajavöönd kalendris märgitud päevadele ja aegadele - tõlkimata "
 "asukohastring Olseni ajavööndite andmebaasist, näiteks \"Europe/Tallinn\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Ajajaotised:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Viimase alarmi töötamise aeg, time_t ühikuga."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Sündmuste läbipaistvus kalendrivaates (väärtus 0 ja 10 vahel, vaikimisi "
-"läbipaistmatu)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Kahekümneneljatunnine ajavorming"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Vaikimisi meeldetuletaja ühikud, \"minutes\" (minutid), \"hours\" (tunnid) "
 "või \"days\" (päevad)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Ühikud määramaks, millal ülesandeid peita, \"minutes\" (minutid), \"hours"
 "\" (tunnid) või \"days\" (päevad)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Nädala algus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Nädalapäev, millal nädal algab, pühapäevast (0) esmaspäevani (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Kas teavitussalve kasutatakse alarmide kuvamiseks või mitte."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kas sündmuste või ülesannete kustutamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kas sündmuste või ülesannete puhastamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5010,85 +4972,77 @@ msgstr ""
 "Kas nädalalõpud tuleb kuuvaates kokku suruda, selle tulemusena kuvatakse "
 "nädalalõppu ühe päeva suurusena."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Kas sündmuste lõpuaegu kuvatakse nädala ja kuu vaadetel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Kas kalendris kuvatakse Marcus Bains'i joont (joon praeguse aja kohal)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Kas lõpetatud ülesanded peidetakse ülesandevaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Kas sündmustele seatakse vaikimisi meeldetuletaja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Kas RSVP välja näidatakse sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Kas kategooriate välja näidatakse sündmuste/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Kas rollivälja näidatakse sündmuste/ülesannete/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Kas olekuvälja näidatakse sündmuste/ülesannete/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Kas kellaaegu kuvatakse 24-tunnises või EL/PL vormingus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Kas ajavööndi välja näidatakse sündmuste/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Liigivälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Kas kuupäevasirvijas näidatakse nädalate numbreid."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
-msgid "Whether to use daylight savings time while displaying events."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Tööpäevad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Tund, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minut, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Tund, millal tööpäev algab"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minut, millal tööpäev algab"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
-msgid "daylight savings time"
-msgstr ""
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
@@ -5097,19 +5051,19 @@ msgstr "Kokkuvõte sisaldab"
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Asukoht sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Puudub"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
@@ -5118,12 +5072,12 @@ msgstr "Prindi"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/exchange-operations/exchange-folder.c:579
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
 #: ../plugins/hula-account-setup/camel-hula-listener.c:379
 #: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -5186,59 +5140,59 @@ msgstr "Tõrge kalendrite uuendamisel."
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kalendrit '%s' pole võimalik sündmuste ja koosolekute loomiseks avada"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Sündmuste ja koosolekute loomiseks pole kalendrit saadaval"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Kalendri allika valimine"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Uue sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Uue koosolekukutse loomine"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Uue kogu päeva hõlmava sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Uue kalendri loomine"
 
@@ -5270,11 +5224,11 @@ msgstr ""
 msgid "Permission denied to open the calendar"
 msgstr "Puuduvad õigused kalendri avamiseks"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "Alarmi redigeerimine"
 
@@ -5381,7 +5335,7 @@ msgstr "minut(it)"
 msgid "start of appointment"
 msgstr "sündmuse algust"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
 msgid "Action/Trigger"
 msgstr "Tegevus/Päästik"
 
@@ -5390,25 +5344,54 @@ msgid "A_dd"
 msgstr "L_isa"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "Manuse _automaatkuvamise soovitamine"
+#: ../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 "Manuse automaatkuvamise soovitamine"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../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 "Manuse omadused"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Kirjeldus:"
+
+#: ../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 "Faili nimi:"
+
+#: ../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 tüüp:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr ""
 
@@ -5435,7 +5418,7 @@ msgstr ""
 "aadressist.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Hoiatused</span>"
 
@@ -5444,7 +5427,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Vaikimisi vaba/hõivatud server</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Üldine</span>"
@@ -5461,31 +5444,27 @@ msgstr "<span weight=\"bold\">Aeg</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Töönädal</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Päev lõpe_b:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Kuva"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:572
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Vaba/hõivatud"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Reede"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5495,13 +5474,13 @@ msgstr ""
 "tundi\n"
 "päeva"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5519,197 +5498,190 @@ msgstr ""
 "Laupäev\n"
 "Pühapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Värvuse valimine"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_P"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Alarmmärguannetega kalendrite valimine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "_Meeldetuletuse näitamine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "_Tänase tähtajaga ülesanded:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "_N"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Mall:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Aja_vöönd:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Ajavorming:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "Nä_dala algus:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Tööpäevad:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tunnine (EL/PL)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 tunnine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "K_irjete kustutamisel küsitakse nõusolekut"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Nädalalõppe kuvatakse kokkusurutud vormis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "Päev al_gab:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_R"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "Lõpetatud ülesanded _peidetakse pärast"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_E"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "Tä_htaja ületanud ülesanded:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "_L"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "Nädala ja kuu vaadetel näidatakse sündmuste _lõpuaegu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "Aja _jaotamine:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_T"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_K"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr ""
-"Kalendri sisu _kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
+"Kalendri sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr ""
-"Ülesandeloendi sisu _kopeerimine kohapeale tarvitamiseks võrguvabas "
-"keskkonnas"
+"Ülesandeloendi sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr ""
-"Märkmeloendi sisu _kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
+"Märkmeloendi sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Vä_rvus:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Ülesannete loend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Märkmeloend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Kalendri omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Ülesandeloendi omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Uus märkmeloend"
 
@@ -5799,159 +5771,160 @@ msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " kuni "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2894
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Manustatud sõnum - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2899
-#: ../composer/e-msg-composer.c:3095
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3034
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Manustatud sõnum"
 msgstr[1] "%d manustatud sõnumit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3159
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Tõsta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3161
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
+#: ../calendar/gui/dialogs/comp-editor.c:800
 msgid "Could not update object"
 msgstr "Objekti pole võimalik uuendada!"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2504
+#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fail manusena"
 msgstr[1] "<b>%d</b> faili manusena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Hide Attachment _Bar"
 msgstr "Peida manuseri_ba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:978
+#: ../calendar/gui/dialogs/comp-editor.c:1442
 msgid "Show Attachment _Bar"
 msgstr "Näita manuseri_ba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3659
+#: ../composer/e-msg-composer.c:3597
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3660 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Omadused"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3662
+#: ../composer/e-msg-composer.c:3600
 msgid "_Add attachment..."
 msgstr "_Lisa manus..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2262
+#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../mail/em-format-html-display.c:2063
 msgid "Show Attachments"
 msgstr "Näita manuseid"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1467
 msgid "Press space key to toggle attachment bar"
 msgstr "Vajuta tühikut manuseriba sisse-/väljalülitamiseks"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:2117
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2123
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../calendar/gui/dialogs/comp-editor.c:2129
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:2134
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2102
+#: ../calendar/gui/dialogs/comp-editor.c:2144
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2652
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
+#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "manus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2741
+#: ../calendar/gui/dialogs/comp-editor.c:2795
+#: ../calendar/gui/dialogs/comp-editor.c:2819
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Sellele kirjele tehtud muudatused tühistatakse uuenduste saabumise korral"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2843
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni pole võimalik kasutada!"
 
@@ -5967,10 +5940,6 @@ msgstr "Sihtkoha avamine nurjus"
 msgid "Destination is read only"
 msgstr "Sihtkoht on kirjutuskaitstud"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Seda sündmust pole võimalik tänu corba veale kustutada"
@@ -6032,124 +6001,139 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Sünd_mus"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2717
 msgid "This event has alarms"
 msgstr "See sündmus on alarmidega"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Kale_nder:"
+
+#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:441
+#: ../calendar/gui/dialogs/task-page.c:446
 msgid "Or_ganizer:"
 msgstr "Ko_rraldaja:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:919
 msgid "_Delegatees"
 msgstr "_Delegaadid"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:921
 msgid "Atte_ndees"
 msgstr "_Osalejad"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1092
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/task-page.c:848
+#: ../calendar/gui/dialogs/event-page.c:1260
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1270
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1293
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1300
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "The organizer selected no longer has an account."
 msgstr "Valitud korraldajal pole enam kontot."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/task-page.c:911
+#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/meeting-page.c:475
+#: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/dialogs/event-page.c:1474
-#: ../calendar/gui/dialogs/task-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/meeting-page.c:490
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "_Lisa "
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2624
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päev enne sündmust"
 msgstr[1] "%d päeva enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2928
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tund enne sündmust"
 msgstr[1] "%d tundi enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut enne sündmust"
 msgstr[1] "%d minutit enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2952
 msgid "Customize"
 msgstr "Kohanda"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2957
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2296
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "Puudub"
 
@@ -6166,7 +6150,8 @@ msgid "15 minutes before appointment"
 msgstr "15 minutit enne sündmust"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "_Osalejad..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6174,25 +6159,29 @@ msgstr "_Osalejad..."
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Kohandatud alarm:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_Kirjeldus:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Sündmuse kirjeldus"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Asukoht:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Kokkuvõt_e:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Alarm"
 
@@ -6214,6 +6203,14 @@ msgstr "kuni"
 msgid "until"
 msgstr "kuupäevani"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "_Delegaadid"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Saatja:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6251,16 +6248,16 @@ msgstr "Liige"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../calendar/gui/e-meeting-list-view.c:503
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:514
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
 
@@ -6281,11 +6278,11 @@ msgid "Organizer"
 msgstr "Korraldaja"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Korraldaja:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Märge"
 
@@ -6295,7 +6292,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Märkmeid pole võimalik '%s'-s avada."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:439
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupp:"
@@ -6395,15 +6392,6 @@ msgstr "järgnevatel nädalapäevadel:"
 msgid "first"
 msgstr "esimene"
 
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
-msgid "second"
-msgstr "teine"
-
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
@@ -6482,7 +6470,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Erandid</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>Eelvaade</b>"
 
@@ -6547,15 +6535,15 @@ msgstr "<span weight=\"bold\">Olek</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Kõrge"
 
@@ -6564,20 +6552,20 @@ msgstr "Kõrge"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Töös"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1027
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Madal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Keskmine"
 
@@ -6585,7 +6573,7 @@ msgstr "Keskmine"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -6598,7 +6586,7 @@ msgid "Stat_us:"
 msgstr "_Olek:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Määramata"
 
@@ -6615,28 +6603,24 @@ msgstr "Tä_htsus:"
 msgid "_Web Page:"
 msgstr "_Koduleht:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Ülesande üksikasjad"
 
-#: ../calendar/gui/dialogs/task-page.c:821
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-page.c:1649
+#: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ülesandeid pole võimalik '%s'-s avada."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Osalejad..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Kate_gooriad..."
@@ -6716,6 +6700,30 @@ msgid_plural "%d weeks"
 msgstr[0] "%d nädal"
 msgstr[1] "%d nädalat"
 
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:408
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tund"
+msgstr[1] "%d tundi"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:414
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuti"
+msgstr[1] "%d minutit"
+
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:420
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekundit"
+
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
@@ -6777,7 +6785,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "Klõpsa %s avamiseks"
@@ -6797,7 +6805,7 @@ msgstr "Nimetu"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
@@ -6815,7 +6823,7 @@ msgstr "Tähtaeg:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Olek:"
 
@@ -6823,26 +6831,18 @@ msgstr "Olek:"
 msgid "Priority:"
 msgstr "Tähtsus:"
 
-#: ../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:3
-msgid "Description:"
-msgstr "Kirjeldus:"
-
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Avalik"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Isiklik"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Salajane"
 
@@ -6856,19 +6856,19 @@ msgstr "Alguskuupäev"
 
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Kokkuvõte"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Vaba"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Hõivatud"
 
@@ -6882,151 +6882,146 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Jah"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Korduv"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Määratud"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Salvestamine kui..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2110
+#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
 msgid "Select folder to save selected attachments..."
 msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Säti _taustapildiks"
 
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:274
 msgid "_Save Selected"
 msgstr "_Salvesta valik"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Valitud objektide kustutamine"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Salvestamine kui..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Uus ü_lesanne"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: ../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:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7034,54 +7029,44 @@ msgstr "_Ava veebileht"
 msgid "_Print..."
 msgstr "_Prindi..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: ../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:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-#, fuzzy
-msgid "_Mark as Incomplete"
-msgstr "_Märgi lõpetatuks"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-#, fuzzy
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Märgi valitud ülesanne lõpetatuks"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks klõpsa siia"
@@ -7091,7 +7076,7 @@ msgstr "Ülesande lisamiseks klõpsa siia"
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -7116,101 +7101,105 @@ msgstr "Alguskuupäev"
 msgid "Task sort"
 msgstr "Ülesannete sortimine"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Kirjete tõstmine"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kirjete kopeerimine"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Uus _koosolek"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Uus ü_lesanne"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Käesolev vaade"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Vali _tänane kuupäev"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Vali kuupäev..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_Tõsta kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegeeri koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "A_jasta koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Vasta"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Muuda seekordne sündmus _liigutatavaks"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "K_ustuta seekordne sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Ku_stuta kõik sündmuse kordused"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Korraldaja: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Korraldaja: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Asukoht: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aeg: %s %s"
@@ -7240,7 +7229,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i-minutiline jaotamine"
@@ -7251,22 +7240,20 @@ msgstr "%02i-minutiline jaotamine"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pl"
 
@@ -7376,22 +7363,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
@@ -7608,7 +7595,7 @@ msgid "Attendee status updated\n"
 msgstr "Osaleja olek värskendatud\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osaleja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
@@ -7656,35 +7643,48 @@ msgid "Send Latest Information"
 msgstr "Värskeimate andmete saatmine"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--kellele--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalendri sõnum"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Kuupäev:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Kalendri laadimine"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Kalendri laadimine..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Serveri teade:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "lõppkuup."
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "alguskuup."
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Juhid"
@@ -7703,81 +7703,81 @@ msgid "Resources"
 msgstr "Ressursid"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "Isik"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupp"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Ressurss"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Ruum"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Juht"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Katseline"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegeeritud"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:470
+#: ../calendar/gui/e-meeting-list-view.c:464
 msgid "Attendee                          "
 msgstr "Osaleja                           "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 msgid "In Process"
 msgstr "Töös"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -7785,86 +7785,86 @@ msgstr "%A, %d. %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Andmed puuduvad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Osalejad..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Valikud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööaja piires"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Näita _väikeses plaanis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Algus:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Lõpp:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Kustuta valitud märkmed"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Märkme lisamiseks klõpsa siia"
 
@@ -7872,7 +7872,7 @@ msgstr "Märkme lisamiseks klõpsa siia"
 msgid "Memo sort"
 msgstr "Märkmete sortimine"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7891,7 +7891,7 @@ msgstr "Märkmete laadimine"
 msgid "Opening memos at %s"
 msgstr "Märkmete avamine asukohast %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
@@ -7900,32 +7900,31 @@ msgstr "Valitud objektide kustutamine..."
 msgid "Enter the password for %s"
 msgstr "Sisesta parool %s jaoks"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:866
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:953
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ülesannete avamine asukohast %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1198
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1248
 msgid "Expunging"
 msgstr "Puhastamine"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "Ajavööndi valimine"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -8029,19 +8028,19 @@ msgstr "Korraldaja peab olema määrtud."
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osalejat"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
 msgid "Event information"
 msgstr "Andmed sündmuse kohta"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
 msgid "Task information"
 msgstr "Andmed ülesande kohta"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
 msgid "Journal information"
 msgstr "Päevaraamatu andmed"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud andmed"
 
@@ -8061,22 +8060,35 @@ msgstr "Värskenda"
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:775
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud andmed (%s -> %s)"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:785
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:940
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "_Uus märkmeloend"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopeeri"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Kustuta"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Omadused..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8116,8 +8128,8 @@ msgid "New memo"
 msgstr "Uus märge"
 
 #: ../calendar/gui/memos-component.c:1156
-msgid "Mem_o"
-msgstr "Mär_ge"
+msgid "_Memo"
+msgstr "_Märge"
 
 #: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
@@ -8128,8 +8140,8 @@ msgid "New memo list"
 msgstr "Uus märkmeloend"
 
 #: ../calendar/gui/memos-component.c:1164
-msgid "Memo li_st"
-msgstr "_Märkmeloend"
+msgid "Memo l_ist"
+msgstr "Märkmete n_imekiri"
 
 #: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
@@ -8181,240 +8193,246 @@ msgstr "Kalendrit `%s' pole võimalik siirdada"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ülesandeid `%s' pole võimalik siirdada"
 
-#: ../calendar/gui/print.c:574
+#. Can't be zero
+#: ../calendar/gui/misc.c:105
+#, c-format
+msgid "(%d seconds)"
+msgstr "(%d sekundit)"
+
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "P"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "E"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "T"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "K"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "N"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "R"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "L"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valitud nädal (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Sündmus"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Ülesanne"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Kokkuvõte: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Tähtsus: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Väljatprindi eelvaade"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Prindi kirje"
 
@@ -8473,14 +8491,14 @@ msgid "New task list"
 msgstr "Uus ülesandeloend"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
-msgstr "Ü_lesandeloend"
+msgid "Task l_ist"
+msgstr "Ü_lesannete nimekiri"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8491,11 +8509,11 @@ msgstr ""
 "lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded? "
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Prindi ülesanded"
 
@@ -10090,7 +10108,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:986
 msgid "Attachment Bar"
 msgstr "Manuseriba"
 
@@ -10098,43 +10116,28 @@ msgstr "Manuseriba"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Faili pole võimalik manusesse lisada: %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Manuse omadused"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Faili nimi:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME tüüp:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Vali kaust, kuhu sõnum postitada."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 
@@ -10145,45 +10148,45 @@ msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "V_asta-kellele:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Saatja:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "T_eema:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Kellele:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "K_oopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Pimekoopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10194,15 +10197,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "Postita ku_hu:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Postita kuhu:"
 
@@ -10210,18 +10213,18 @@ msgstr "Postita kuhu:"
 msgid "A_ttach"
 msgstr "_Manusta"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Manuse lisamine"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole "
 "signeerimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10229,52 +10232,52 @@ msgstr ""
 "Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole "
 "krüptimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Peida _manuseriba"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2536
-#: ../composer/e-msg-composer.c:3905
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3843
 msgid "Show _Attachment Bar"
 msgstr "Näita _manuseriba"
 
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Faili pole võimalik avada"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumit pole võimalik redaktorist kätte saada"
 
-#: ../composer/e-msg-composer.c:1691
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1726
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Ava fail"
 
-#: ../composer/e-msg-composer.c:2176 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
-#: ../composer/e-msg-composer.c:2279
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Si_gnatuur:"
 
-#: ../composer/e-msg-composer.c:2547 ../composer/e-msg-composer.c:3787
-#: ../composer/e-msg-composer.c:3790
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
+#: ../composer/e-msg-composer.c:3728
 msgid "Compose Message"
 msgstr "Sõnumi koostamine"
 
-#: ../composer/e-msg-composer.c:5014
+#: ../composer/e-msg-composer.c:4952
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10304,7 +10307,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Sa pead sõnumile valima teised sätted, põhjus: &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Kuna &quot;{1}&quot;."
 
@@ -10413,11 +10416,11 @@ msgstr "_Salvesta sõnum"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:511
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
 msgid "Groupware Suite"
 msgstr "Grupitöövahend"
 
@@ -10478,14 +10481,18 @@ msgid "Yes, Change Status"
 msgstr "Jah, muuda olekut"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>E-posti vastuvõtmine</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>E-posti saatmine:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10493,38 +10500,38 @@ msgid ""
 "a receipt from you.</small>"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Lugemiskinnitus saadetakse alati tagasi"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Lugemiskinnituse kohta küsitakse kasutajalt"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Lugemiskinnitust ei saadeta kunagi"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Lugemiskinnitus"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Lugemiskinnitust küsitakse iga väljasaadetud sõnumi kohta"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr ""
 "Mida peab Evolution tegema kui vastuvõetud sõnum nõuab lugemiskinnitust?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10532,28 +10539,28 @@ msgstr ""
 "Selle nimega fail on juba olemas.\n"
 "Kirjutada üle?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolutioni viga"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolutioni info"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolutioni küsimus"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Sisemine viga, küsiti tundmatut viga '%s'"
@@ -10574,7 +10581,7 @@ msgstr "Kas sa soovid seda üle kirjutada?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Fail &quot;{0}&quot; on juba olemas."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
@@ -10648,24 +10655,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Võrdlusaja valimine"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Vali faili"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Tähtis"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Ülesanne"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Hiljem"
 
@@ -10714,11 +10721,11 @@ msgid "Include threads"
 msgstr "Lõimedest kaasatakse"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Väljaminev"
 
@@ -10742,7 +10749,7 @@ msgstr "Kuupäev on puudu."
 msgid "Missing file name."
 msgstr "Failinimi on puudu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Nimi on puudu."
 
@@ -10814,10 +10821,6 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
-msgid "seconds"
-msgstr "sekundit"
-
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "praegune aeg"
@@ -10884,22 +10887,22 @@ msgstr "Evolutioni e-posti redaktori seadistuste juhtimine"
 msgid "Evolution Mail preferences control"
 msgstr "Evolutioni e-posti eelistuste juhtimine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../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:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Postikontod"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-posti eelistused"
 
@@ -10922,7 +10925,7 @@ msgid ""
 msgstr ""
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
@@ -10930,46 +10933,46 @@ msgstr "Kausta valimine"
 msgid "Ask for each message"
 msgstr "Küsitakse iga sõnumi kohta"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1779 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identiteet"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1828 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: ../mail/em-account-editor.c:2013
+#: ../mail/em-account-editor.c:2012
 msgid "Automatically check for _new mail every"
 msgstr "Uute sõnumite automaatne _kontroll vahemikuga"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2193 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2252 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Vaikimisi"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2318 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Turvalisus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
+#: ../mail/em-account-editor.c:2355 ../mail/em-account-editor.c:2446
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutioni kontoabiline"
 
@@ -10989,22 +10992,22 @@ msgid "[Default]"
 msgstr "[Vaikimisi]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protokoll"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Nimetu"
 
@@ -11020,18 +11023,18 @@ msgstr "Allkirjaskripti lisamine"
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:863 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1655
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:1702
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11080,12 +11083,6 @@ msgstr "Vastuvõtmise kuupäev"
 msgid "Date sent"
 msgstr "Saatmise kuupäev"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Kustuta"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Kustutatud"
@@ -11174,7 +11171,7 @@ msgstr "ei ole"
 msgid "is not Flagged"
 msgstr "ei ole tähistatud"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
@@ -11183,7 +11180,7 @@ msgstr "Rämps"
 msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
 
@@ -11227,7 +11224,7 @@ msgstr "Mängi heli"
 msgid "Read"
 msgstr "Loetud"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Saajad"
 
@@ -11255,11 +11252,11 @@ msgstr "tagastab väiksema kui"
 msgid "Run Program"
 msgstr "Käivita programm"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Hinne"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Saatja"
 
@@ -11291,9 +11288,9 @@ msgstr "algab stringiga"
 msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11309,58 +11306,26 @@ msgstr "Määramata olek"
 msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Loo otsingu baasil _Otsikaust..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Kõik sõnumid"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Lugemata sõnumid"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Silt puudub"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Loetud sõnumid"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Värsked sõnumid"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Viimase 5 päeva sõnumid"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Manustega sõnumid"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Sõnumid, mis pole rämpspost"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:145
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Sõnumeid kokku:"
 msgstr[1] "Sõnumeid kokku:"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:158
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lugemata sõnumeid:"
 msgstr[1] "Lugemata sõnumeid:"
 
-#: ../mail/em-folder-properties.c:316
+#: ../mail/em-folder-properties.c:289
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Kausta omadused"
@@ -11378,7 +11343,7 @@ msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Otsikaustad"
 
@@ -11393,7 +11358,7 @@ msgstr "Mustandid"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "Sisendkast"
 
@@ -11409,77 +11374,77 @@ msgstr "Saadetud"
 msgid "Loading..."
 msgstr "Laadimine..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Kirjakaustade puu"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s tõstmine"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite tõstmine %s kausta"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Vaade"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Tõsta..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Uus kaust..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
@@ -11488,14 +11453,13 @@ msgstr "_Tühjenda prügikast"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopeerimine `%s' -> `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opeeri"
 
@@ -11517,170 +11481,158 @@ msgstr "Kausta loomine"
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Märgi kui l_ugemata"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: ../mail/em-folder-view.c:1135
-#, fuzzy
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Märgista _mitterämpsuks"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "Si_lt"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Puudub"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Märgista kui _lõpetatud"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Otsikaust _teema järgi"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Otsikaust _saatja järgi"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Otsikaust _adressaatide järgi"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Otsikaust _postiloendi järgi"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "UTF-8"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "Sõnumit pole võimalik vastu võtta"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2460
+msgid "_Copy Link Location"
+msgstr "Kopeeri _lingi asukoht"
+
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "Loo uus _otsikaust"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_Sellelt aadressilt"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "S_ellele aadressile"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klõpsa, et saata sõnumit aadressile %s"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr ""
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:502
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:645
-msgid "Find:"
-msgstr "Otsing:"
-
-#: ../mail/em-format-html-display.c:676
-#, fuzzy
-msgid "M_atch case"
-msgstr "Kõik sobivused"
-
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11688,11 +11640,11 @@ msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik "
 "garanteerida."
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11700,11 +11652,11 @@ msgstr ""
 "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
 "on tõese sõnumiga."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11712,11 +11664,11 @@ msgstr ""
 "Selle sõnumi signatuuri pole võimalik verifitseerida. See võib olla sõnumi "
 "kohaletoimetamise käigus asendatud."
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11724,11 +11676,11 @@ msgstr ""
 "See sõnum on signeeritud korrektse allkirjaga, kuid selle saatjat pole "
 "võimalik verifitseerida."
 
-#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11736,11 +11688,11 @@ msgstr ""
 "See sõnum ei ole krüptitud ja seetõttu võib see interneti kaudu liikudes "
 "olla kolmandatele osapooltele nähtav."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11750,22 +11702,22 @@ msgstr ""
 "olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi sisu "
 "näha."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11774,72 +11726,72 @@ msgstr ""
 "See sõnum on krüptitud tugeva krüptoalgoritmiga. Võimalikul ründajal peaks "
 "olema väga raske mõistliku aja jooksul sõnumi krüpteeringut lahti murda."
 
-#: ../mail/em-format-html-display.c:1037 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vaata sertifikaati"
 
-#: ../mail/em-format-html-display.c:1052
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole kuvatav"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1172
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1180
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1183
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1442
+#: ../mail/em-format-html-display.c:1243
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1244
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1245
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1246
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1864 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: ../mail/em-format-html-display.c:2071
+#: ../mail/em-format-html-display.c:1872
 msgid "Select folder to save all attachments..."
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine..."
 
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:1919
 msgid "_Save Selected..."
 msgstr "_Salvesta valitud..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2185
+#: ../mail/em-format-html-display.c:1986
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d ma_nus"
 msgstr[1] "%d ma_nust"
 
-#: ../mail/em-format-html-display.c:2192 ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
 msgid "S_ave"
 msgstr "_Salvesta"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2004
 msgid "S_ave All"
 msgstr "_Salvesta kõik"
 
-#: ../mail/em-format-html-display.c:2264
+#: ../mail/em-format-html-display.c:2065
 msgid "No Attachment"
 msgstr "Manus puudub"
 
@@ -11853,94 +11805,94 @@ msgstr "Lehekülg %d %d-st"
 msgid "Retrieving `%s'"
 msgstr "`%s' tõmbamine"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Signatuur kehtib kuid saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Viide kaugandmetele (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Viide tundmatutele välistele andmetele (tüüp \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Saatja"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Koopia"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Pimekoopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Postiprogramm"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
@@ -11950,7 +11902,7 @@ msgstr "Uudisegrupid"
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME sõnumit pole võimalik analüüsida: Tundmatu viga"
 
@@ -11966,11 +11918,11 @@ msgstr "Toetamata krüptimistüüp multipart/encrypted sõnumile"
 msgid "Unsupported signature format"
 msgstr "Toetamata allkirjavorming"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "Viga allkirja tõestamisel"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
@@ -11990,7 +11942,7 @@ msgstr "Kord nädalas"
 msgid "Once per month"
 msgstr "Kord kuus"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12002,47 +11954,47 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Uut kataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kausta `%s' pole võimalik kopeerida `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Olemasolevaid postkaste asukohas '%s' pole võimalik läbi vaadata: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Vana POP `%s' hoia-serveris andmeid pole võimalik avada: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 hoia-serveris andmekataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 hoia-serveris `%s' andmeid pole võimalik kopeerida: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Tõrge kohaliku postisalvesti `%s' loomisel: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kohalikku postikausta pole võimalik asukohas `%s' luua: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12059,6 +12011,10 @@ msgstr "Saatjale _vastamine"
 msgid "Reply to _List"
 msgstr "Vasta _postiloendisse"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Ava _viit veebilehitsejas"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Saada uus sõnum aadressil..."
@@ -12071,45 +12027,45 @@ msgstr "_Lisa aadressiraamatusse"
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
 
-#: ../mail/em-subscribe-editor.c:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Kaust"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Seda teadet enam uuesti mitte näidata."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Sõnumifiltrid"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr "sõnum"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:634
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:683
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1167
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
@@ -12118,7 +12074,7 @@ msgstr "Andmed %s-st"
 msgid "Search _Folders"
 msgstr "_Otsikaustad"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Otsikausta allikas"
 
@@ -12151,106 +12107,84 @@ msgid "Composer Window default width"
 msgstr "Redaktoriakna vaikimisi laius"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Vaikimisi kooditabel, milles sõnumeid koostada"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Vaikimisi kooditabel, milles sõnumeid koostada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Vaikimisi kooditabel, millega sõnumeid kuvada"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Vaikimisi kooditabel, millega sõnumeid kuvada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Vaikimisi edastamisstiil"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Redaktoriakna vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Sõnumiakna vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Tellimisdialoogi vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Vastamise vaikimisi laad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Redaktoriakna vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Sõnumiakna vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Tellimisdialoogi vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Õigekirjakontrolli poolt tuvastatud vigade esiletõstmine tippimise ajal."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Prügikaustade tühjendamine programmi sulgemisel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Evolutionist väljumisel kõigi prügikaustade tühjendamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Kursorirežiimi lubamine - siis on kirja lugemisel kursori asukoht näha."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Kursorirežiimi lubamine/keelamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Sõnumiloendi paani kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12258,13 +12192,7 @@ msgstr ""
 "Korraga kümne või enama sõnumi avamise korral kasutaja käest kinnituse "
 "küsimine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-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.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12275,27 +12203,23 @@ msgstr ""
 "andmebaasis kirjeldatud bonobo-vaaturkomponendiga ja seda vaaturit "
 "kasutatakse sisu kuvamiseks."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Viimane kord kui prügikasti tühjendati"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Siltide ja nende värvuste loend"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Aktsepteeritud litsentside loend"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12303,11 +12227,11 @@ msgstr ""
 "Evolutioni sõnumikomponendile teadaolevate kontode loend. Sisaldab "
 "alamkataloogide nimesid kataloogi /apps/evolution/mail/accounts suhtes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Kohandatud päiste ja nende lubamise tingimuste loend."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12316,19 +12240,19 @@ msgstr ""
 "värvus vorminus sõnumeid, kus värvus on kirjeldatud HTML-ile sarnaselt "
 "kuueteistkümnendsüsteemis."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Mime-tüüpide loend bonobo komponendivaaturi kontrolliks"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Aktsepteeritava litsentsiga protokollide nimede loend."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12339,99 +12263,95 @@ msgstr ""
 "ainult kontaktide hulgast tulnud sõnumite puhul 2 - Pildid laaditakse alati "
 "võrgust alla"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Filtrite tegevuste logimine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Filtri tegevuste logimine määratud logifaili."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Filtrite tegevuse logimise logifail"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Filtrite tegevuse logimise logifail."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Sõnumi nähtuks märkimine peale määratud ajapiirangu ületamist"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Sõnumi nähtuks märkimine peale määratud ajapiirangu ületamist."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Tsitaatide märkimine sõnumi eelvaates"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Tsitaatide märkimine sõnumi eelvaates."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Sõnumiakna vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Sõnumiakna vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Sõnumi kuvamise laad (\"tavaline\", \"kõik päised\", \"lähtekood\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Vähim arv päevi prügikasti tühjendamiste vahel töö lõpetamisel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Vähim arv päevi prügikasti tühjendamiste vahel programmi töö lõpetamisel."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Helifail uutest sõnumitest teatamiseks"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Uuest sõnumist teatamise tüüp"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Kinnituse küsimine tühja teema korral"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Kausta puhastamisel kasutaja käest kinnituse küsimine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Teemata sõnumi saatmisel kasutaja käest kinnituse küsimine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Kinnituse küsimine puhastamise korral"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Ainult pimekoopiaga saatmisel kasutaja käest kinnituse küsimine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Korraga kümne või enama sõnumi saatmise korral kasutaja käest kinnituse "
 "küsimine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12439,106 +12359,89 @@ msgstr ""
 "Kinnituse küsimine, kui püütakse saata HTML sõnumit isikule, kes ei soovi "
 "HTML sisuga sõnumeid vastu võtta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat "
 "ega pimekoopa saajat määratud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kinnituse küsimine soovimatu HTML saatmise korral"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-#, fuzzy
-msgid "Prompt while marking multiple messages"
-msgstr "Kinnituse küsimine puhastamise korral"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Tekstis olevate viitade äratundmine ja asendamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Tekstis olevate emotikonide äratundmine ja piltidega asendamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Rämpspostikontrollitestide rakendamine sissetulevatele sõnumitele"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Sõnumite vaikimisi HTML-vormingus saatmine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Sõnumite vaikimisi HTML-vormingus saatmine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Animatsioonide kuvamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Animeeritud piltide kuvamine animatsioonidena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-#, fuzzy
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-#, fuzzy
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Helifail, mida esitatakse uute sõnumite saabumisel."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Kasutaja poolt valitud uuest sõnumist teavitamise tüüp."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Õigekirjakontrolli teostatakse jooksvalt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Tellimisdialoogi vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Tellimisdialoogi vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminali kirjatüüp"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Viimane prügikasti tühjendamise aeg päevades alates epohhi algusest."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Terminali kirjatüüp sõnumikuvas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12550,109 +12453,99 @@ msgstr ""
 "&lt;header enabled&gt; - kui seda päiserida tuleks kuvada, siis on \"enabled"
 "\" määratud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-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:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Sõnumiloendi paigutamine lõimedesse."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Sõnumiloendi paigutamine lõimedesse"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Sõnumiloendi paigutamine lõimedesse Teema alusel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Vaikimisi määratud konto UID string."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Spamassassin'i deemoni ja kliendi kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin'i deemoni ja kliendi (spamc/spamd) kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Kohandatud kirjatüüpide kasutamine sõnumi näitamisel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Ainult kohalike rämpspostitestide kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ainult kohalike (mitte-DNS) rämpspostitestide kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Muutuva laiusega kirjatüüp"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Vaade/Pimekoopia menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Vaade/Pimekoopia menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Vaade/Koopia menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Vaade/Koopia menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Vaade/Kellelt menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Vaade/Kellelt menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Vaade/Postita-kuhu menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Vaade/Postita-kuhu menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Vaade/Vasta-kellele menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Vasta-kellele menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12661,16 +12554,6 @@ msgstr ""
 "järgi paigutamist - seda juhul, kui sõnumite päised ei sisalda In-Reply-To "
 "või References ridu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-#, fuzzy
-msgid "Width of the message-list pane"
-msgstr "Sõnumiloendi paani kõrgus"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-#, fuzzy
-msgid "Width of the message-list pane."
-msgstr "Sõnumiloendi paani kõrgus."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Elm'i andmete importimine"
@@ -12702,15 +12585,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley postkasti vormingus kaustade importija"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Palun oota"
 
@@ -12874,31 +12757,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d lugemata"
 msgstr[1] ", %d lugemata"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Uus e-posti sõnum"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_E-posti sõnum"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Uue e-posti sõnumi loomine"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "_Postikaust"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Uue postikausta loomine"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
@@ -12926,220 +12809,226 @@ msgstr "Ü_lesanne"
 msgid "_Later"
 msgstr "_Hiljem"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "T_uvasta toetatavad liigid"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Käesolev Evolition ehitatud ilma SSL'i toeta</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>All_kirjad</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Keeled</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>See teeb filtri usaldusväärsemaks aga ka aeglasemaks</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Konto andmed</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentimise liik</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentimine</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sõnumite koostamine</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Sätted</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Vaikimisi käitumine</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Kirjade kustutamine</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Kuvatavad _kirjapäised</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filtri valikud</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Sildid ja värvid</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Piltide laadimine</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Sõnumikuva</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Sõnumi saajad</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Uutest sõnumitest teatamine</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Mittekohustuslikud andmed</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Valikud</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Prinditud kirjatüübid</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Kohustuslikud andmed</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Turvaline MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Turvalisus</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Saadetud sõnumid ja mustandid</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serveri sätted</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Lisa _uus allkiri..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Lisa _skript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Alati koopia saatmine (cc):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alati _pimekoopia saatmine (bcc):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Minu võtmerõngas olevad võtmed _usaldatakse alati"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Krüptitud sõnumi saatmisel krüptida alati ka _enda jaoks"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Algupärane sõnum manustatakse"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Automaatne _emotikonipiltide lisamine"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "Uue sõnumi saabumisel piiksutakse"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "_Märgistik:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastus"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Sissetuleva posti _rämpsukontroll"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Õigekirja kon_trollimine sisestamise ajal"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sissetulevate sõnumite seest rämpsu kontrollimine"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Puhasta"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "_Puhasta"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Värvus õigekirjakontrolli probleemsetele sõnade jaoks:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Värvid"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Enne kataloogi puhastamist küsitakse kinnitust"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13155,134 +13044,134 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Rakenda\"."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "_Vaikekodeering:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Algupärast sõnumit ei tsiteerita"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Mustan_dite kaust:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "_Lubamine"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-posti kontod"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-posti _aadress:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Väljumisel tühjendatakse _prügikaustad"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Krüptimissertifikaat:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Väljuvate sõnumite _krüptimine (vaikimisi)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Fi_kseeritud laiusega kirjatüüp:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fi_kseeritud-laiusega:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Kirjatüübi omadused"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Sõnumite vormindamine _HTML-is"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "Täis_nimi:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML post"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Päised"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Tsitaate rõhutatakse"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "Väliste testide _kaasamine"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Samal joonel"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Keeltetabel"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "E-posti seadistused"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Sõnumipäiste tabel"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Postkasti asukoht"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Märkus: parooli ei küsita enne kui esimesel ühendumisel"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "_Organisatsioon:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _võtme ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Uue sõnumi saabumisel esitatakse helifaili"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13290,7 +13179,7 @@ msgstr ""
 "Palun siselda seda kontot kirjeldav nimi allolevasse kasti.\n"
 "Seda nime kasutatakse ainult kuvamiseks."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13299,7 +13188,7 @@ msgstr ""
 "siia sisestada, küsi oma lisateavet oma süsteemiülemalt või interneti "
 "teenusepakkujalt."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13309,117 +13198,117 @@ msgstr ""
 "Mittekohustuslikud väljad võib täita siis, kui sa soovid nendes väljades "
 "olevaid andmeid lisada enda saadetud sõnumitesse."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Palun vali järgnevate valikute vahel"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Kinni_tuse küsimine ainult pimekoopias olevate adressaatidega varustatud "
 "sõnumi saatmise puhul"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Tsiteeritakse algupärast sõnumit"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Parool jäetakse meelde"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Vasta-kellele:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Parool jäetakse _meelde"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "_Vali..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "Tavaline ki_rjatüüp:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "V_ali..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "Vali HTML fikseeritud laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "Vali trükkimise jaoks HTML fikseeritud laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "Vali HTML muutuva laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "Vali trükkimise jaoks HTML muutuva laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "Helifaili valimine"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "E-posti saatmine"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "Serveri l_iik:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "All_kirjastamissertifikaat:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "All_kiri:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Allkirjad"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Allkirjatabel"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_Faili nimi:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "Lii_k:"
 
-#: ../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."
@@ -13427,7 +13316,7 @@ msgstr ""
 "Siinolev keelteloend kajastab ainult keeli, millede jaoks on sõnastik "
 "paigaldatud."
 
-#: ../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"
@@ -13436,7 +13325,7 @@ msgstr ""
 "Selle skripti väljundit kasutatakse sinu signatuurina.\n"
 "Nimevälja kasutatakse ainult kuvamiseks."
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13444,15 +13333,15 @@ msgstr ""
 "Sisesta nimi, millega sa soovid sellele kontole viidata.\n"
 "Näiteks: \"Isiklik\" või \"Tööasjad\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Muutuva laiusega:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13462,72 +13351,68 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Edasi\"."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "Allkirja _lisamine"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Internetis asuvad pildid laaditakse alati"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Uutest sõnumitest ei teavitata"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Koosolekupäringuid ei _signeerita (Outlookiga ühilduvuse tarbeks)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Edastamise laad:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "Pildid _laaditakse kontaktide poolt saadetud sõnumites"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "See konto on _määratud minu vaikimisi kontoks"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "Sõnum _märgitakse loetuks peale"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "Internetist ei laadita _kunagi ühtegi pilti"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Rada:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Kinnituse küsimine HTML-sõnumi saatmisel kontakti(de)le, kes seda ei soovi"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Kinnituse küsimine ilma _teemata sõnumi saatmise korral"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Vastamise stiil:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skript:"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "_Pildianimatsioonide näitamine"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "Kellele / Koopia / Pimekoopia välju vähendatakse"
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "Tu_rvalise ühenduse kasutamine:"
@@ -13537,21 +13422,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "Teiste rakendustega sama kirjatüübi _kasutamine"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "aadressini"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "värvusega"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "kirjeldus"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Otsikausta allikad</b>"
@@ -13565,114 +13442,113 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Krüptimine</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Kõik aktiivsed võrgukaustad"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Kõik kohalikud kaustad ja aktiivsed võrgukaustad"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Kõik kohalikud kaustad"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "_Tõstutundlik"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Lõpetatud"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
-msgstr "Ot_sing:"
+msgstr "_Otsing:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Märgi jälgimiseks"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Kaustade tellimused"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Kasutustingimused"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Ühtegi pole valitud"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Turvalisuse andmed"
 
-#: ../mail/mail-dialogs.glade.h:19
-#, fuzzy
-msgid "Specific folders"
-msgstr "ainult kirjeldatud kaustad"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Nõustu kasutustingimustega"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Tähtaeg:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Silt:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Telli"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
 
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "ainult kirjeldatud kaustad"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "koos kõigi aktiivsete võrgukaustadega"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "koos kõigi kohalike kalatoogidega"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Kausta filtreerimine"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Tõrge väljundfiltrite rakendamisel: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13681,114 +13557,123 @@ msgstr ""
 "Tõrge kausta %s lisamisel: %s\n"
 "Selle asemel lisatakse kausta `Saadetud'."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Tõrge lisamisel kohalikku `Saadetud' kausta: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Tõrge sõnumi %d saatmisel (kokku %d)"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Tühistatud."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite tõstmine kausta %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Hoidla %s avamine"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtmine"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, 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:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d sõnumi salvestamine"
 msgstr[1] "%d sõnumi salvestamine"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Väljundfaili pole võimalik luua: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13797,11 +13682,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2090
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2102
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13810,69 +13695,60 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2112
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid pole võimalik kirjutada: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2262
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2262
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2378
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Tühistamine..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Posti saatmine ja vastuvõtmine"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "Tühista _kõik"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Ootamine..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Parooli sisestamine %s jaoks"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Parooli sisestamine"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:681
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Parooli sisestamine"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
@@ -13928,11 +13804,11 @@ msgstr "'%s:%s' otsikaustade uuendamine"
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' otsikaustade uuendamine"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Otsikausta redigeerimine"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Uus otsikaust"
 
@@ -13947,20 +13823,20 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"quit.\n"
 msgstr ""
 "Asukohas &quot;{1}&quot; on täidetud kaust juba olemas.\n"
 "\n"
 "Sa võid seda kausta eirata, üle kirjutada, selle sisule lisada või toimingu "
-"lõpetada."
+"lõpetada.\n"
 
-#: ../mail/mail.error.xml.h:5
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
@@ -13968,7 +13844,7 @@ msgstr ""
 "Signatuur nimega &quot;{1}&quot; on juba olemas. Palun kasuta teistsugust "
 "nime."
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13976,24 +13852,24 @@ msgstr ""
 "Sõnumile mõtestatud teemarea lisamine annab sõnumi vastuvõtjatele aimu "
 "sõnumi sisu kohta."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot ja kõiki selle proksisid?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Kas sa soovid keelata seda kontot ja kustutada kõik selle proksid?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Oled sa kindel, et soovid korraga avada {0} sõnumit?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14001,7 +13877,7 @@ msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest "
 "kaustadest?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -14009,81 +13885,81 @@ msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast "
 "&quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "Kuna &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "Kuna &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Tühi allkiri"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Otsikausta &quot;{0}&quot; pole võimalik lisada."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kopeerida &quot;{1}&quot; kausta."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Salvestuskataloogi pole võimalik luua, sest &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Otsikausta &quot;{0}&quot; pole võimalik redigeerida, kuna seda pole olemas."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik tõsta &quot;{1}&quot; kausta."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Allikat &quot;{1}&quot; pole võimalik avada"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Allikat &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Sihtkohta &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14093,31 +13969,31 @@ msgstr ""
 "paigaldusprobleemiga. Sul pole seda tagajat võimalik enne "
 "litsentsitingimustega nõustumist pruukida."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; pole võimalik &quot;{1}&quot;-ks ümber nimetada."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik ümber nimetada ega tõsta."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Kataloogi &quot;{0}&quot; alla pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Faili &quot;{0}&quot; pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Signatuuriskripti &quot;{0}&quot; pole võimalik määrata."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14126,71 +14002,71 @@ msgstr ""
 "tõstutundlikud, siis veendu, et klaviatuuri \"Caps Lock\" klahv ei oleks "
 "sisse lülitatud."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "Signatuurifaili pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Kustutada &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "Kustutada konto?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Discard changes?"
 msgstr "Kas hüljata muudatused?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Ära kustuta"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Ära keela"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Kas sa soovid seda operatsiooni teostada ka alamkaustades?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Kas soovid märkida kõiki sõnumeid loetuks?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Sisesta parool."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Viga käsu täitmisel."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "Viga toimingul: {0}."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "Fail on juba olemas, kuid seda pole võimalik üle kirjutada."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "Fail on juba olemas, aga see ei ole tavaline fail."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Kui sa jätkad, siis neid sõnumeid ei ole võimalik enam taastada."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14198,11 +14074,11 @@ msgstr ""
 "Kui sa selle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
 "sõnumid ja alamkaustad."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Kui sa seda teed, siis kõik proksi kontod kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14210,11 +14086,11 @@ msgstr ""
 "Kui sa seda teed, siis konto ja kõik proksi\n"
 "andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Kui sa seda teed, siis konto andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14222,19 +14098,19 @@ msgstr ""
 "Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa "
 "Evolutioni uuesti käivitad."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "Vigane autentimine"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "Postifiltrid automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14242,35 +14118,35 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read"
 msgstr "Kõigi sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Mark all messages as read in the selected folder"
 msgstr "Kõigi valitud kataloogis olevate sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Puuduv kaust."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Ühtegi allikat pole valitud."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ühekorraga paljude sõnumite avamisele võib kuluda kaua aega."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Palun kontrolli oma kontosätteid ja proovi uuesti."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14278,7 +14154,7 @@ msgstr ""
 "Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad "
 "nupule \"Kellele:\"."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14290,56 +14166,55 @@ msgstr ""
 "{0}\n"
 "Kas saata?"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Palun sisesta selle signatuuri identifitseerimiseks unikaalne nimi."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Palun oota."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probleem vana postikausta &quot;{0}&quot; migreerimisel."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Serverist pärimine"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serverilt autentimismehhanismide loendi küsimine."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Küsitakse lugemiskinnitust."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Kas tõesti kustutada kaust &quot;{0}&quot; ja selle kõik alamkaustad?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Otsikaustad automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "Allkiri on juba olemas"
 
-#: ../mail/mail.error.xml.h:89
-#, fuzzy
+#: ../mail/mail.error.xml.h:90
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
 "pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14349,7 +14224,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14363,7 +14238,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Otsikaustad on nüüd uuendatud."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14377,29 +14252,37 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Reeglid on nüüd uuendatud."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
+msgid ""
+"The message was sent via the &quot;sendmail&quot; external application. "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "Skriptifail peab olemas olema ja peab olema käivitatav."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Seda sõnumit pole võimalik saata kuna adressaadi konto pole lubatud"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Seda sõnumit pole võimalik saata kuna sa pole määranud ühtegi adressaati"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14407,11 +14290,11 @@ msgstr ""
 "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
 "autentimist üleüldse."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14419,144 +14302,148 @@ msgstr ""
 "Kõigi valitud kataloogis ja selle alamkataloogides olevate sõnumite "
 "loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "Kasuta _vaikekodeeringut"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua kahte sama nimega kontot."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Sa pead sellele otsikaustale nime andma."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Tõrge serverisse &quot;{0}&quot; sisselogimisel kasutajana &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+msgstr "Sinu sõnumit teemaga &quot;{0}&quot; ei toimetatud kohale."
+
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "_Lisa"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "_Hülga muudatused"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "_Ava sõnumid"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Nähtud"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Vastatud"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Alumine"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Kõrge"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Sõnumid"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3441
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
 
@@ -14576,15 +14463,15 @@ msgstr "Tähistatud"
 msgid "Follow Up Flag"
 msgstr "Jälgimise silt"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Algne asukoht"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Vastuvõetud"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Saadetud sõnumid"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Suurus"
@@ -14732,10 +14619,6 @@ msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Aa_dressiraamatu kirjete automaatne loomine sõnumile vastamisel"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "Vali automaatsetele kontaktidele aadressiraamat"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "Kiirsuhtluse kontaktid"
@@ -14747,10 +14630,6 @@ msgid ""
 msgstr ""
 "Kontaktandmete ja piltide perioodiline sünkroniseerimine gaim'i sõbraloendiga"
 
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "Vali GAIM-i sõbraloendile aadressiraamat"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -14859,6 +14738,10 @@ msgstr ""
 "Testplugin asjade lõikelauale kopeerimise hüpikmenüü plugina "
 "demonstreeriseks."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopeeri _e-posti aadress"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Kopeerimisvahend"
@@ -15004,24 +14887,24 @@ msgstr "Kausta suurus"
 msgid "Exchange Settings"
 msgstr "Exchange sätted"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "A_utentimine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "Autentimise liik"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "_Tuvasta toetatud tüübid"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-calendar.c:192
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15061,15 +14944,13 @@ msgstr "Uus parool:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Sinu käesolev parool on aegunud. Palun vaheta nüüd oma parool ära."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:633
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Su parool aegub järgneva %d päeva jooksul"
 
-#. 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
 msgid "Custom"
 msgstr "Kohandatud"
 
@@ -15187,7 +15068,7 @@ msgstr "Kausta nimi"
 msgid "Folder Size"
 msgstr "Kausta suurus"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Teise kasutaja kausta tellimine"
@@ -15202,14 +15083,14 @@ msgstr "Exchange kirjakaustade puu"
 msgid "Unsubscribe Folder..."
 msgstr "Lõpeta kausta tellimus..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Kas tõesti loobuda kausta \"%s\" tellimusest?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" tellimusest loobumine"
@@ -15242,59 +15123,59 @@ msgstr "Lisa kasutaja:"
 msgid "Add User"
 msgstr "Kasutaja lisamine"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Õigused</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Ei tohi kustutada"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Ei tohi muuta"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Tohib luua kirjeid"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Tohib luua alamkaustu"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Tohib kustutada ükskõik mis kirjet"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Tohib kustutada enda kirjeid"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Tohib muuta ükskõik mis kirjet"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Tohib muuta enda kirjeid"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Kausta kontakt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Kausta omanik"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Kaust on nähtaval"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Tohib lugeda kirjeid"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Roll: "
 
@@ -15334,27 +15215,22 @@ msgid "Cannot display folders."
 msgstr "Kaustu pole võimalik kuvada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Toimingut pole võimalik teostada."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-#, fuzzy
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
 "Exchange konto sätete muudatused rakenduvad peale Evolutioni sulgemist ja "
 "taaskäivitamist."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Serverisse pole võimalik autentida."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Parooli pole võimalik muuta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15363,55 +15239,55 @@ msgstr ""
 "Tundmatu vea tõttu pole Exchange kontot võimalik seadistada. Kontrolli URL-"
 "i, kasutajanime ning parooli ja proovi uuesti."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Exchange serveriga pole võimalik ühenduda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Serveriga {0} pole võimalik ühenduda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Kataloogi pääsuõiguseid delegaatidele pole võimalik tuvastada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Exchange Web Storage System'i pole võimalik leida."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Serveri {0} asukohta pole võimalik tuvastada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "{0} pole võimalik delegaadiks määrata"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Kausta pääsuõiguseid pole võimalik lugeda"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Kausta pääsuõiguseid pole võimalik lugeda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Kausta pääsuõiguseid pole võimalik uuendada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Exchange konto on autonoomses režiimis."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15427,28 +15303,28 @@ msgid ""
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Tõrge delegaatide uuendamisel:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Kaust on juba olemas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Kataloogi pole olema"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Kataloog pole võgus"
 
-#: ../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:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Üldine viga"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15456,64 +15332,63 @@ msgstr ""
 "Kui OWA töötab teise raja peal, siis pead sa selle määrama kontosätete "
 "dialoogis."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0} postkast pole selles serveris."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Veendu, et URL on õige ja proovi uuesti."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr "Veendu, et kasutajanimi ja parool on õiged ning proovi uuesti."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Selle konto jaoks pole globaalset kataloogiserverit seadistatud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Kasutajat {0} pole olemas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Parool on edukalt muudetud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-#, fuzzy
-msgid "Please restart Evolution for changes to take effect"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
 msgstr "Palun taaskäivita Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Palun vali kasutaja."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Server lükkas parooli tagasi kuna see on liiga nõrk."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange konto keelatakse, kui sa sulged Evolutioni"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange konto eemaldatakse, kui sa sulged Evolutioni"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange server pole Exchange Connector'iga ühilduv."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15521,7 +15396,7 @@ msgstr ""
 "Serveris töötab Exchange 5.5. Exchange Connector, mis\n"
 "toetab ainult Microsoft Exchange versioone 2000 ja 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15530,55 +15405,55 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Proovi uuesti teistsuguse parooliga."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Kasutajat pole võimalik pääsuõiguste loendisse lisada:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Delegaate pole võimalik redigeerida."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Tundmatu viga {0} lahendamisel"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Tundmatu viga."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Tundmatu tüüp"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Toetamata toiming"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Sa oled lähedal mahupiirangu ületamisele, mis sulle selles serveris e-posti "
 "hoidmiseks ette on nähtud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Ennast pole enda delegaadiks võimalik teha"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Sa oled ületanud mahupiirangu, mis sulle selles serveris e-posti hoidmiseks "
 "ette on nähtud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Sul on võimalik seadistada üksikut Exchange kontot."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15586,7 +15461,7 @@ msgstr ""
 "Sinu praegune kasutatav maht on {0} KB. Proovi mõnede sõnumite kustutamise "
 "abil vaba ruumi juurde teha."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -15594,7 +15469,7 @@ msgstr ""
 "Sinu praegune kasutatav maht on {0} KB. Hetkel pole sul võimalik sõnumeid "
 "saata ega vastu võtta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15603,19 +15478,19 @@ msgstr ""
 "vastu võtta enne, kui sa pole mõne sõnumi kustutamise abil omale vaba ruumi "
 "juurde loonud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Su parool on aegunud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} on juba delegaat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} on juba loendis"
 
@@ -15640,7 +15515,7 @@ msgstr "Sõnumikaustade tellimise lubamine kaustapuu kontekstimenüüst."
 msgid "Unsubscribe Folders"
 msgstr "Lõpeta kausta tellimus"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
@@ -15803,24 +15678,21 @@ msgstr "Proksi sisselogimine"
 
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy.c:502
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPalun sisesta %s parool (kasutaja %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:505
 msgid "_Proxy Login..."
 msgstr "_Proksi sisselogimine..."
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proksi sakk on saadaval ainult juhul, kui konto on võrku ühendatud."
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proksi sakk on saadaval ainult juhul, kui konto on lubatud."
 
@@ -15860,25 +15732,25 @@ msgstr "_Impordi kalendrisse"
 msgid "_Import to Tasks"
 msgstr "_Impordi ülesannetesse"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:198
+#: ../plugins/import-ics-attachments/icsimporter.c:197
 msgid "Import ICS"
 msgstr "Impordi ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:226
+#: ../plugins/import-ics-attachments/icsimporter.c:225
 msgid "Select Task List"
 msgstr "Ülesandeloendi valimine"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:230
+#: ../plugins/import-ics-attachments/icsimporter.c:229
 msgid "Select Calendar"
 msgstr "Kalendri valimine"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Impordi"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iKalendri vorming (.ics)"
 
@@ -15929,102 +15801,102 @@ msgstr "Kalendrit/ülesandeid pole võimalik avada!"
 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:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Tõrge kalendri '%s' laadimisel"
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Sündmus leiti kalendrist '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Ühtegi kalendrit pole võimalik leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kalendrist pole võimalik ühtegi kohtumist leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Ülesannete loendist pole võimalik ühtegi ülesannet leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Kirjet pole võimalik analüüsida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kirjet pole võimalik kalendrisse '%s' saata. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Saadetud kalendrisse '%s' kui aktsepteeritud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Saadetud kalendrisse '%s' kui katseline"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Saadetud kalendrisse '%s' kui keeldutud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Saadetud kalendrisse '%s' kui tühistatud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Korraldaja eemaldas delegaadi %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegaadile saadeti tühistusteade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Delegaadile pole võimalik tühistusteadet saata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Osaleja olekut pole võimalik uuendada, kuna selle olek on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Osalejat pole võimalik uuendada. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Osaleja olek uuendatud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Manuses olev kalender on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16032,15 +15904,15 @@ msgstr ""
 "Sõnum sisaldab kalendrit, kuid kalender see kalender pole korrektses "
 "iCalendar vormingus."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Kalendris olev kirje on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16048,11 +15920,11 @@ msgstr ""
 "Sõnum sisaldab kalendrit, kuid kalender ei sisalda sündmusi, ülesandeid ega "
 "vaba/hõivatud andmeid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Manuseks olev kalender sisaldab mitut kirjet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16062,24 +15934,23 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "Sõnumi _kustutamine peale tegevuse läbiviimist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Vastuolude otsimine"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Vali kalendrid, millest tuleb koosolekute vastuolusid otsida"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Täna"
 
@@ -16420,26 +16291,26 @@ msgid "_Update"
 msgstr "_Uuenda"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Algus:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Lõpp:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Kommentaar:"
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "_Uuenduste saatmine osalejatele"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "_Rakenda kõigile instantsidele"
 
@@ -16454,10 +16325,10 @@ msgstr "Itip vormindaja"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; delegeeris koosoleku. Kas sa soovid lisada delegaati &quot;"
-"{1}&quot;?"
+"{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16545,14 +16416,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Valitud sõnumi teisendamine uueks ülesandeks"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Võta postilendi _omanikuga ühendust"
 
 #: ../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 "Hangi postilendi _arhiiv"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "_Hangi postilendi kasutusteave"
 
@@ -16573,14 +16447,17 @@ msgstr ""
 "Üldiste postiloendikäskude (tellimine, tellimusest loobumine) tagamine."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Sõnumi saatmine loendisse"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Telli postiloend"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Lõpeta postiloendi tellimus"
 
@@ -16648,30 +16525,15 @@ msgstr "_Redigeeri sõnumit"
 msgid "_Send message"
 msgstr "_Saada sõnum"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
-msgid "Contact List _Owner"
-msgstr "Võta postilendi _omanikuga ühendust"
-
 #: ../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 "Ühenduse võtmine postiloendi omanikuga"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-#, fuzzy
-msgid "Get List _Archive"
-msgstr "Hangi postilendi _arhiiv"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-#, fuzzy
-msgid "Get List _Usage Information"
-msgstr "_Hangi postilendi kasutusteave"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
@@ -16687,28 +16549,12 @@ msgstr "Postiloendi, kust see sõnum pärit on, tellimine"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Postiloendi, kust see sõnum pärit on, tellimusest loobumine"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
-msgid "_Post Message to List"
-msgstr "_Sõnumi saatmine loendisse"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
-msgid "_Subscribe to List"
-msgstr "_Telli postiloend"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
-msgid "_Unsubscribe from List"
-msgstr "\"%s\" tellimusest loobumine"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Kõigi loetuksmärkimine"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-#, fuzzy
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Märgi sõnumid _loetuks"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -16864,7 +16710,7 @@ msgstr "Asukohad"
 msgid "_Publish Calendar Information"
 msgstr "_Publitseeri kalendri andmed"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:386
 msgid "Are you sure you want to remove this URL?"
 msgstr "Oled sa kindel, et soovid eemaldada seda URL-i?"
 
@@ -16967,16 +16813,16 @@ msgstr "Salvesta manused..."
 msgid "Save all attachments"
 msgstr "Kõikide manuste salvestamine"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME tüüp"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Salvesta"
 
@@ -17086,7 +16932,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF vorming (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Sihtfaili valimine"
 
@@ -17134,19 +16980,19 @@ msgstr ""
 "\n"
 "Jätkamiseks klõpsa palun \"Edasi\" nuppu. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige andmed, mida soovid importida:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Andmete importimine."
 
@@ -17200,47 +17046,39 @@ msgid "Default window height"
 msgstr "Akna vaikimisi kõrgus"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-msgid "Default window state"
-msgstr "Akna vaikimisi olek"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Akna vaikimisi laius"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Käivitamisel vaikimisi näidatava komponendi ID või alias."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "Viimati uuendatud seadistuste versioon"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Autonoomses režiimis kettale sünkroniseeritavate kaustade radade loend"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "Printeri sätted"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Sidebar is visible"
 msgstr "Külgpaan on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:470
 msgid "Start in offline mode"
 msgstr "Alustamine autonoomses režiimis"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Olekuriba on nähtav"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17248,19 +17086,19 @@ msgstr ""
 "Evolutioni viimati uuendatud seadistuste versioon kujul major/minor/"
 "configuration (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "Peaakna vaikimisi kõrgus pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "Peaakna vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "Külgpaani vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17269,7 +17107,7 @@ msgstr ""
 "configuration, kus major on peamine versioon, minor alamversioon ja "
 "configuration seadistuste versioon (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17279,44 +17117,36 @@ msgstr ""
 "ikoonide, \"both\" nii tekstinuppude kui ikoonide jaoks ja \"toolbar\" "
 "juhuks, kui nuppude laad tuletatakse GNOME tööriistariba sätetest."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "Tööriistariba on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Millal Evolution alustab võrgurežiimi asemel autonoomses režiimis."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether or not the window should be maximized."
-msgstr "Millal aken peaks maksimeeritud olema ja millal mitte."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether the sidebar should be visible."
 msgstr "Millal külgpaan peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Millal olekuriba peaks nähtav olema."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "Millal tööriistariba peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "Millal aknanupud peaksid nähtavad olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "Aknanupu stiil"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "Aknanupud on nähtavad"
 
@@ -17339,11 +17169,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17358,11 +17188,11 @@ msgstr ""
 "Kui Sa ole veendunud, et Evolution tunneb faili\n"
 "ise ära, siis võid failitüübiks valida \"Automaatne\"."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17374,23 +17204,23 @@ msgstr ""
 "ühtegi imporditavat seadistusfaili. Kui sa soovid veel proovida,\n"
 "siis vajuta \"Tagasi\" nuppu.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Failinimi:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Faili _tüüp:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Andmete ja seadistuste importimine _vanematest programmidest"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
@@ -17438,7 +17268,7 @@ msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:561
+#: ../shell/e-shell-window-commands.c:530
 msgid "translator-credits"
 msgstr ""
 "Ilmar Kerm <ikerm@hot.ee>, 2001.\n"
@@ -17446,73 +17276,68 @@ msgstr ""
 "Kaarel Jõgi <kaarel@gg.ee>, 2002.\n"
 "Priit Laes <amd@store20.com>, 2003-2005."
 
-#: ../shell/e-shell-window-commands.c:806
+#: ../shell/e-shell-window-commands.c:775
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: ../shell/e-shell-window-commands.c:832
+#: ../shell/e-shell-window-commands.c:801
 msgid "Work Offline"
 msgstr "Siirdumine autonoomsesse olekusse"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks "
 "klõpsa seda nuppu."
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirdub autonoomsesse olekusse."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution on hetkel autonoomses olekus.  Võrku ühendumiseks klõpsa seda "
 "nuppu."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "Ümberlülitumine vaatele \"%s\""
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Tundmatu süsteemne viga."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "Olgu"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "OAF'i pole võimalik registreerida"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Ei leia seadistuste andmebaasi"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Uus"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Uus "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Uus test"
@@ -17564,7 +17389,7 @@ msgstr ""
 "importid aväliseid faile Evolutioni keskkonda."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:230
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17584,7 +17409,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:257
+#: ../shell/main.c:254
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17592,7 +17417,7 @@ msgstr ""
 "Täname,\n"
 "Evolutioni meeskond\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:261
 msgid "Do not tell me again"
 msgstr "Enam uuesti mitte näidata"
 
@@ -17621,10 +17446,6 @@ msgid "Disable loading of any plugins."
 msgstr "Kõigi pluginate laadimise keelamine."
 
 #: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolutioni e-posti ja isikliku teabehalduse klient"
-
-#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18045,7 +17866,7 @@ msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "Sertifikaat on juba olemas."
 
@@ -18277,12 +18098,6 @@ msgstr "Ko_peeri kõik kontaktid asukohta..."
 msgid "Contact _Preview"
 msgstr "Kontakti _eelvaade"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopeeri"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopeeri valitud kontaktid teise kausta..."
@@ -18384,7 +18199,7 @@ msgid "Select All"
 msgstr "Vali kõik"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
@@ -18454,7 +18269,7 @@ msgstr "_Tõsta kontaktid asukohta..."
 msgid "_Move Folder Contacts To"
 msgstr "_Tõsta kausta kontaktid asukohta"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Uus"
 
@@ -18515,7 +18330,6 @@ msgid "Month"
 msgstr "Kuu"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Järgmine"
 
@@ -18524,7 +18338,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Prinditava kalendri eelvaatlemine"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Eelmine"
 
@@ -18612,11 +18426,11 @@ msgstr "Valitud teksti lõikamine lõikelauale"
 msgid "Paste from clipboard"
 msgstr "Lõikepuhvri sisu asetamine"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Kogu teksti valimine"
 
@@ -18651,31 +18465,30 @@ msgstr "Saadaoleva abiteabe vaatamiseks klõpsa siia"
 msgid "Close"
 msgstr "Sulge"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Lisa"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Manus..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Sul_ge"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Fail"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Abi"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Lisa"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Valikud"
@@ -18773,11 +18586,6 @@ msgstr "Aja kui hõivatud aja välja kuvamise sisse- ja väljalülitamine"
 msgid "_Alarms"
 msgstr "_Alarmid"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategooriad"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18843,75 +18651,53 @@ msgid "F_older"
 msgstr "Ka_ust"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Sõnumi _eelvaade"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Valitud kausta tõstmine teise kausta alla"
 
 #. 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 "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Kaustade _otsimine"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Näita sõnumi _eelvaadet"
-
 #: ../ui/evolution-mail-global.xml.h:14
-#, fuzzy
-msgid "Show message preview below the message list"
-msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
-
-#: ../ui/evolution-mail-global.xml.h:15
-#, fuzzy
-msgid "Show message preview side-by-side with the message list"
-msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Sõnumi eelvaateakna näitamine"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Kaugserveris olevate kaustade tellimine või tellimusest loobumine"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Klassikaline vaade"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Kopeeri kaustad asukohta..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Sõnumif_iltrid"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Tõsta kaustad asukohta..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Uus..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Eelvaade"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Tellimused"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "_Vertikaalne vaade"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Kausta nime muutmine"
@@ -19471,11 +19257,6 @@ msgid "_Unread"
 msgstr "_Lugemata"
 
 #: ../ui/evolution-mail-message.xml.h:131
-#, fuzzy
-msgid "_Zoom"
-msgstr "_Suurenda"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Suurenda"
 
@@ -19483,7 +19264,7 @@ msgstr "_Suurenda"
 msgid "Close this window"
 msgstr "Akna sulgemine"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
@@ -19558,6 +19339,11 @@ msgstr ""
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Lisa"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Ava fail"
@@ -19887,52 +19673,43 @@ msgstr "_Ikoonid ja tekst"
 msgid "Import data from other programs"
 msgstr "Andmete importimine teistest programmidest"
 
-#: ../ui/evolution.xml.h:16
-#, fuzzy
-msgid "La_yout"
-msgstr "_Programmist lähemalt"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Uus _aken"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Eelistused"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Saatmine ja vastuvõtmine"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Saada / _võta vastu"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Järjekorras olevate sõnumite ärasaatmine ja uute vastuvõtmine"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Pilot'i sätete määramine"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Evolutioni kohta teabe näitamine"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Näita _külgpaani"
+msgid "Side _Bar"
+msgstr "_Külgpaan"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Näita _olekuriba"
+msgid "Status _Bar"
+msgstr "_Olekuriba"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Näita _tööriistariba"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Evolutioni kohta teabe näitamine"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
@@ -19940,71 +19717,75 @@ msgstr "Saada veateade"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Veateate saatmine Bug Buddy abil"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Autonoomse režiimi sisse- või väljalülitamine"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "_Tööriistariba"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Tööriistariba _stiil"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Külgpaani näitamine/peitmine"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Olekuriba näitamine/peitmine"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Programmist lähemalt"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Sulge aken"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Unusta _paroolid"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Peida nupud"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Ainult _ikoonid"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Välkjuhend"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Välju"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_Sünkroniseerimisvalikud..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Ainult _tekst"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Aken"
 
@@ -20041,36 +19822,26 @@ msgid "_Work Week View"
 msgstr "_Töönädala vaade"
 
 #: ../views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As Sent Folder for Wi_de View"
-msgstr "Saadetud _sõnumite kaustana"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Saadetud _sõnumite kaustana"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "_Oleku järgi"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "_Saatja järgi"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "_Teema järgi"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "_Jälgimise sildi järgi"
 
-#: ../views/mail/galview.xml.h:7
-#, fuzzy
-msgid "For _Wide View"
-msgstr "Töönädala vaade"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Sõnumid"
 
@@ -20086,12 +19857,8 @@ msgstr "_Tähtajaga"
 msgid "With _Status"
 msgstr "_Staatusega"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20146,7 +19913,7 @@ msgid "_Edit..."
 msgstr "_Redigeeri..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1839
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20160,11 +19927,11 @@ msgstr "Instants"
 msgid "Save Current View"
 msgstr "Salvesta käesolev vaade"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "_Loo uue vaade"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Asenda olemasolev vaade"
 
@@ -20211,19 +19978,14 @@ msgstr "Vaate liik"
 msgid "Type of view:"
 msgstr "Vaate liik:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Manuse automaatkuvamise soovitamine"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20276,26 +20038,26 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3014
 msgid "Minimum width"
 msgstr "Vähim laius"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum Width"
 msgstr "Vähim laius"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Jaotus"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Praegu"
 
@@ -20397,7 +20159,7 @@ msgstr "Muu..."
 
 #: ../widgets/misc/e-charset-picker.c:482
 msgid "Ch_aracter Encoding"
-msgstr "K_ooditabel"
+msgstr ""
 
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
@@ -20423,129 +20185,105 @@ msgstr "Valikukast aja valimiseks"
 msgid "Time"
 msgstr "Aeg"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "_Praegu"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Täna"
-
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Laiendatud"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Kas laiendaja on laiendatud või mitte"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Laiendaja sildi tekst"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Sildividin"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Laiendaja suurus"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Laienduse noole suurus"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikaatorivahe"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Ruum laiendaja noole ümber"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Salvesta otsing"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Otsingud"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Otsingud"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Salvesta otsing"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Laiendatud otsing..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Kõigist kontodest"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Käesolevast kontost"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Käesolevast kaustast"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Käesolevast sõnumist"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Vali pilt"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Maailmakaart"
 
-#: ../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."
@@ -20565,64 +20303,64 @@ msgstr "Isiklike kirjete sünkroniseerimine"
 msgid "Sync Categories:"
 msgstr "Katekooriate sünkroniseerimine:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Empty message"
 msgstr "Tühi sõnum"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
 msgid "Reflow model"
 msgstr ""
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
 msgid "Column width"
 msgstr "Veeru laius"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Otsing"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: ../widgets/misc/e-search-bar.c:787
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Otsingu tüüp"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Kirje ID"
 
-#: ../widgets/misc/e-search-bar.c:794 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "Alamkirje ID"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Tekst"
 
-#. 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:913
-msgid "Show: "
-msgstr "Näita:"
-
-#. 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:929
-msgid "S_earch: "
-msgstr "Ot_sing: "
-
-#. 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:940
-msgid " in "
-msgstr " "
-
-#: ../widgets/misc/e-selection-model-array.c:547
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "_Otsing"
+
+#: ../widgets/misc/e-selection-model-array.c:546
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "Kursori rida"
 
-#: ../widgets/misc/e-selection-model-array.c:554
+#: ../widgets/misc/e-selection-model-array.c:553
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "Kursori veerg"
@@ -20813,23 +20551,23 @@ msgstr "Fokusseeritud veerg"
 msgid "Unselected Column"
 msgstr "Valimata veerg"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1744
 msgid "Strikeout Column"
 msgstr "Läbikriipsutatud veerg"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1751
 msgid "Underline Column"
 msgstr "Allajoonitud veerg"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1758
 msgid "Bold Column"
 msgstr "Rasvane veerg"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1765
 msgid "Color Column"
 msgstr "Värviline veerg"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1779
 msgid "BG Color Column"
 msgstr "Taustavärviga veerg"
 
@@ -20844,7 +20582,6 @@ msgstr "Saadaolevad _väljad:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Kasvavas järjestuses"
 
@@ -20855,7 +20592,6 @@ msgstr "Puhasta kõik"
 
 #: ../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 "Descending"
 msgstr "Kahanevas järjestuses"
 
@@ -20879,7 +20615,6 @@ msgid "Sh_ow these fields in order:"
 msgstr "Välju _näidatakse sellest järjestuses:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Näidatavad väljad"
@@ -20953,14 +20688,14 @@ msgstr "_Näita neid välju järjestuses:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1804
 msgid "DnD code"
 msgstr "DnD kood"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1818
 msgid "Full Header"
 msgstr "Kogupäis"
 
@@ -21004,7 +20739,7 @@ msgstr "%s (%d kirjet)"
 #: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
+#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
 msgid "Alternating Row Colors"
 msgstr ""
 
@@ -21012,7 +20747,7 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
 #: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr ""
@@ -21021,7 +20756,7 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr ""
@@ -21030,7 +20765,7 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr ""
@@ -21039,7 +20774,7 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
+#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
 msgid "Cursor mode"
 msgstr "Kursorirežiim"
 
@@ -21047,7 +20782,7 @@ msgstr "Kursorirežiim"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
 msgid "Selection model"
 msgstr "Valikumudel"
 
@@ -21055,7 +20790,7 @@ msgstr "Valikumudel"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 #: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
 #: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
@@ -21065,7 +20800,7 @@ msgstr "Pikkuse lävi"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
 #: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
 #: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
@@ -21078,84 +20813,79 @@ msgstr ""
 msgid "Frozen"
 msgstr "Külmutatud"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Käesoleva vaate kohandamine"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Sordi kasvavalt"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Sordi kahanevalt"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Ära sordi"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Grupeeri selle välja järgi"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Eemalda see veerg"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Lisa veerg..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Joondus"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Parim suurus"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Kohanda veerge..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Kohanda käesolevat vaadet..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-#, fuzzy
-msgid "Sort By"
-msgstr "Sordi"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Sortimisandmed"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1846
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Puu"
 
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
 msgid "Table header"
 msgstr "Tabeli päis"
 
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
 msgid "Table model"
 msgstr "Tabeli mudel"
 
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
 msgid "Cursor row"
 msgstr "Kursori rida"
 
@@ -21319,300 +21049,3 @@ msgstr "Välksõnumikontekst"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr ""
-
-#~ msgid "Category is"
-#~ msgstr "Kategooria on"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Videokonverents"
-
-#~ msgid "Dele_gatees"
-#~ msgstr "_Delegaadid"
-
-#~ msgid "Original Location"
-#~ msgstr "Algne asukoht"
-
-#~ msgid "Search Type"
-#~ msgstr "Otsingu tüüp"
-
-#~ msgid "Subitem ID"
-#~ msgstr "Alamkirje ID"
-
-#~ msgid "Find No_w"
-#~ msgstr "_Otsi nüüd"
-
-#~ msgid "(%ld seconds)"
-#~ msgstr "(%ld sekundit)"
-
-#~ msgid "(%d %s %d %s)"
-#~ msgstr "(%d %s %d %s)"
-
-#~ msgid "(%d %s)"
-#~ msgstr "(%d %s)"
-
-#~ msgid " %u second"
-#~ msgstr "%u sekund"
-
-#~ msgid " %u seconds"
-#~ msgstr "%u sekundit"
-
-#~ msgid " %u minute"
-#~ msgstr "%u minut"
-
-#~ msgid " %u minutes"
-#~ msgstr "%u minutit"
-
-#~ msgid "%u hour"
-#~ msgstr "%u tund"
-
-#~ msgid "%u hours"
-#~ msgstr "%u tundi"
-
-#~ msgid "(%d seconds)"
-#~ msgstr "(%d sekundit)"
-
-#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-#~ msgstr "Sinu sõnumit teemaga &quot;{0}&quot; ei toimetatud kohale."
-
-#~ msgid "_Insert"
-#~ msgstr "_Lisa"
-
-#~ msgid ""
-#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
-#~ "if you are in a insecure environment. For example, if you and your LDAP "
-#~ "server are behind a firewall at work, then Evolution doesn't need to use "
-#~ "SSL/TLS because your connection is already secure."
-#~ msgstr ""
-#~ "See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli "
-#~ "ainult siis kui sa oled ebaturvalises keskkonnas. Näiteks kui sina ja "
-#~ "sinu LDAP server asuvad mõlemad tulemüüriga kaitstud võrgus, siis "
-#~ "Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus on juba "
-#~ "turvaline."
-
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "Evolution grupitarkvarakomplekt"
-
-#~ msgid "_Show animated images"
-#~ msgstr "A_nimeeritud piltide kuvamine"
-
-#~ msgid "<b>%s (%s)</b> : %s"
-#~ msgstr "<b>%s (%s)</b> : %s"
-
-#~ msgid "<b>%s (%s)</b>"
-#~ msgstr "<b>%s (%s)</b>"
-
-#~ msgid "<b>%s</b> : %s"
-#~ msgstr "<b>%s</b> : %s"
-
-#~ msgid "<b>%s</b>"
-#~ msgstr "<b>%s</b>"
-
-#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Automaatsed kontaktid</span>"
-
-#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Kiirsuhtluse kontaktid</span>"
-
-#~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "<span weight=\"bold\">Vastuolude otsing</span>"
-
-#~ msgid "Delete this Occurrence"
-#~ msgstr "Seekordse sündmuse kustutamine"
-
-#~ msgid "Addressbook"
-#~ msgstr "Aadressiraamat"
-
-#~ msgid "Task Table"
-#~ msgstr "Ülesannete tabel"
-
-#~ msgid "Removal Complete"
-#~ msgstr "Eemaldamine lõpetatud"
-
-#~ msgid "Con_tacts..."
-#~ msgstr "_Kontaktid..."
-
-#~ msgid "Memo Table"
-#~ msgstr "Märkmetabel"
-
-#~ msgid "Timezone Button"
-#~ msgstr "Ajavööndi nupp"
-
-#~ msgid "Mail Accounts Table"
-#~ msgstr "Postikontode tabel"
-
-#~ msgid "Attachment Button"
-#~ msgstr "Manuse nupp"
-
-#~ msgid "Filters"
-#~ msgstr "Filtrid"
-
-#~ msgid "Message List"
-#~ msgstr "Sõnumiloend"
-
-#~ msgid "Alar_ms"
-#~ msgstr "Alar_mid"
-
-#~ msgid "_All day Event"
-#~ msgstr "Kestab kogu _päeva"
-
-#~ msgid "Previous Button"
-#~ msgstr "Eelmine nupp"
-
-#~ msgid "Text Date Entry"
-#~ msgstr "Tekstiline kuupäeva väli"
-
-#~ msgid "Date Button"
-#~ msgstr "Kuupäeva nupp"
-
-#~ msgid "Time Combo Box"
-#~ msgstr "Aja valikukast"
-
-#~ msgid "Advanced..."
-#~ msgstr "Edasijõudnutele..."
-
-#~ msgid "_Advanced..."
-#~ msgstr "_Edasijõudnutele..."
-
-#~ msgid "Select target addressbook."
-#~ msgstr "Vali sihtaadressiraamat."
-
-#~ msgid "Select an Action"
-#~ msgstr "Vali tegevus"
-
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "Uue kontakti \"%s\" loomine"
-
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
-
-#~ msgid "Or_ganizer"
-#~ msgstr "Ko_rraldaja"
-
-#~ msgid "_Description:"
-#~ msgstr "_Kirjeldus:"
-
-#~ msgid "<b>Dele_gatees</b>"
-#~ msgstr "<b>Dele_gaadid</b>"
-
-#~ msgid "<b>From:</b>"
-#~ msgstr "<b>Saatja:</b>"
-
-#~ msgid "Classi_fication:"
-#~ msgstr "_Liigitamine"
-
-#~ msgid "_Group"
-#~ msgstr "_Grupp"
-
-#~ msgid "T_erminal Font:"
-#~ msgstr "T_erminali kirjatüüp"
-
-#~ msgid "Evolution Settings"
-#~ msgstr "Evolutioni sätted"
-
-#~ msgid "_Select All"
-#~ msgstr "Vali _kõik"
-
-#~ msgid "Show Time _Zone"
-#~ msgstr "Näita _ajavööndit"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "_Evolutionist lähemalt..."
-
-#~ msgid "_Attachment Bar"
-#~ msgstr "_Manuseriba"
-
-#~ msgid "Server: %s, Type: %s"
-#~ msgstr "Server: %s, tüüp: %s"
-
-#~ msgid "Path: %s, Type: %s"
-#~ msgstr "Kataloog: %s, tüüp: %s"
-
-#~ msgid "Type: %s"
-#~ msgstr "Tüüp: %s  "
-
-#~ msgid "Sa junk-plugin"
-#~ msgstr "SA rämpspostiplugin"
-
-#~ msgid "Dismiss"
-#~ msgstr "Katkesta"
-
-#~ msgid "Dismiss All"
-#~ msgstr "Tühista kõik"
-
-#~ msgid "<b>Default Free/Busy Server</b>"
-#~ msgstr "<b>Vaikimisi vaba/hõivatud server</b>"
-
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Üldine</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Ülesandeloend</b>"
-
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Aeg</b>"
-
-#~ msgid "<b>Work Week</b>"
-#~ msgstr "<b>Töönädal</b>"
-
-#~ msgid "Calendar and Tasks Settings"
-#~ msgstr "Kalendri ja ülesannete sätted"
-
-#~ msgid "Color for overdue tasks"
-#~ msgstr "Tähtaja ületanud ülesannete värvus"
-
-#~ msgid "Color for tasks due today"
-#~ msgstr "Tänase tähtajaga ülesannete värvus"
-
-#~ msgid "_Publish Free/Busy Information"
-#~ msgstr "_Avalikusta vaba/hõivatud andmed"
-
-#~ msgid "_Rule name:"
-#~ msgstr "_Reegli nimi:"
-
-#~ msgid "Execute actions"
-#~ msgstr "Tegevused täidetakse juhul, kui"
-
-#~ msgid "Execute Command..."
-#~ msgstr "Käsu käivitamine..."
-
-#~ msgid "Publish Free/Busy information for this calendar"
-#~ msgstr "Selle kalendri vaba/hõivatud teabe avalikustamine"
-
-#~ msgid "Customize My Evolution"
-#~ msgstr "Minu Evolutioni kohandamine"
-
-#~ msgid "Move"
-#~ msgstr "Tõsta"
-
-#~ msgid "_Send / Receive"
-#~ msgstr "_Saada / võta vastu"
-
-#~ msgid "Search Editor"
-#~ msgstr "Otsinguredaktor"
-
-#~ msgid "description of appointment"
-#~ msgstr "sündmuse kirjeldus"
-
-#~ msgid "Schedulin_g"
-#~ msgstr "_Plaanimine"
-
-#~ msgid "In_vitations"
-#~ msgstr "_Kutsed"
-
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Kuupäev ja kellaaeg</b>"
-
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>Saatmise valikud</b>"
-
-#~ msgid "This appointment has customized alarms"
-#~ msgstr "Sellel sündmusel on kohandatud alarmid"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Koosolekud ja ülesanded"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "_Manuseriba (tõsta manused siia)"
-
-#~ msgid "_Delegate To..."
-#~ msgstr "_Delegeerida..."
diff --git a/po/eu.po b/po/eu.po
index 3a4696d9fa..6324caa936 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,14 +2,12 @@
 # Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2005, 2006.
-#: ../mail/em-format-html-display.c:679
-#: ../shell/e-user-creatable-items-handler.c:701
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-06 18:59+0000\n"
-"PO-Revision-Date: 2006-07-06 19:59+0000\n"
+"POT-Creation-Date: 2006-05-10 18:41+0000\n"
+"PO-Revision-Date: 2006-05-10 18:43+0000\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +19,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution-en helbide-liburua"
 
@@ -35,12 +33,12 @@ msgstr "Kontaktu berria"
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "uneko %s helbide-liburuaren karpetak txartel %d du"
-msgstr[1] "uneko %s helbide-liburuaren karpetak %d txartel ditu"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "uneko helbide-liburuaren karpetak txartel %d du"
+msgstr[1] "uneko helbide-liburuaren karpeta %d txartel ditu"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -59,32 +57,32 @@ msgstr "Kontaktua: "
 msgid "evolution minicard"
 msgstr "evolution-en txarteltxoa"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Alarmak ditu."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Errepikapenak ditu."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Bilera bat da."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Egutegi-gertaera: laburpena %s da."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Egutegi-gertaera: ez du laburpenik."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "Egutegi-gertaeren ikuspegia"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Hartu fokua"
 
@@ -155,10 +153,8 @@ msgstr "%A, %Y %b %d"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -189,10 +185,8 @@ msgstr "%Y %b %d"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%b %d"
 
@@ -322,14 +316,6 @@ msgstr "Aktibatu lehenetsia"
 msgid "Popup Menu"
 msgstr "Bistaratu menua"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Txandakatu eranskin-barra"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "aktibatu"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -513,7 +499,7 @@ msgid "_Discard"
 msgstr "_Ez"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -553,9 +539,9 @@ msgstr "Konfiguratu osatze automatikoa hemen"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontaktuak"
 
@@ -616,7 +602,7 @@ msgstr "Ordenagailu honetan"
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Pertsonala"
 
@@ -643,7 +629,7 @@ msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
@@ -659,73 +645,72 @@ msgstr "Sortu helbide-liburu berria"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Huts egin du Helbide-liburuaren ezarpenak edo karpetak bertsio-berritzean."
 
-#: ../addressbook/gui/component/addressbook-config.c:331
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Oinarria"
 
-#: ../addressbook/gui/component/addressbook-config.c:532
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Mota:"
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Kopiatu liburuaren edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../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:2021
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Orokorra"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Helbide-liburua"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Zerbitzariaren datuak"
 
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Xehetasunak"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Deskargatzen"
 
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Helbide-liburuaren propietateak"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Migratzen..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' migratzen:"
@@ -800,35 +785,34 @@ msgstr "Karpeta-izenak ezin du '/' karaktererik eduki."
 msgid "A Folder with this name already exists"
 msgstr "Izen berdineko karpeta badago lehendik ere"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "Helbide-liburu _berria"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1279
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "E_zabatu"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Gorde VCard gisa..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Propietateak..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Kontaktu-iturburuaren hautatzailea"
 
@@ -837,7 +821,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP zerbitzarian anonimoki sartzea"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Huts egin du autentifikatzean.\n"
 
@@ -888,7 +872,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Panel bertikalaren kokapena"
 
@@ -1219,10 +1203,12 @@ msgstr "minutu"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
@@ -1272,13 +1258,13 @@ msgstr "<b>Lanekoa</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1287,7 +1273,7 @@ msgstr "Kontaktua"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -1329,7 +1315,7 @@ msgstr "Telefonoa"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Lanekoa"
@@ -1352,13 +1338,15 @@ msgid "_Birthday:"
 msgstr "U_rtebetetzea:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Egutegia:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "Ka_tegoriak..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Kategoriak"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1445,8 +1433,8 @@ msgid "_Zip/Postal Code:"
 msgstr "Pos_ta-kodea:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Helbidea"
 
@@ -1454,15 +1442,15 @@ msgstr "Helbidea"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2440,7 +2428,7 @@ msgstr "Zimbawe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Izena"
@@ -2451,7 +2439,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2461,7 +2449,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2470,7 +2458,7 @@ msgid "Service"
 msgstr "Zerbitzua"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2491,17 +2479,17 @@ msgid "Other"
 msgstr "Bestelakoa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2530,20 +2518,20 @@ msgid "Changed"
 msgstr "Aldatuta"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2405
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktu-editorea - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2783
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Hautatu irudi bat kontaktu honentzat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2784
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Irudirik ez"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2551,31 +2539,15 @@ msgstr ""
 "Kontaktu-data ez da baliozkoa:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
-#, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' baliogabeko formatua du"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
-#, c-format
-msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' baliogabeko formatua du"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#, c-format
-msgid "%s'%s' is empty"
-msgstr "%s'%s' hutsik dago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "kontaktua ez da balizkoa."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "_Editatu osoa"
 
@@ -2583,11 +2555,11 @@ msgstr "_Editatu osoa"
 msgid "_Full name"
 msgstr "_Izen-abizenak"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "_Helb. el"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Hautatu helbide-liburua"
 
@@ -2595,7 +2567,7 @@ msgstr "_Hautatu helbide-liburua"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Ziur zaude kontaktu-zerrenda (%s) \n"
 "ezabatu nahi duzula?"
@@ -2612,7 +2584,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Ziur zaude kontaktua (%s)\n"
 "ezabatu nahi dituzula?"
@@ -2723,7 +2695,6 @@ msgid "_IM Service:"
 msgstr "_Berehalako mezularitzako zerbitzua:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2739,7 +2710,7 @@ msgid "Add an email to the List"
 msgstr "Gehitu helbidea zerrendan"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
@@ -2771,24 +2742,24 @@ msgstr "_Hautatu"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Liburua"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Zerrenda berria da"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Kideak"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Kontaktu-zerrendako kideak"
 
@@ -2829,18 +2800,25 @@ msgstr ""
 "Kontaktu honen izena edo helbide elektronikoa lehendik ere badago \n"
 "karpeta honetan.  Hala ere gehitu nahi duzu?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka:"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Kategoria da:"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "Helb. el. honela hasten da:"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Izena honela hasten da:"
@@ -2858,9 +2836,9 @@ msgstr[1] "%d kontaktu"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Kontsulta"
 
@@ -2882,11 +2860,11 @@ msgstr "Modeloa"
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Iturburua"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
@@ -2895,96 +2873,95 @@ msgstr "Iturburua"
 msgid "Type"
 msgstr "Mota"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Gorde VCard gisa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1259
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ireki"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "Kontaktu _berria..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Kontaktuen _zerrenda berria..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Gorde VCard gisa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Birbidali kontaktua"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Birbidali kontaktuak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Bidali _mezua kontaktuari"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Bidali _mezua zerrendari"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Bidali _mezua kontaktuei"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "Kop_iatu helbide-liburuan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "E_raman helbide-liburura..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "E_baki"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1267
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3125 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "_Itsatsi"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "Inprimatu txartelak"
 
@@ -3029,7 +3006,7 @@ msgid "Company Phone"
 msgstr "Enpresako telefonoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Helb. el."
@@ -3079,7 +3056,7 @@ msgid "Manager"
 msgstr "Zuzendaria"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Telefono mugikorra"
 
@@ -3088,7 +3065,7 @@ msgid "Nickname"
 msgstr "Goitizena"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Oharra"
 
@@ -3097,7 +3074,7 @@ msgid "Office"
 msgstr "Bulegoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Erakundea"
 
@@ -3215,7 +3192,7 @@ msgstr "Eremu-izenaren geh. luzera"
 msgid "Column Width"
 msgstr "Zutabe-zabalera"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3229,7 +3206,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:175
 msgid ""
 "\n"
 "\n"
@@ -3243,7 +3220,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:180
 msgid ""
 "\n"
 "\n"
@@ -3253,7 +3230,7 @@ msgstr ""
 "\n"
 "Bilatu kontaktua."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3263,7 +3240,7 @@ msgstr ""
 "\n"
 "Ez dago ikuspegi honetan erakusteko elementurik."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Moldagailua"
 
@@ -3275,89 +3252,68 @@ msgstr "Hautatuta"
 msgid "Has Cursor"
 msgstr "Kurtsorea du"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Ire_ki esteka arakatzailean"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Kopiatu estekaren helbidea"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Bidali mezu berria honi..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Kopiatu _helbide elektronikoa"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Zerrendako kideak"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Helb. el."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Kokalekua"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Bideo-berriketa"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Bideo-konferentzia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Faxa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "lanekoa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Etxeko orria"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
-msgstr "Web egunkaria"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog-a"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "pertsonala"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Lanpostua"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Etxeko orria"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Blog-a"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3388,7 +3344,7 @@ msgstr "Ez da auto-kontakturik definitu"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
@@ -3413,7 +3369,7 @@ msgstr "Protokoloa ez da onartzen"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Bertan behera utzita"
 
@@ -3547,7 +3503,7 @@ msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Errorea kontaktua gehitzean"
 
@@ -3564,7 +3520,7 @@ msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Errorea kontaktua kentzean"
 
@@ -3583,7 +3539,7 @@ 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:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3592,69 +3548,69 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 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:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Hautatu helbide-liburua"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "zerrenda"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Eraman kontaktua hona"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Kopiatu kontaktua hemen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Eraman kontaktuak hona"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Kopiatu kontaktuak hemen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "%s - VCard-a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Kontaktuaren informazioa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, 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:287
 msgid "Querying Address Book..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
@@ -3744,12 +3700,12 @@ msgstr "Evolution-en Vcard inportatzailea"
 msgid "Print envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Inprimatu kontaktuak"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Inprimatu kontaktua"
 
@@ -3798,7 +3754,7 @@ msgstr "Formatua"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Goiburua"
@@ -3902,7 +3858,7 @@ msgstr "Itzaldura"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4131,17 +4087,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Ziur zaude hitzordua ezabatu nahi duzula?"
 
 #: ../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 "Ziur zaude egunkari-sarrera ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ziur zaude bilera hau ezabatu nahi duzula?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Ziur zaude zeregina ezabatu nahi duzula?"
 
@@ -4417,8 +4370,8 @@ msgstr "Zatitu egun anitzeko gertaerak:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Ezin izan da evolution-data-server abiarazi"
 
@@ -4452,12 +4405,12 @@ 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:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Egutegia eta zereginak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Egutegiak"
 
@@ -4505,12 +4458,12 @@ msgid "Memos"
 msgstr "Zirkularrak"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/exchange-operations/exchange-folder.c:592
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4530,13 +4483,13 @@ msgstr "_Zereginak"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutu"
 msgstr[1] "minutu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4548,7 +4501,7 @@ 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:270
 msgid "Start time"
 msgstr "Hasierako ordua"
 
@@ -4559,10 +4512,10 @@ msgstr "Hitzorduak"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Kokalekua:"
 
@@ -4576,12 +4529,12 @@ msgstr "Alarma-_errepikaren denbora:"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "E_ditatu"
 
@@ -4593,31 +4546,32 @@ msgstr "_Utzi geroko"
 msgid "location of appointment"
 msgstr "hitzorduaren helbidea"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Ez dago laburpen erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Ez dago kokaleku-informazio erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d alarma dituzu"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4629,7 +4583,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta dago.  \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4646,7 +4600,7 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
@@ -4744,104 +4698,92 @@ msgid "Default reminder value"
 msgstr "Oroigarri lehenetsiaren balioa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Gertaeraren gradientea"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Gertaeraren gardentasuna"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "'Libre/okupatuta' zerbitzarien URLak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "'Libre/okupatuta' txantiloien URLak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Gertaeren gradientea egutegiko ikuspegian."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Ezkutatu burututako zereginak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Ezkutatu zereginaren unitateak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Ezkutatu zereginaren balioa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Panel horizontalaren kokapena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Laneguna amaitzen den ordua (24 orduko formatuan: 0 - 23)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Laneguna hasten den ordua (24 orduko formatuan: 0 - 23)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Ordu banaketak Eguneko eta Lan-asteko ikuspegietan erakutsitako tarteak, "
 "minututan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Azken alarma-ordua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "URL zerbitzarien zerrenda 'libre/okupatuta' argitaratzeko."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-en linea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains-en linearen kolorea - Egutegi ikuspegia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains-en linearen kolorea - Ordu-barra"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Laneguna amaitzen den minutua (0 - 59)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Laneguna hasten den minutua (0 - 59)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Panel horizontalaren kokalekua hileko ikuspegian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Panel bertikalaren kokalekua hileko ikuspegian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Oroigarri lehenetsia zehazteko unitate-kopurua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Zereginak noiz ezkutatu zehazteko unitate-kopurua."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Atzeratutako zereginen kolorea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4849,7 +4791,7 @@ msgstr ""
 "Panel horizontalaren kokalekua pixeletan, data-nabigatzailearen egutegiaren "
 "eta zereginen zerrendaren artean (hileko ikuspegian ez dagoenean)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4857,7 +4799,7 @@ msgstr ""
 "Panel horizontalaren kokalekua pixeletan, ikuspegia eta  data-"
 "nabigatzailearen egutegiraren artean (hileko ikuspegian dagoenean)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4865,7 +4807,7 @@ msgstr ""
 "Panel bertikalaren kokalekua pixeletan, zereginen zerrendaren eta zereginen "
 "aurrebistaren panelaren artean, pixeletan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4873,7 +4815,7 @@ msgstr ""
 "Panel bertikalaren kokalekua pixeletan, ikuspegia eta data-nabigatzaileren "
 "egutegiaren eta zereginen zerrendaren artean (hileko ikuspegian dagoenean)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4881,65 +4823,65 @@ msgstr ""
 "Panel bertikalaren kokalekua pixeletan, ikuspegia eta  data-nabigatzailearen "
 "egutegiraren artean (hileko ikuspegian ez dagoenean)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Alarmek exekutatuko dituzten programak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Erakutsi RSPV eremuak gertaeren/bileren/zereginen editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Erakutsi Araua eremua gertaeren/bileren/zereginen editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Erakutsi hitzorduen amaiera-orduak asteko eta hileko ikuspegietan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Erakutsi Kategoriak eremua gertaeren/bileren/zereginen editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Erakutsi alarmaren pantaila jakinarazpenen ontzian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Erakutsi Egoera eremua gertaeren/bileren/zereginen editorea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Erakutsi\"Aurrebista\" panela"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Erakutsi \"Aurrebista\" panela."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Erakutsi Ordu-zona eremua gertaeren/bileren editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Erakutsi Mota eremua gertaeren/bileren/zereginen editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Erakutsi aste-zenbakiak data-nabigatzailean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Gaurko zereginen kolorea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Zereginen panel bertikalaren kokapena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4949,7 +4891,7 @@ msgstr ""
 "helbide elektronikoaren erabiltzailearen zatiarekin ordeztuko da. %d : "
 "domeinuarekin ordeztuko da."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4957,61 +4899,53 @@ msgstr ""
 "Ordu-zona lehenetsia egutegiko data eta orduetan erabiltzeko, Olsen ordu-"
 "zonako datu-baseko itzuli gabeko kokaleku gisa (adib. \"America/New York\")."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Orduen zatiketa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Azken alarma exekutatu zen ordua, 'time_t'-en "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Ordu-zona "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Gertaeren gardentasuna egutegiko ikuspegian (0 eta 10 arteko balioa, "
-"opakoa lehenetsi gisa)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24 orduko formatua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oroigarri lehenetsiaren unitateak (\"minutu\", \"ordu\" edo \"egun\")."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unitateak zereginak noiz ezkutatu zehazteko (\"minutu\", \"ordu\" edo \"egun"
 "\")."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Astearen hasiera"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Astearen hasierako laneguna, igandetik (0) larunbatera (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Alarmak bistaratzeko jakinarazpenen ontzia erabiliko den edo ez"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Hitzordua edo zeregina ezabatzean berrespena eskatuko den edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Hitzorduak eta zereginak betiko borratzean berrespena eskatuko den edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5019,73 +4953,73 @@ msgstr ""
 "Astebukaerak hileko ikuspegian konprimituko den edo ez (larunbata eta "
 "igandea asteko lanegun baten lekua hartuko dute)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Gertaeren amaiera-orduak asteko eta hileko ikuspegietan erakutsiko diren edo "
 "ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Marcus Bains-en linea (uneko orduan) egutegian marraztuko den edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Egindako zereginak zereginen ikuspegitik ezkutatuko diren edo ez"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Hitzorduen oroigarri lehenetsi bat ezarriko den edo ez"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "RSPV eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Kategoriak eremua gertaeren/bileren editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Araua eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Egoera eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Am/pm erabili beharrean orduak 24 orduko formatuan bistaratuko diren edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Ordu-zona eremua gertaeren/bileren editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Mota eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Data-nabigatzailean aste-zenbakiak erakutsiko diren edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Lanegunak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Lanegunaren amaierako ordua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Lanegunaren amaierako minutua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Lanegunaren hasierako ordua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Lanegunaren hasierako minutua"
 
@@ -5097,19 +5031,19 @@ msgstr "Laburpenak hau dauka"
 msgid "Description contains"
 msgstr "Azalpenak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Kokalekuak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Sailkatu gabeak"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
@@ -5118,9 +5052,9 @@ msgstr "Inprimatu"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
@@ -5190,59 +5124,59 @@ msgstr "Huts egin du egutegiak bertsio-berritzean."
 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:1155
+#: ../calendar/gui/calendar-component.c:1152
 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:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Egutegi-iturburuaren hautatzailea"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Bilera"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Egun osoko hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Egun _osoko hitzordua"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Egutegi berria"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_Egutegia"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Egutegi berria sortzen du"
 
@@ -5274,7 +5208,7 @@ 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:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -5400,18 +5334,47 @@ msgstr "_Gehitu"
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Proposatu eranskina automatikoki bistaratzea"
+#: ../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 "Proposatu eranskina automatikoki bistaratzea"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Erantsi fitxategia(k)"
 
+#: ../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 "Eranskinaren propietateak"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Azalpena:"
+
+#: ../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 "Fitxategi-izena:"
+
+#: ../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 mota:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Hautatutako egutegiak alarmentzako"
@@ -5473,7 +5436,7 @@ msgid "Display"
 msgstr "Bistaratu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "'Libre/okupatuta"
@@ -5524,187 +5487,181 @@ msgstr ""
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_ig."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Hautatu egutegiak alarmen jakinarazpenerako"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "Era_kutsi oroigarria hitzordua hasi baino"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Igandea"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "_Gaurko zereginak:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "o_g."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Txantiloia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "_Ordu-zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Ordu-formatua:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Asteazkena"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "Astearen _hasiera:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Lanegunak:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ordu (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 ordu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Eskatu _berrespena elementuak ezabatzeko"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Konprimatu asteburuak hileko ikuspegian"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Egunaren hasiera:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_or."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "Ezkutatu _burututako zereginak"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_al."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "_Atzeratutako zereginak:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "_lr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Erakutsi hitzorduen amaiera-orduak asteko eta hileko ikuspegietan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "Or_duen zatiketa:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "a_r."
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "a_z."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "lehenago"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Kopiatu _egutegiaren edukia lokalean lineaz kanpoko eragiketak lantzeko"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Kopiatu egutegiaren edukia lokalean lineaz kanpoko eragiketak lantzeko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-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:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Kopiatu liburuaren edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-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:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Kopiatu zirkularren edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Kolorea:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Zereginen zerrenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Zirkularren zerrenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Egutegiaren propietateak"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Egutegi berria"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Zeregin-zerrendaren propietateak"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Zirkularren zerrenda berria"
 
@@ -5791,49 +5748,49 @@ msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 msgid "Validation error: %s"
 msgstr "Balidazio-errorea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " - "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Eginda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Eginda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Falta: "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Falta: "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2861
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Erantsitako mezua - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2866
-#: ../composer/e-msg-composer.c:3062
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Erantsitako mezu bat"
 msgstr[1] "Erantsitako %d mezu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3126
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Lekuz aldatu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3128
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Bertan behera _utzi arrastatzea"
 
@@ -5841,7 +5798,7 @@ msgstr "Bertan behera _utzi arrastatzea"
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2490
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5853,96 +5810,97 @@ msgid "Hide Attachment _Bar"
 msgstr "Ezkutatu eranskin-_barra"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Erakutsi eranskin-_barra"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3624
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3625 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propietateak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3627
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Gehitu eranskina..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Erakutsi eranskinak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Sakatu Zuriunea tekla eranskin-barra txandakatzeko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Bilera - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Esleitutako zeregina - %s "
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "eranskina"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Ezin da uneko bertsioa erabili!"
 
@@ -5958,10 +5916,6 @@ msgstr "Ezin izan da helburua ireki"
 msgid "Destination is read only"
 msgstr "Helburua irakurtzekoa soilik da"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Ezabatu elementu hau beste postontzi guztietatik?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Gertaera ezin izan da ezabatu, corba errore bat gertatu delako"
@@ -6023,17 +5977,17 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_Hitzordua"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Errepikapena"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Gertaerak alarmak ditu."
 
@@ -6043,7 +5997,7 @@ msgid "Cale_ndar:"
 msgstr "_Egutegia:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6057,95 +6011,103 @@ msgstr "_Delegatuak"
 msgid "Atte_ndees"
 msgstr "_Partaideak"
 
-#: ../calendar/gui/dialogs/event-page.c:1083
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Hasiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1086
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Amaiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Hasierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1264
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Amaierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Hasierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1294
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Amaierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Hautatutako antolatzaileak ez du konturik orain."
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Gehitu "
 
-#: ../calendar/gui/dialogs/event-page.c:2618
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ezin da '%s' egutegia ireki."
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "Hitzordua baino egun %d lehenago"
 msgstr[1] "Hitzordua baino %d egun lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2929
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "Hitzordua baino ordu %d lehenago"
 msgstr[1] "Hitzordua baino %d ordu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "Hitzordua baino minutu %d lehenago"
 msgstr[1] "Hitzordua baino %d minutu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Pertsonalizatu"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2282
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
 #: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
@@ -6164,7 +6126,8 @@ msgid "15 minutes before appointment"
 msgstr "Hitzordua baino 15 minutu lehenago"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "_Partaideak..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6185,12 +6148,16 @@ msgstr "_Azalpena:"
 msgid "Event Description"
 msgstr "Gertaeraren azalpena:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Kokalekua:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Labu_rpena:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Alarmak"
 
@@ -6212,6 +6179,14 @@ msgstr "errepikatu arte"
 msgid "until"
 msgstr "data hau arte:"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "_Delegatuak"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Nondik:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6258,7 +6233,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
 
@@ -6279,11 +6254,11 @@ msgid "Organizer"
 msgstr "Antolatzailea"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Antolatzailea:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Zirkularra"
 
@@ -6544,15 +6519,15 @@ msgstr "<span weight=\"bold\">Egoera</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Eginda"
 
 #: ../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:1029
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Handia"
 
@@ -6561,20 +6536,20 @@ msgstr "Handia"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Egiten ari da"
 
 #: ../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:1027
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Txikia"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normala"
 
@@ -6582,7 +6557,7 @@ msgstr "Normala"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Ez da hasi"
 
@@ -6595,7 +6570,7 @@ msgid "Stat_us:"
 msgstr "E_goera:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Definitu gabe"
 
@@ -6612,12 +6587,12 @@ msgstr "_Lehentasuna:"
 msgid "_Web Page:"
 msgstr "_Web orria:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Zereginaren xehetasunak"
 
@@ -6630,10 +6605,6 @@ msgstr "Mugaeguna gaizki dago"
 msgid "Unable to open tasks in '%s'."
 msgstr "Ezin dira hemengo zereginak ireki: '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Partaideak..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Ka_tegoriak..."
@@ -6774,7 +6745,7 @@ msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Egin klik %s irekitzeko"
@@ -6794,7 +6765,7 @@ msgstr "Izengabea"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -6812,7 +6783,7 @@ msgstr "Mugaeguna:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Egoera:"
 
@@ -6820,26 +6791,18 @@ msgstr "Egoera:"
 msgid "Priority:"
 msgstr "Lehentasuna:"
 
-#: ../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:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "Azalpena:"
-
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Publikoa"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Pribatua"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Konfidentziala"
 
@@ -6859,13 +6822,13 @@ msgid "Summary"
 msgstr "Laburpena"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Libre"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Okupatuta"
 
@@ -6879,17 +6842,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Bai"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ez"
@@ -6900,21 +6863,21 @@ msgstr "Ez"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Esleitua"
 
@@ -6922,7 +6885,7 @@ msgstr "Esleitua"
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2081
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Hautatu karpeta hautatutako eranskina gordetzeko..."
 
@@ -6931,9 +6894,9 @@ msgstr "Hautatu karpeta hautatutako eranskina gordetzeko..."
 msgid "untitled_image.%s"
 msgstr "irudi_izengabea.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
@@ -6951,79 +6914,74 @@ msgstr "_Gorde hautatutakoa"
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "_Zeregin berria"
-
-#: ../calendar/gui/e-calendar-table.c:1260 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Ireki _web orria"
 
-#: ../calendar/gui/e-calendar-table.c:1262
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7031,44 +6989,44 @@ msgstr "Ireki _web orria"
 msgid "_Print..."
 msgstr "I_nprimatu..."
 
-#: ../calendar/gui/e-calendar-table.c:1266
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: ../calendar/gui/e-calendar-table.c:1272 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Esleitu _zeregina"
 
-#: ../calendar/gui/e-calendar-table.c:1273 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Birbidali iCalendar gisa"
 
-#: ../calendar/gui/e-calendar-table.c:1274
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta'"
 
-#: ../calendar/gui/e-calendar-table.c:1275
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu hautatutako zereginak 'Osatuta'"
 
-#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: ../calendar/gui/e-calendar-table.c:1513
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
@@ -7103,101 +7061,105 @@ msgstr "Hasiera-data"
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "elementuak lekuz aldatzen"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "elementuak kopiatzen"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "_Bilera berria"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "_Zeregin berria"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Uneko ikuspegia"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Hautatu _Gaur"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Hautatu data..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_Kopiatu egutegian..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_Eraman egutegira..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegatu Bilera..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu Bilera..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "_Antolatzailea: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Antolatzailea: %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:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Kokalekua: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Ordua: %s. %s"
@@ -7227,7 +7189,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutu-zatiketa"
@@ -7238,22 +7200,20 @@ 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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -7361,22 +7321,22 @@ msgstr "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menua
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Onartua"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Ukatua"
 
@@ -7594,7 +7554,7 @@ msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
@@ -7646,30 +7606,43 @@ msgstr "Bidali azken orduko informazioa"
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%% %P"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "-- --"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Egutegi-mezua"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Egutegia kargatzen"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Egutegia kargatzen ari da..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Zerbitzariaren mezua:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "data-amaiera"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "data-hasiera"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
@@ -7688,65 +7661,65 @@ msgid "Resources"
 msgstr "Baliabideak"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Indibiduala"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Taldea"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Baliabidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Gela"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Mahaiburua"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Beharrezko partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Aukerako partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ez-partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Ekintza behar du"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegatua"
 
@@ -7755,14 +7728,14 @@ msgstr "Delegatua"
 msgid "Attendee                          "
 msgstr "Partaidea                         "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y.eko %Bren %da"
 
@@ -7770,86 +7743,86 @@ 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:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a, %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:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Partaideak..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Aukerak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Beharrezko pertsonak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Hasiera:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Amaiera:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Ezabatu hautatutako zirkularrak"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Egin klik zirkularra gehitzeko"
 
@@ -7857,7 +7830,7 @@ msgstr "Egin klik zirkularra gehitzeko"
 msgid "Memo sort"
 msgstr "Zirkularren ordena"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7876,7 +7849,7 @@ msgstr "Zirkularrak kargatzen"
 msgid "Opening memos at %s"
 msgstr "%s - zirkularrak irekitzen"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
@@ -7885,32 +7858,31 @@ msgstr "Hautatutako objektuak ezabatzen..."
 msgid "Enter the password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Zereginak kargatzen"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 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:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%B %d"
 
@@ -8059,9 +8031,22 @@ msgstr "iCalendar informazioa"
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaide izan behar duzu."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "Zirkularren zerrenda _berria"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopiatu"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Propietateak..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8162,240 +8147,240 @@ msgstr "Ezin da `%s' egutegia migratu"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ezin dira `%s' zereginak migratu"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Ig"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Al"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Ar"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Az"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Og"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Or"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Lr"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hautatutako eguna (%a, %Y %b %d)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a, %b %d"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a, %Y %d"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hautatutako astea (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Hautatutako hilabetea (%Y %b)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Zeregina"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Laburpena: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Lehentasuna: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Kontaktuak: "
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
@@ -8459,7 +8444,7 @@ msgstr "Zereginen _zerrenda"
 msgid "Create a new task list"
 msgstr "Sortu zereginen zerrenda berria"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8471,11 +8456,11 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Inprimatu zereginak"
 
@@ -10070,7 +10055,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Eranskin-barra"
 
@@ -10078,43 +10063,28 @@ msgstr "Eranskin-barra"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ezin da %s fitxategia erantsi: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ezin da %s fitxategia erantsi: ez da fitxategi erregularra"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Eranskinaren propietateak"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Fitxategi-izena:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME mota:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Bidalketa-helburua"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Aukeratu talde-mezua bidaltzeko karpetak."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
@@ -10125,45 +10095,45 @@ msgstr "Egin klik hemen helbide-liburura joateko"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Erantzun honi:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "Nor_k:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Gaia:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "Nor_i:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10174,15 +10144,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Bidali hona:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Egin klik hemen, talde-mezuak bidaltzeko karpetak hautatzeko"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Bidali hona:"
 
@@ -10190,7 +10160,7 @@ msgstr "Bidali hona:"
 msgid "A_ttach"
 msgstr "_Erantsi"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Txertatu eranskina"
 
@@ -10208,12 +10178,12 @@ msgstr ""
 "Ezin da enkriptatu irteerako mezua: sinadura-ziurtagiririk ez dago ezarrita "
 "kontu honentzat"
 
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Ezkuratu _eranskin-barra"
 
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Erakutsi _eranskin-barra"
 
@@ -10239,21 +10209,21 @@ msgstr "Mezu izengabea"
 msgid "Open File"
 msgstr "Ireki fitxategia"
 
-#: ../composer/e-msg-composer.c:2162 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automatikoki sortua"
 
-#: ../composer/e-msg-composer.c:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Si_nadura:"
 
-#: ../composer/e-msg-composer.c:2533 ../composer/e-msg-composer.c:3752
-#: ../composer/e-msg-composer.c:3755
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Prestatu mezua"
 
-#: ../composer/e-msg-composer.c:4979
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10400,7 +10370,7 @@ msgstr "_Gorde mezua"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10524,7 +10494,7 @@ msgid ""
 "do?"
 msgstr "Irakurragiria eskatzen dizutenean, zer egin behar du Evolution-ek?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10532,28 +10502,28 @@ msgstr ""
 "Izen hori duen fitxategi bat badago lehendik.\n"
 "Gainidatzi?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Fitxategia gainidatzi?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution-en abisua"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution-en informazioa"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution-en kontsulta"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Barne-errorea, '%s' errore ezezaguna eskatu da"
@@ -10648,23 +10618,23 @@ msgstr "%Y-%b-%d"
 msgid "Select a time to compare against"
 msgstr "Hautatu ordua"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Aukeratu fitxategi bat"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Garrantzitsua"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Egitekoa"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Geroago"
@@ -10714,11 +10684,11 @@ msgid "Include threads"
 msgstr "Hariak barne"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Sarrerakoa"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Irteerakoa"
 
@@ -10814,7 +10784,7 @@ msgstr "lehenago"
 msgid "months"
 msgstr "hilabete"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "segundo igarotakoan"
 
@@ -10884,11 +10854,11 @@ msgstr "Evolution-en mezu-prestatzailea konfiguratzeko kontrola"
 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:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Posta"
@@ -10969,11 +10939,11 @@ msgstr "Jasotzeko aukerak"
 msgid "Checking for New Mail"
 msgstr "Begiratu mezu berririk dagoen"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontu-editorea"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
@@ -11008,7 +10978,7 @@ msgid "Protocol"
 msgstr "Protokoloa"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Izengabea"
 
@@ -11084,12 +11054,6 @@ msgstr "Jasotze-data"
 msgid "Date sent"
 msgstr "Bidaltze-data"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Ezabatu"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Ezabatuta"
@@ -11187,7 +11151,7 @@ msgstr "Baztergarriak"
 msgid "Junk Test"
 msgstr "Mezu baztergarrien proba"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiketa"
 
@@ -11231,7 +11195,7 @@ msgstr "Jo soinua"
 msgid "Read"
 msgstr "Irakurrita"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Hartzailea"
 
@@ -11259,11 +11223,11 @@ msgstr "hau baino txikiagoa ematen du"
 msgid "Run Program"
 msgstr "Exekutatu programa"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Bidaltzailea"
 
@@ -11295,9 +11259,9 @@ msgstr "honela hasten da"
 msgid "Stop Processing"
 msgstr "Utzi prozesatzeari"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11313,42 +11277,10 @@ msgstr "Egoera ezarri gabe"
 msgid "<b>Then</b>"
 msgstr "<b>Orduan</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Sortu bilaketa-karpeta bilaketatik..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Mezu guztiak"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Irakurri gabeko mezuak"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Etiketarik ez"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Irakurri mezuak"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Azken mezuak"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Azken 5 egunetako mezuak"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Mezuak eranskinekin"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Baztergarriak ez diren 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:150
@@ -11382,7 +11314,7 @@ msgid "Folder _name:"
 msgstr "_Karpetaren izena:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Bilatu karpeta"
 
@@ -11397,7 +11329,7 @@ msgstr "Zirriborroa"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
@@ -11413,77 +11345,77 @@ msgstr "Bidalitakoak"
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Posta-karpetaren zuhaitza"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s karpeta lekuz aldatzen"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s karpeta kopiatzen"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s karpetara eramaten"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s karpetan kopiatzen"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ezin da mezurik ekarri maila goreneko biltegira"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Ireki leiho _berrian"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "K_opiatu..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "Izena _aldatu..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Hustu _zakarrontzia"
 
@@ -11492,14 +11424,13 @@ msgstr "Hustu _zakarrontzia"
 msgid "Copying `%s' to `%s'"
 msgstr "'%s' hemen kopiatzen:  %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opiatu"
 
@@ -11521,166 +11452,158 @@ msgstr "Sortu karpeta"
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Mar_katu ez-garrantzitsu gisa"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Markatu _baztergarri gisa"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Markatu _ez baztergarri gisa"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Markatu jarraitasunerako..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Etiketa"
 
-#: ../mail/em-folder-view.c:1141
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Bat ere ez"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Ban_dera osatuta"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Garbitu bandera"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Bilatu karpeta _gaiaren arabera"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Bilatu karpeta _bidaltzailearen arabera"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Bilatu _hartzailearen arabera"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Bilatu po_sta-zerrendaren arabera"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Ezin da mezua eskuratu"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Kopiatu estekaren helbidea"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Sortu _bilaketa-karpeta"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Helbidetik"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Helbidera"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik %s bidaltzeko"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Egin klik helbideak ezkutatzeko/bistaratzeko"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:501
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Bat datozenak: %d"
 
-#: ../mail/em-format-html-display.c:644
-msgid "Find:"
-msgstr "Bilatu:"
-
-#: ../mail/em-format-html-display.c:675
-msgid "Match _case"
-msgstr "_Maiuskula/minuskula"
-
-#: ../mail/em-format-html-display.c:923 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Sinatu gabe"
 
-#: ../mail/em-format-html-display.c:923
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11688,11 +11611,11 @@ msgstr ""
 "Mezu hau ez dago sinatuta. Ez dago inolako bermerik, mezu hau benetakoa dela "
 "bermatzen duenik."
 
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Baliozko sinadura"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11700,21 +11623,21 @@ msgstr ""
 "Mezu hau sinatuta dago, eta baliozkoa da; hau da,oso litekeena da mezua "
 "benetakoa izatea."
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Sinadura baliogabea"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:758
 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:926
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Baliozko sinadura; bidaltzailea ezin da egiaztatu"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11722,21 +11645,21 @@ msgstr ""
 "Mezu honek baliozko sinadura du, baina mezuaren bidaltzailea ezin da "
 "egiaztatu."
 
-#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Enkriptatu gabe"
 
-#: ../mail/em-format-html-display.c:932
+#: ../mail/em-format-html-display.c:765
 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:933 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Enkriptatuta, ahula"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11746,11 +11669,11 @@ msgstr ""
 "izan arren, litekeena da kanpoko norbaitek mezu honen edukia ikustea, "
 "horretarako denbora hartzen badu."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Enkriptatuta"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11758,11 +11681,11 @@ msgstr ""
 "Mezu hau enkriptatuta dago. Oso zaila da kanpoko norbaitek mezuaren edukia "
 "ikustea."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Enkriptatuta, zorrotza"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11772,72 +11695,72 @@ msgstr ""
 "zaila izango da kanpoko norbaitek mezu honen edukia ikustea, arrazoizko "
 "denbora batean."
 
-#: ../mail/em-format-html-display.c:1036 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ikusi ziurtagiria"
 
-#: ../mail/em-format-html-display.c:1051
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Ziurtagiri hau ez da ikusteko modukoa"
 
-#: ../mail/em-format-html-display.c:1342
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Osatua: %Y %B %d, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1350
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atzeratua:"
 
-#: ../mail/em-format-html-display.c:1353
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr " - %Y %B %d, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1413
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ikusi barnean"
 
-#: ../mail/em-format-html-display.c:1414
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "E_zkutatu"
 
-#: ../mail/em-format-html-display.c:1415
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Doitu zabalera"
 
-#: ../mail/em-format-html-display.c:1416
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Erakutsi jatorrizko ta_maina"
 
-#: ../mail/em-format-html-display.c:1835 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: ../mail/em-format-html-display.c:2042
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Hautatu karpeta eranskin guztiak gordetzeko..."
 
-#: ../mail/em-format-html-display.c:2089
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Gorde hautatutakoa..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2156
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "_Eranskin %d"
 msgstr[1] "%d _eranskin"
 
-#: ../mail/em-format-html-display.c:2163 ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Gorde"
 
-#: ../mail/em-format-html-display.c:2174
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Gorde _denak"
 
-#: ../mail/em-format-html-display.c:2235
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Eranskinik ez"
 
@@ -11851,94 +11774,94 @@ msgstr "%d/%d orria"
 msgid "Retrieving `%s'"
 msgstr "'%s' eskuratzen"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Baliozko sinadura du, baina ezin da bidaltzailea egiaztatu"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Kanpoko gorputz-zatia gaizki osatuta dago."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s) urruneko datuetarako erakuslea"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Mezua formateatzea"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Nork"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Nori"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Bidalketa-funtzioa"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Berri-taldeak"
@@ -11988,7 +11911,7 @@ msgstr "Astean behin"
 msgid "Once per month"
 msgstr "Hilean behin"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12000,47 +11923,47 @@ msgstr ""
 "\n"
 "Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ezin izan da `%s' karpeta berria sortu: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Ezin da kopiatu `%s' karpeta --> `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s' ezin da aztertu postontzirik dagoen ikusteko: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Ezin dira ireki `%s' POP zerbitzarian gordetako datu zaharrak: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Ezin da ireki `%s' POP3 zerbitzarian gordetzeko datuen direktorioa: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Ezin dira kopiatu `%s' POP3 zerbitzarian gordetako datuak: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Huts egin du `%s' posta-biltegi lokala sortzean: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, 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:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12057,6 +11980,10 @@ msgstr "Erantzun bidal_tzaileari"
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Ire_ki esteka arakatzailean"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Bidali mezu berria honi..."
@@ -12086,28 +12013,28 @@ msgstr "Hautatu zerbitzari bat."
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Ez erakutsi mezu hau berriro."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Posta-iragazkiak"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "mezua"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Gorde mezua..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Gehitu helbidea"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
@@ -12149,108 +12076,82 @@ msgid "Composer Window default width"
 msgstr "Mezuak prestatzeko leihoaren zabalera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Konprimituta bistaratu Nori/CC/BCC eremuko helbideak"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Konprimituta bistaratu Nori/CC/BCC eremuko helbideak "
-"'helbide-kopurua'n zehaztutako kopuruaren arabera."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Mezuak idazteko karaktere-joko lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Mezuak idazteko karaktere-joko lehenetsia."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Birbidaltzeko estilo lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Mezuak prestatzeko leihoaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Mezuen leihoaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Harpidetzen elkarrizketa-koadroaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Erantzuteko estilo lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Mezuak prestatzeko leihoaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Mezuen leihoaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Harpidetzeko leihoaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Marraztu errore ortografikoen adierazleak hitzetan  idatzi ahala."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Hustu zakarrontziko karpetak irtetean"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Hustu zakarrontziko karpeta guztiak Evolution-etik irtetean."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Gaitu kurtsore modua, mezuak irakurtzean kurtsorea ikusteko."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Gaitu edo desgaitu 'bilatu idaztean' funtzioa"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Gaitu albo-barrako bilaketa funtzioa, idazten duzun bitartean bilaketa interaktiboa "
-"abiarazteko. Erabili hau karpeta bat albo-barran aurkitzeko karpetaren izena idaztean eta hautapenak automatikoki karpeta horretara joateko."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Gaitu/desgatiu kurtsore modua"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren altuera"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren altuera."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12258,13 +12159,7 @@ msgstr ""
 "Erabiltzaileak 10 mezu edo gehiago irekitzen saiatzen bada aldi berean, "
 "galdetu erabiltzaileari benetan hori egitea nahi duen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "\"Aurrebista\" panela aktibatuta egonez gero erakutsi bata bestearen alboan, bertikalki ordez."
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12274,23 +12169,23 @@ msgstr ""
 "GNOMEren mime-moten datu-baseko bonobo osagaien ikustaile batera mapatutako "
 "zerrendako edozein mime-mota erabil daiteke edukia bistaratzeko."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Zakarrontzia hustu zen azken aldia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Etiketen zerrenda, eta bakoitzari asoziatutako koloreak"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Onartutako lizentzien zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Kontuen zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12298,11 +12193,11 @@ msgstr ""
 "Evolution-en posta-osagaiak ezagutzen dituen kontuen zerrenda. Zerrendak /"
 "apps/evolution/mail/accounts-eko azpiderektorioen izenen kateak ditu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Goiburu pertsonalizatuen zerrenda, gaituta dauden edo ez zehaztuta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12311,19 +12206,19 @@ msgstr ""
 "kolorea duten kateak ditu, eta koloreak HTML kodeketa hamaseitarra "
 "erabiltzen du."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Bonobo osagaien ikustaileentzat egiaztatu beharreko mime-moten zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lizentzia onartu zaien protokolo-izenen zerrenda."
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Kargatu HTML mezuen irudiak http bidez"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12333,95 +12228,91 @@ msgstr ""
 "kargatu irudiak saretik kanpo 1 - Kargatu irudiak bidaltzailea helbide-"
 "liburuan badago 2 - Beti kargatu irudiak saretik"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Iragazki-ekintzen egunkaria"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Erregistratu iragazki-ekintzak zehaztutako egunkari-fitxategian."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia."
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Mezuen leihoaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Mezuen leihoaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Mezuak bistaratzeko estiloa (\"normala\", \"goiburu osoak\", \"iturburua\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Irtetean zakarrontzia husteko gutxieneko egun-kopurua"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Irtetean zakarrontzia husteko gutxieneko denbora, egunetan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Mezu berria iritsi dela jakinarazteko soinu-fitxategia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Mezu berriaren jakinarazpen-mota"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Helbide kopurua Nori/CC/BCC eremuetan erakusteko"
-
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Abisatu gaia hutsik badago"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Abisatu erabiltzaileari, karpeta bat betiko borratu aurretik."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Abisatu erabiltzaileari, mezu bat gairik gabe bidaltzen saiatzen denean."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Abisatu erabiltzaileak betiko borratzean"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Abisatu erabiltzaileak Bcc bakarrik betetzen duenean"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Abisatu erabiltzaileak 10 mezu edo gehiago aldi berean irekitzen saiatzean"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12429,97 +12320,87 @@ msgstr ""
 "Abisatu HTML mezuak bidali aurretik beharbada HTML mezurik jaso nahi ez "
 "duten erabiltzaileei."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:62
 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.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Abisatu HTMLrik nahi ez duenari HTML mezua bidali aurretik"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Ezagutu testuko estekak, eta ordeztu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Ezagutu smiley-aurpegierak testuan, eta ordeztu irudiekin."
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Exekutatu mezu baztergarrien proba sarrerako mezuetan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Bidali HTML mezuak lehenespenez"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Bidali HTML mezuak lehenespenez."
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Erakutsi animazioak"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Erakutsi irudi-animazioak animazio gisa."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Erakutsi ezabatutako mezuak (marratuta) mezuen zerrendan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Erakutsi ezabatutako mezuak mezuen zerrendan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "Erakutsi bidaltzailearen mezua mezuak osatzeko zutabean mezuen zerrendan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Erakutsi bidaltzailearen mezuen zutabean mezuen zerrendan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Mezu berriak iristean jo beharreko soinu-fitxategia."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Erabili nahi den Mezu Berrien Jakinarazpenaren mota zehazten du."
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Ortografia-egiaztapena barnean"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Harpidetzen elkarrizketa-koadroaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Harpidetzen elkarrizketa-koadroaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminaleko letra-tipoa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Zakarrontzia hustu zen azken aldia, Garaiaren hasieratik iragandako egunetan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Mezuak bistaratzeko erabiliko den terminaleko letra-tipoa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Mezuak bistaratzeko erabiliko den zabalera aldakorreko letra-tipoa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12531,109 +12412,99 @@ msgstr ""
 "egitura - &lt;header enabled&gt; - gaituta ezartzen da, goiburua mezuen "
 "ikuspegian bistaratuko bada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr "Honek helbide-kopurua ezartzen du mezuaren zerrendako ikuspegi lehenetsian erakusteko, eta harutzago '...' erakutsiko da."
-
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Sartu harian mezuen zerrenda."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Sartu harian mezuen zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Sartu harian mezuen zerrenda, Gaiaren arabera"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Mezua Ikusitako gisa markatzeko denbora-muga"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Mezua Ikusitako gisa markatzeko denbora-muga."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Kontu lehenetsiaren UID katea."
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Erabili Spamasssassin daemon-a eta bezeroa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Erabili Spamasssassin daemon-a eta bezeroa (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Erabili letra-tipo pertsonalizatuak"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Erabili letra-tipo pertsonalizatuak mezuak bistaratzeko"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Spam-proba lokalak bakarrik erabili."
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Spam-proba lokalak bakarrik erabili (DNSkorik ez)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "Use side-by-side or wide layout"
-msgstr "Erabili diseinu handia edo 'alboz albokoa'"
-
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Zabalera aldakorreko letra-tipoa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Ikusi/Bcc menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Ikusi/Bcc menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Ikusi/Cc menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Ikusi/Cc menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Ikusi/Nork menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Ikusi/Nork menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Ikusi/Bidali hona menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Ikusi/Bidali hona menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ikusi/Erantzun honi menu-elementua hautatuta dago"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ikusi/Erantzun honi menu-elementua hautatuta dago."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12641,14 +12512,6 @@ msgstr ""
 "Gaikako harian sartzera itzuli nahi duzun edo ez, mezuek ez daukatenean "
 "Erantzun honi edo Erreferentzia goibururik."
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
-msgid "Width of the message-list pane"
-msgstr "Mezu-zerrendaren panelaren zabalera"
-
-#: ../mail/evolution-mail.schemas.in.in.h:120
-msgid "Width of the message-list pane."
-msgstr "Mezu-zerrendaren panelaren zabalera."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Elm datuak inportatzen"
@@ -12680,15 +12543,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley postontzien formatuen karpeten inportatzailea"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' inportatzen"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Itxaron"
 
@@ -12864,34 +12727,34 @@ msgstr[1] "%d guztira"
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
-msgstr[0] ", %d irakurri gabe"
-msgstr[1] ", %d irakurri gabe"
+msgstr[0] "%d irakurri gabe"
+msgstr[1] "%d irakurri gabe"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Mezua"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Mezu berrien karpeta"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "Posta _Karpeta"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Sortu posta-karpeta berria"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Huts egin du Postaren ezarpenak edo karpetak bertsio-berritzean."
 
@@ -13523,26 +13386,18 @@ msgid "_Show image animations"
 msgstr "_Erakutsi animazioak"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Txikitu Nori / Cc / Bcc goiburukoak hona"
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "E_rabili konexio segurua:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Erabili beste aplikazioetako letra-tipo berak"
 
-#: ../mail/mail-config.glade.h:177
-msgid "addresses"
-msgstr "helbideak"
-
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "kolorea"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "azalpena"
 
@@ -13653,21 +13508,21 @@ msgstr "karpeta lokal guztiekin"
 msgid "Pinging %s"
 msgstr "%s(e)n ping egiten"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Huts egin du irteerako iragazkiak aplikatzean: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13676,114 +13531,123 @@ msgstr ""
 "Huts egin du %s(r)i eranstean: %s\n"
 "Horren ordez, Bidalitakoen karpeta lokalean gehituko da."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Huts egin du `Bidalitakoen' karpeta lokalean eranstean: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 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:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Bertan behera utzita."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Osatuta."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "'%s' kontua betiko borratzen eta biltegiratzen"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' kontua biltegiratzen"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' zakarrontzia husten"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua eskuratzen"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, 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:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Mezu %d gordetzen"
 msgstr[1] "%d mezu gordetzen"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Ezin da sortu irteera-fitxategi hau: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13792,11 +13656,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13805,22 +13669,22 @@ msgstr ""
 "Ezin da irteera-fitxategia sortu: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s -- deskonektatzen"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s -- berriro konektatzen"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
@@ -13848,26 +13712,17 @@ msgstr "Zain..."
 msgid "Checking for new mail"
 msgstr "Begiratu mezu berririk dagoen"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Idatzi %s(r)en pasaesaldia"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Idatzi pasaesaldia"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
@@ -13923,11 +13778,11 @@ msgstr "Bilaketa-karpeta eguneratzen - '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Bilaketa-karpetak eguneratzen - '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Editatu bilaketa-karpeta"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Bilaketa berrien karpeta"
 
@@ -14329,10 +14184,10 @@ msgstr "Ziurtagiria badago lehendik ere"
 
 #: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Evolution-ek sistemako karpetak behar ditu ongi funtzionatzeko eta "
+"Ximian Evolution-ek sistemako karpetak behar ditu ongi funtzionatzeko eta "
 "ezin ditu izenez aldatu, lekuz aldatu edo ezabatu."
 
 #: ../mail/mail.error.xml.h:90
@@ -14496,74 +14351,74 @@ msgstr "_Borratu betiko"
 msgid "_Open Messages"
 msgstr "_Ireki mezuak"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Ikusita"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Txikia"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Handia"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Handiena"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Mezuak"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -14583,15 +14438,15 @@ msgstr "Banderaduna"
 msgid "Follow Up Flag"
 msgstr "Jarraipena egiteko marka"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Jatorrizko kokalekua"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Jasotze-data"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Bidalitako mezuak"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Tamaina"
@@ -14858,6 +14713,10 @@ msgid ""
 "things to the clipboard."
 msgstr "Probako plugin-a menu-leihoa agertarazten duena gauzak arbelean kopiatzeko."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopiatu _helbide elektronikoa"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Kopiatzeko tresna"
@@ -15059,15 +14918,13 @@ 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:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Pasahitza %d egunetara iraungituko da."
 
-#. 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
 msgid "Custom"
 msgstr "Pertsonalizatu"
 
@@ -15187,7 +15044,7 @@ msgstr "Karpetaren izena"
 msgid "Folder Size"
 msgstr "Karpetaren tamaina"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Harpidetu beste erabiltzaileen karpetan"
@@ -15202,14 +15059,14 @@ msgstr "Exchange-ren karpeta-zuhaitza"
 msgid "Unsubscribe Folder..."
 msgstr "Kendu karpetaren harpidetza..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "\"%s\" karpetaren harpidetza kentzea nahi duzu?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
@@ -15335,26 +15192,22 @@ msgid "Cannot display folders."
 msgstr "Ezin da karpeta bistaratu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Ezin da eragiketa egin."
-
-#: ../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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"\"{0}\" Exchange kontuaren konfigurazioaren aldaketak Evolution-etik irten eta "
+"Exchange kontuaren konfigurazioaren aldaketak Evolution-etik irten eta "
 "berriro abiatzean eragingo dira"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Ezin izan da zerbitzarian autentifikatu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Ezin izan da pasahitza aldatu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15364,55 +15217,55 @@ msgstr ""
 "ezezaguna gertatu delako. Egiaztatu URLa, \n"
 " erabiltzaile-izena eta pasahitza, eta saiatu berriro."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Ezin izan da Exchange zerbitzariarekin konektatu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Ezin izan da {0} zerbitzariarekin konektatu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Ezin izan da delegatuen karpeten baimenak zehaztu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Ezin izan da Exchange-ren web biltegiratze sistema aurkitu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Ezin izan da {0} zerbitzaria kokatu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Ezin izan da {0} delegatu egin"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Ezin izan da karpetaren baimenak irakurri."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Ezin izan da karpetaren baimenak irakurri."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Ezin izan da 'bulegotik kanpo' egoera irakurri"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Ezin izan da karpetaren baimenak eguneratu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 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:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15439,28 +15292,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 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:34
 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:35
 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:36
 msgid "Folder offline"
 msgstr "Karpeta lineaz kanpo"
 
-#: ../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:37
+#: ../shell/e-shell.c:1269
 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:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15468,63 +15321,63 @@ msgstr ""
 "OWA beste helbide batean exekutatzen ari bada, zehaztu kontuaren  "
 "konfigurazioko elkarrizketa-koadroan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 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:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 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:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 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:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr "Ziurtatu erabiltzaile-izena eta pasahitza zuzenak direla eta saiatu berriro."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 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:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 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:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Ez dago {0} bezalako erabiltzailerik"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Pasahitza ongi aldatu da."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-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:48
+msgid "Please restart Evolution"
+msgstr "Berrabiatu Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Hautatu erabiltzaile bat."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 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:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 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:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 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:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 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:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15533,7 +15386,7 @@ msgstr ""
 "Exchange Konektatzaileak Microsoft Exchange 2000 \n"
 "eta 2003 soilik onartzen ditu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15546,63 +15399,63 @@ msgstr ""
 "\n"
 "Edo pasahitza gaizki idatziko zenuen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Saiatu berriro beste pasahitz batekin."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 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:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Ezin dira ordezkariak editatu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Errore ezezaguna {0} bilatzean"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Errore ezezaguna."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Mota ezezaguna"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Onartu gabeko eragiketa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Zerbitzariko kuotaren mugara (posta gordetzeko) iristen ari zara."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 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:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 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:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 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:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "Erabilitakoa: {0}KB. Saiatu lekua egiten zenbait posta ezabatuz."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "Erabilitakoa: {0}KB. Orain ezin izango duzu posta jaso edo bidali."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15610,19 +15463,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:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Pasahitza iraungitu da."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 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:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} jadanik delegatua da"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} jadanik zerrendan dago"
 
@@ -15818,10 +15671,7 @@ msgstr "Proxy-aren saio-hasiera"
 msgid "%sEnter password for %s (user %s)"
 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:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "_Proxy-aren saio-hasiera..."
 
@@ -15882,12 +15732,12 @@ msgid "Select Calendar"
 msgstr "Hautatu egutegia"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Inportatu"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar formatua (.ics)"
 
@@ -15941,116 +15791,116 @@ msgstr ""
 "Ezin izan da Evolution-eko egutegiaren/zereginen zerrenda ireki datuak "
 "esportatzeko."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Huts egin du '%s' egutegia kargatzean."
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, 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:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hitzordua '%s' egutegian aurkitu da"
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Ezin da egutegirik aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ezin da bilera hau egutegietan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Ezin da zeregin hau zereginen zerrendetan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Ezin da egunkari-sarrera hau egunkarietan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Hitzorduaren existitzen den bertsioa bilatzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Ezin da elementua analizatu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, 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:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Bidali '%s' egutegira onartuta bezala"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Bidali '%s' egutegira saialdi gisa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Bidali '%s' egutegira baztertua bezala"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' egutegira bertan behera utzita bezala bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Antolatzaileak %s delegatua kendu du"
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Bertan behera uztearen mezua delegatuari bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 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:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 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:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ezin da partaideak eguneratu. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Partaide-egoera eguneratu da"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Erantsitako egutegia ez da baliozkoa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 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:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Egutegiko elementua ez da baliozkoa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16058,11 +15908,11 @@ msgstr ""
 "Mezuak egutegi bat du, baina egutegiak ez du gertaerarik, zereginik edo "
 "libre/okupatuta informaziorik"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Erantsitako egutegiak hainbat elementu ditu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16072,17 +15922,17 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Ezabatu mezua ekin ondoren"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Gatazka bilaketan"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Hautatu egutegiak bileren arteko gatazkak bilatzeko"
 
@@ -16426,26 +16276,26 @@ msgid "_Update"
 msgstr "_Eguneratu"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "_Hasiera:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Amaiera:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Iruzkina"
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Bidali eguneraketak partaideei"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "_Aplikatu instantzia guztiak"
 
@@ -16460,7 +16310,7 @@ msgstr "Itip formatu emailea"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; bilera delegatu du. &quot;{1}&quot; delegatua gehitzea nahi "
 "duzu?"
@@ -16700,7 +16550,7 @@ msgid "Mark All Read"
 msgstr "Markatu denak irakurrita bezala"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Markatu _mezuak irakurritako gisa"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -16965,12 +16815,12 @@ msgstr "Gorde eranskin guztiak"
 msgid "Select save base name"
 msgstr "Hautatu oinarrizko izena gordetzeko"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME mota"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Gorde"
 
@@ -17080,7 +16930,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF formatua (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Hautatu helburuko fitxategia"
 
@@ -17129,19 +16979,19 @@ msgstr ""
 "\n"
 "Jarraitzeko, egin klik \"Aurrera\" botoian. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Datuak inportatzen."
 
@@ -17196,7 +17046,7 @@ msgstr "Albo-panelaren altuera lehenetsia"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window state"
-msgstr "Leiho lehenetsiaren egoera"
+msgstr "Leihoaren egoera lehenetsia"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
@@ -17226,15 +17076,11 @@ msgstr "Albo-barra ikusgai dago"
 msgid "Skip development warning dialog"
 msgstr "Saltatu garapen-abisuaren elkarrizketa-koadroa"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Egoera-barra ikusgai dago"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17242,19 +17088,19 @@ msgstr ""
 "Evolution-en konfigurazio-bertsioa, konfigurazio maila altuarekin/baxuarekin "
 "(\"2.6.0\" adibidez)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Leiho nagusiaren altuera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Leiho nagusiaren zabalera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Albo-panelaren zabalera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17262,7 +17108,7 @@ msgstr ""
 "Azken bertsio-berritutako Evolution-en konfigurazio-bertsioa, konfigurazio "
 "maila altuarekin/baxuarekin (\"2.6.0\" adibidez)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17272,43 +17118,39 @@ msgstr ""
 "izan daiteke. \"Tresna-barra\" ezartzen bada botoien estiloa GNOMEko tresna-"
 "barraren ezarpenak zehaztuko du."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Tresna-barra ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution lineaz kanpoko moduan abiarazi behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
-msgstr "Leihoa maximizatu behar den edo ez"
+msgstr "Leihoa maximizatu behar den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Alboko barra ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Egoera-barra ikusgai izango den edo ez."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Tresna-barra ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Garapen-abisuaren elkarrizketa-koadroa saltatu behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Leihoko botoiak ikusgai egongo diren edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Leihoko botoi-estiloa"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Leihoko botoiak ikusgai daude"
 
@@ -17329,11 +17171,11 @@ msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
 msgid "(Untitled)"
 msgstr "(izengabea)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Aukeratu inportatzailearen mota:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17347,11 +17189,11 @@ msgstr ""
 "Ez badakizu, \"Automatikoa\" hauta dezakezu eta Evolution saiatuko da "
 "bideratzen."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Aukeratu helburua hau inportatzeko"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17363,23 +17205,23 @@ msgstr ""
 "Ez du inportatzeko moduko ezarpenik aurkitu. Berriro saiatu\n"
 "nahi baduzu, sakatu \"Atzera\" botoia.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Fitxategi-izena:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Fitxategi-_mota:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Inportatu programa _zaharretako datuak eta ezarpenak"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Inportatu fitxategi _bakarra"
 
@@ -17437,7 +17279,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
@@ -17462,40 +17304,32 @@ msgstr "Evolution lineaz kanpo dago.  Egin klik botoi honetan linean lan egiteko
 msgid "Switch to %s"
 msgstr "Aldatu hona: %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Sistemako errore ezezaguna"
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "Ados"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: ../shell/e-user-creatable-items-handler.c:689
-#: ../shell/e-user-creatable-items-handler.c:748
-msgid " New "
-msgstr " Berria "
-
-#: ../shell/e-user-creatable-items-handler.c:693
-#: ../shell/e-user-creatable-items-handler.c:705
-#: ../shell/e-user-creatable-items-handler.c:752
-#: ../shell/e-user-creatable-items-handler.c:764
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Berria"
 
@@ -17550,7 +17384,7 @@ msgstr ""
 "inportatzeko prozesuan zehar gidatuko zaitu."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17586,7 +17420,7 @@ msgstr ""
 "Gogorik lan egin dugu, eta espero dugu emaitza zure gustukoa izango\n"
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17594,39 +17428,35 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution taldea\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Ez esan berriro"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Abiarazi Evolution zehaztutako osagaia aktibatuz"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Behartu evolution-en osagai guztiak ixtea"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Behartu Evolution 1.4etik migratzera"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Desgaitu edozein plugin kargatzea."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolution PIM  eta posta-bezeroa"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18053,7 +17883,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:676
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "Ziurtagiria badago lehendik"
 
@@ -18285,12 +18115,6 @@ 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-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopiatu"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopiatu hautatutako kontaktua(k) beste karpeta batean..."
@@ -18392,7 +18216,7 @@ 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-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Hautatu _dena"
@@ -18462,7 +18286,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:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Berria"
 
@@ -18523,7 +18347,6 @@ msgid "Month"
 msgstr "_Hilabetea"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Hurrengoa"
 
@@ -18532,7 +18355,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:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Aurrekoa"
 
@@ -18620,11 +18443,11 @@ msgstr "Ebaki hautapena arbelean"
 msgid "Paste from clipboard"
 msgstr "Itsatsi arbeletik"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Itsatsi testua arbeletik"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Hautatu testu osoa"
 
@@ -18659,31 +18482,30 @@ msgstr "Egin klik laguntza eskuragarria ikusteko"
 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:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Eranskina..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "It_xi"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Laguntza"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Txertatu"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "Au_kerak"
@@ -18781,11 +18603,6 @@ msgstr "Ordua lanpetuta gisa erakusten edo ezkutatzen du"
 msgid "_Alarms"
 msgstr "_Alarmak"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategoriak"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18851,73 +18668,53 @@ msgid "F_older"
 msgstr "Kar_peta"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Mezuaren _aurrebista"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Eraman hautatutako karpeta beste karpeta batera"
 
 #. 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 "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Bilaketa-_karpetak"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Erakutsi mezuaren _aurrebista"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Erakutsi mezuaren aurrebista mezuen zerrendaren azpian"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Erakutsi mezuaren aurrebista alboz albo mezuen zerrendarekin "
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Erakutsi mezu-aurrebistaren leihoa"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Harpidetza egin edo kendu urruneko zerbitzarietako karpetetan"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Ikuspegi klasikoa"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "K_opiatu karpeta hemen..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Posta-_iragazkiak"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Eraman karpeta hona..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Berria..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Aurrebista"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Harpidetzak"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "Ikuspegi _bertikala"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Aldatu karpetaren izena"
@@ -19474,10 +19271,6 @@ msgid "_Unread"
 msgstr "_Irakurri gabea"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Zooma"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Handiagotu"
 
@@ -19485,7 +19278,7 @@ msgstr "_Handiagotu"
 msgid "Close this window"
 msgstr "Itxi leiho hau"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Tresna-barra nagusia"
 
@@ -19560,6 +19353,11 @@ msgstr "Lortu bidaltze-jakinarazpena mezu bat irakurtzean"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Txertatu"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Ireki fitxategia"
@@ -19888,51 +19686,43 @@ msgstr "Ikonoak _eta testua"
 msgid "Import data from other programs"
 msgstr "Inportatu datuak beste programa batzuetatik"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "_Diseinua"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Leiho _berria"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Hobespenak"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Bidali / _Jaso"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Bidali ilaran gordetako elementuak eta hartu elementu berriak"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Konfiguratu Pilot-en ezarpenak"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Erakutsi Evolution-i buruzko informazioa"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Erakutsi albo-_barra"
+msgid "Side _Bar"
+msgstr "Albo-_barra"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Erakutsi _egoera-barra"
+msgid "Status _Bar"
+msgstr "Egoera-barra"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Erakutsi _tresna-barra"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Erakutsi Evolution-i buruzko informazioa"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
@@ -19940,71 +19730,75 @@ msgstr "Bidali programa-erroreen berri-ematea"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "_Bidali programa-erroreen berri-ematea"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Tresna-_barra"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Tresna-barraren estiloa"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Erakutsi/Ezkutatu albo-barra"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Erakutsi/Ezkutatu egoera-barra"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "Honi _buruz"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Itxi leihoa"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Ahaztu _pasahitzak"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Ezkutatu botoiak"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "_Ikonoak soilik"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Erreferentzia azkarra"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Irten"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Konmutadorearen itxura"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_sinkronizazio aukerak..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "_Testua soilik"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Leihoa"
 
@@ -20041,34 +19835,26 @@ msgid "_Work Week View"
 msgstr "_Lan-asteko ikuspegia"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Bidalitakoen karpeta ikuspegi _handian bezala"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Bida_litakoen karpeta gisa"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "E_goeraren arabera"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Bi_daltzailearen arabera"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Gaiaren a_rabera"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Jarraitze-_markaren arabera"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Ikuspegia _handiarentzat"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Mezuak"
 
@@ -20084,12 +19870,8 @@ msgstr "E_pearekin"
 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20145,7 +19927,7 @@ msgid "_Edit..."
 msgstr "E_ditatu..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20211,19 +19993,14 @@ msgstr "Ikuspegi-mota"
 msgid "Type of view:"
 msgstr "Ikuspegi-mota"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Proposatu eranskina automatikoki bistaratzea"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "AAAOOLI"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%Y %B"
 
@@ -20291,7 +20068,7 @@ msgid "Minimum Width"
 msgstr "Gutxieneko zabalera"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Tartea"
 
@@ -20433,23 +20210,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Zabalduta"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 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:190
 msgid "Text of the expander's label"
 msgstr "Zabaltzailearen etiketako testua"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Erabili azpimarra"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20457,89 +20234,73 @@ 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:206
 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:215
 msgid "Label widget"
 msgstr "Etiketa-trepeta"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Ohiko zabaltzaile-etiketaren ordez bistaratu beharreko trepeta"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Zabaltzailearen tamaina"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Zabaltzailearen geziaren tamaina"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Adierazlearen tartea"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Zabaltzailearen geziaren inguruko tartea"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Gorde bilaketa"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Bilaketak"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Bilaketak"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Gorde bilaketa"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Gorde bilaketa..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Editatu gordetako bilaketak..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "Bilaketa _aurreratua..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Kontu guztiak"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Uneko kontua"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Uneko karpeta"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Uneko mezua"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Aukeratu irudia"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Munduaren mapa"
 
-#: ../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."
@@ -20571,45 +20332,45 @@ msgstr "Ordezte-modeloa"
 msgid "Column width"
 msgstr "Zutabe-zabalera"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Bilatu"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Bilatu orain"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "Ga_rbitu"
 
-#: ../widgets/misc/e-search-bar.c:787
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Bilaketa-mota "
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Elementuaren IDa"
 
-#: ../widgets/misc/e-search-bar.c:794 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "Azpi-elementuaren IDa"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "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:913
-msgid "Show: "
-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:929
-msgid "S_earch: "
-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:940
-msgid " in "
-msgstr " hemen: "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Bilatu _orain"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20810,25 +20571,25 @@ msgstr "Enfokatutako zutabea"
 msgid "Unselected Column"
 msgstr "Desautatutako zutabea"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Zutabe marratua"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Azpimarratu zutabea"
 
 #
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Zutabe lodia"
 
 #
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Zutabe koloreduna"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Atzeko planoaren koloreko zutabea"
 
@@ -20843,7 +20604,6 @@ msgstr "Dauden eremuak:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Gorantz"
 
@@ -20854,7 +20614,6 @@ msgstr "Garbitu dena"
 
 #: ../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 "Descending"
 msgstr "Beherantz"
 
@@ -20952,14 +20711,14 @@ msgstr "_Erakutsi eremuak ordenean:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD kodea"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Goiburu osoak"
 
@@ -21077,70 +20836,66 @@ msgstr "Errenkada-altuera uniformea"
 msgid "Frozen"
 msgstr "Izoztua"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Pertsonalizatu uneko ikuspegia"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Ordenatu gorantz"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Ordenatu beherantz"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Ordenatu gabe"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Elkartu eremu honen arabera"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Taldekatu koadroaren arabera"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Kendu zutabe hau"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Gehitu zutabea..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Lerrokadura"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Egokiena"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Eman formatu zutabeei..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Pertsonalizatu uneko ikuspegia..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Ordenatu"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Letra-tipoak"
 
 #
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Ordenatu informazioa"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
diff --git a/po/fi.po b/po/fi.po
index cf36feb7a1..f9d96c0fc0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,13 +7,12 @@
 # Huomautus: PIM ei ole suomennettu, evolution on suomeksi
 # yksinkertaisesti sähköpostiohjelma. Saa ehdottaa nimeä.
 #
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-27 13:19+0300\n"
-"PO-Revision-Date: 2006-07-27 13:25+0300\n"
+"POT-Creation-Date: 2006-07-27 07:47+0300\n"
+"PO-Revision-Date: 2006-07-27 07:48+0300\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +22,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "Evolutionin osoitekirja"
 
@@ -37,12 +36,12 @@ msgstr "Uusi yhteystieto"
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "Valitussa osoitekirjassa %s on %d kortti"
-msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "Valitussa osoitekirjassa on %d kortti"
+msgstr[1] "Valitussa osoitekirjassa on %d korttia"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -61,32 +60,32 @@ msgstr "Yhteystiedot: "
 msgid "evolution minicard"
 msgstr "Evolutionin minikortti"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Sisältää hälytyksiä."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Sisältää toistuvuuksia."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Sisältää kokouksen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "kalenterinäkymän tapahtuma"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
@@ -115,47 +114,37 @@ msgstr "Siirry päivään"
 msgid "a table to view and select the current time range"
 msgstr "taulukko, josta voi nähdä ja nykyisen aikaalueen"
 
-#. 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "%d tapahtuma."
 msgstr[1] "%d tapahtumaa."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Ei tapahtumia."
 
-#. 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Työviikon näkymä: %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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päivänäkymä: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "kalenterin näkymä työviikkoon"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "Kalenteri näkymä yhdelle tai useammalle päivälle"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d. %Bta %Y"
 
@@ -166,20 +155,18 @@ msgstr "%A %d. %Bta %Y"
 #. 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:706
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -187,10 +174,10 @@ msgstr "%a %d %b %Y"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d. %Bta %Y"
 
@@ -200,11 +187,9 @@ msgstr "%d. %Bta %Y"
 #. 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:732
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -334,14 +319,6 @@ msgstr "Käytä oletuksia"
 msgid "Popup Menu"
 msgstr "Ponnahdusvalikko"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Näytä tai piilota liitepalkki"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "ota käyttöön"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -517,9 +494,9 @@ msgstr ""
 "Yhteystietoja {0} ei voida käyttää ennen kuin Evolution käynnistetään "
 "uudestaan."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Lisää"
@@ -529,7 +506,7 @@ msgid "_Discard"
 msgstr "Hylkää"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -569,9 +546,9 @@ msgstr "Määrittele automaatinen täydennys"
 
 #. 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:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
@@ -611,8 +588,8 @@ msgstr "Hallitse S/Mime varmenteitasi"
 #. 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:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -627,13 +604,12 @@ msgstr "Tällä tietokoneella"
 #. 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:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
@@ -660,7 +636,7 @@ msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
@@ -676,73 +652,72 @@ msgstr "Luo uusi osoitekirja"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Kanta"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:2003
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Yleiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Haetaan"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Siirretään..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirretään  \"%s\""
@@ -817,35 +792,35 @@ msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
 msgid "A Folder with this name already exists"
 msgstr "Tämän niminen kansio on jo olemassa"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Tallenna Vcardina..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Yhteystietojen lähdevalinta"
 
@@ -854,12 +829,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epäonnistui.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Syötä salasana palvelulle %s (käyttäjä %s)"
@@ -905,7 +880,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Vaakapaneelin sijainti"
 
@@ -934,7 +909,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Todennus</b>"
 
@@ -1182,9 +1157,9 @@ msgstr "_Kirjautumismenetelmä:"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -1197,7 +1172,7 @@ msgid "_Search scope:"
 msgstr "_Hakualue:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Palvelin: "
@@ -1217,249 +1192,270 @@ msgstr "kortteja"
 #: ../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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "minuutti"
 
 #: ../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/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Sähköpostiosoite</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Koti</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Pikaviestintä</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Työ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Sekalaiset</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Muuta</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Puhelin</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>WWW-osoitteet</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Työ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../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-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: ../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/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2407
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Kuva"
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Postitusosoite"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "Lempinimi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Puhelin"
 
 #. 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/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/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Apulainen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Syntymäpäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1707
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/itip-formatter/itip-view.c:1654
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Luokat..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Ryhmät"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Yritys:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Maa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Näytä nimellä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Vapaa/Varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "K_otisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Esimies:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Huomioita:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Toimisto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Puoliso:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Osavaltio/lääni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Haluaa sähköpostit _HTML-muodossa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Web-lokin osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Missä: "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
 #: ../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/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Osoite"
 
 #: ../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-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1814 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Muokattava"
 
@@ -2435,7 +2431,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:371
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nimi"
@@ -2446,110 +2442,99 @@ msgstr "AOL pikaviestin"
 
 #: ../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/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "Yahoo Messenger"
-msgstr "Yahoo -pikaviestin"
+msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu -pikaviestin"
-
-#: ../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:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
 msgstr "Palvelu"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "Koti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "Muut"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../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:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Vaaditut kentät"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Muutettu"
 
-#: ../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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2780
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
-msgid "_No image"
-msgstr "_Ei kuvaa"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2781
+msgid "No image"
+msgstr "Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3066
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2557,23 +2542,23 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
 #, c-format
 msgid "'%s' has an invalid format"
-msgstr "'%s' sisältää virheellisen muotoilun"
+msgstr "\"%s\" sisältää virheellistä muotoilua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3077
 #, c-format
 msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' sisältää virheellisen muotoilun"
+msgstr "%s\"%s\" sisältää virheellistä muotoilua"
 
-#: ../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:3092
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
 #, c-format
 msgid "%s'%s' is empty"
-msgstr "%s'%s' on tyhjä"
+msgstr "%s\"%s\" on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3118
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -2590,8 +2575,8 @@ msgid "_Full name"
 msgstr "_Koko nimi"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
-msgstr "Sähkö_posti"
+msgid "E-_mail"
+msgstr "Sähköposti"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
 msgid "_Select Address Book"
@@ -2601,7 +2586,7 @@ msgstr "_Valitse osoitekirja"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Haluatko varmasti poistaa \n"
 "yhteystietolistan (%s)?"
@@ -2618,7 +2603,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Haluatko varmasti\n"
 "poistaa yhteystiedon (%s)?"
@@ -2631,105 +2616,104 @@ msgstr ""
 "Haluatko varmasti\n"
 "poistaa nämä yhteystiedot?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Osoite _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Kaupunki:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "M_aa:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "_Osoite:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "Po_stinumero:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Tr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Neiti"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Hra."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Rva."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Nti."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Hr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Etunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Pääte:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Lisää pikaviestitili"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Tilin nimi:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_Pikaviestipalvelu:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2740,61 +2724,61 @@ msgstr "_Sijainti:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Lisää sähköposti listalle"
 
-#: ../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:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "Lisää sähköpostiosoite osoitekirjasta"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Jäsenet"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Poista sähköpostiosoite listalta"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Piilota osoitteet lähetettäessä sähköpostia tälle listalle"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Listanimi:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../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 "_Syötä sähköpostiosoite tai raahaa yhteystieto alla olevaa listaan:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "Kirja"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Uusi lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Jäsenet"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Ota yhteyttä listan jäseniin"
 
@@ -2835,18 +2819,25 @@ msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko lisätä joka tapauksessa?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Luokka on"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Nimi alkaa"
@@ -2864,7 +2855,7 @@ msgstr[1] "%d yhteystietoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
@@ -2880,7 +2871,7 @@ msgstr "Virhe haettaessa kirjanäkymää"
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Malli"
 
@@ -2888,114 +2879,113 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Lähde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2069
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Tallenna VCardina..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Tallenna vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Kopioi osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "_Siirrä osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "L_iitä"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1804
 msgid "Print cards"
 msgstr "Tulosta kortit"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "Apulainen"
 
@@ -3036,7 +3026,7 @@ msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Sähköposti"
@@ -3082,22 +3072,20 @@ msgid "Journal"
 msgstr "Päiväkirja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "Johtaja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Huomautus"
 
@@ -3106,7 +3094,7 @@ msgid "Office"
 msgstr "Asema"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisaatio"
 
@@ -3139,7 +3127,6 @@ msgid "Role"
 msgstr "Rooli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "Puoliso"
 
@@ -3170,7 +3157,7 @@ msgid "Web Site"
 msgstr "Kotisivu"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3181,12 +3168,12 @@ msgstr "Kotisivu"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Leveys"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3196,12 +3183,12 @@ msgstr "Leveys"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Korkeus"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "On kohdistettu"
 
@@ -3277,139 +3264,76 @@ msgstr ""
 msgid "Adapter"
 msgstr "Sovitin"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "Työsähköposti"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "Henkilökohtainen sähköposti"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "Muu sähköposti"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "Valittu"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "On kohdistin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Avaa linkki selaimessa"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Kopioi linkin sijainti"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "Lähetä uusi _viesti..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Kopioi sähköpostiosoite"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(kartta)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "kartta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Sähköposti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Department"
-msgstr "Osasto"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-msgid "Profession"
-msgstr "Ammatti"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-msgid "Video Chat"
-msgstr "Videokeskustelu"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "Vapaa/Varattu"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Videoneuvottelu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Home Page"
-msgstr "Kotisivu"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "työ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Web Log"
-msgstr "Web-loki"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "Syntymäpäivä"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "Vuosipäivä"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "henkilökohtainen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3440,7 +3364,7 @@ msgstr "Omaa yhteystietoa ei ole määritelty"
 #. 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
@@ -3465,7 +3389,7 @@ msgstr "Protokolla ei ole tuettu"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2385
 msgid "Canceled"
 msgstr "Peruutettu"
 
@@ -3596,7 +3520,7 @@ msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
@@ -3613,7 +3537,7 @@ msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
@@ -3632,7 +3556,7 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää kaikki nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3641,64 +3565,64 @@ msgstr ""
 "%s on jo olemassa\n"
 "Haluatko ylikirjoittaa?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "Kirjoita yli"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "Yhteystieto"
 msgstr[1] "Yhteystiedot"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Siirrä yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Useita VCardeja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard %s:lle"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
@@ -3793,12 +3717,12 @@ msgstr "Evolutionin VCard-tuoja"
 msgid "Print envelope"
 msgstr "Tulosta kirjekuori"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Tulosta yhteystiedot"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Tulosta yhteystieto"
 
@@ -3847,7 +3771,7 @@ msgstr "Muoto"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Ylätunniste:"
@@ -3951,7 +3875,7 @@ msgstr "Varjostus"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4177,17 +4101,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Haluatko varmasti poistaa tämän päiväkirjamerkinnän?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "haluatko varmasti poistaa tämän tehtävän?"
 
@@ -4322,17 +4243,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Evolutionin muistilappuosa sulkeutui odottamatta."
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutionin tehtäväkomponentti on sulkeutunut odottamatta."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenteri ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "Valitsemasi kalenteri on vain luettavissa"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr ""
@@ -4401,68 +4322,54 @@ msgstr ""
 "palvelin päivittää tuettuun versioon."
 
 #: ../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 ""
-"Valittuna on vain luettavissa oleva kalenterilähde. Siirry kalenterinäkymään "
-"ja valitse kalenteri, johon tapaamisia voidaan lisätä."
-
-#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Olet muuttanut tätä tapaamista, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr "Olet muuttanut tätä tehtävää, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Olet muuttanut tätä muistiota, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenterisi eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr ""
-"Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
-"uudestaan."
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Tehtävät eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Lähetä"
 
 # calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16 #: calendar/calendar-errors.xml.h:26
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
@@ -4479,8 +4386,8 @@ msgstr "Jaa usean päivän tapahtumat:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Evolutionin tietopalvelimen käynnistys epäonnistui"
 
@@ -4514,12 +4421,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi kirjoittaa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 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:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalenterit"
 
@@ -4560,21 +4467,21 @@ msgid "Memo_s"
 msgstr "Mui_stilaput"
 
 #: ../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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../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/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tehtävät"
@@ -4592,16 +4499,16 @@ msgstr "_Tehtävät"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutionin kalenterin hälytyspalvelu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4610,7 +4517,7 @@ msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:275
 msgid "Start time"
 msgstr "Alkamisaika"
 
@@ -4621,10 +4528,10 @@ msgstr "Tapaamiset"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -4634,16 +4541,16 @@ msgstr "Torkkumisaika:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Muokkaa"
 
@@ -4655,31 +4562,32 @@ msgstr "_Torku"
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sinulla on %d hälytystä"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4691,7 +4599,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4708,7 +4616,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan"
 
@@ -4808,102 +4716,90 @@ msgid "Default reminder value"
 msgstr "Muistutuksen oletusarvo"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Tapahtuman väriliuku"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Tapahtuman läpinäkyvyys"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Vapaa/varattu palvelinten URLit"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Vapaa/varattu-mallin URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Tapahtumien väriliuku kalenterinäkymissä."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Piilota valmistuneet tehtävät"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Piilota tehtävien yksiköt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Piilota tehtävän arvo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Vaakapaneelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Tunti jona työpäivä alkaa 24-tunnin muodossa, väliltä 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Päivä- ja viikkonäkymissä näytettävät aikavälit minuutteina."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Viimeisen hälytyksen aika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Osoitteet URLeista, joissa julkaistaan vapaa/varattu tietoja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-viiva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains-viivan väri - päivänäkymä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains-viivan väri - aikajana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuutti, jona työpäivä loppuu, väliltä 0-59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuutti, jona työpäivä alkaa, väliltä 0-59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Kuukausinäkymän vaakapanelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Kuukausinäkymän pystypaneelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Kuinka monta yksikköä määrittelee oletusmuistutuksen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Kuinka monta yksikköä tarvitaan, jotta tehtävät piilotetaan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Eräpäivän ylittäneiden tehtävien väri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4911,7 +4807,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
 "välissä jos ei olla kuukausinäkymässä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4919,15 +4815,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
 "välissä käytettäessä kuukausinäkymää"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Vaakapaneelin sijainti pikseleinä , kalenterin listojen ja päivämäärien "
-"selausnäkymän välissä."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4935,7 +4823,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, tehtävälistan ja tehtävän esikatselun "
 "välissä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4943,7 +4831,7 @@ msgstr ""
 "Pystypaneelin sijainti pikseleinä, näkymän ja kalenteriselaimen sekä "
 "tehtävälistan välissä käytettäessä kuukausinäkymää"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4951,65 +4839,65 @@ msgstr ""
 "Pystypaneelin sijainti pikseleinä, näkymän ja kalenteriselaimen sekä "
 "tehtävälistan välissä kun ei käytetä kuukausinäkymää"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Ohjelmat, joita voidaan suorittaa hälytyksistä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Näytä RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Näytä roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Näytä luokkakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Näytä tilakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../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.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Näytä \"Esikatselu\"-paneeli"
 
-#: ../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.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Näytä esikatselupaneeli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Näytä aikavyöhyke tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Näytä tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Näytä viikkonumerot päivämääräselaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Tänään erääntyvien tehtävien väri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Tehtäväpaneelin pystysijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5018,7 +4906,7 @@ msgstr ""
 "URL-malli, jota käytetään vapaa/varattu tiedon varaosoitteena. %u korvataan "
 "sähköpostiosoitteen käyttäjäosalla ja %d aluenimellä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5027,62 +4915,54 @@ msgstr ""
 "kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/"
 "Helsinki\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Viimeisimmän hälytyksen suoritusaika, time_t yksikkönä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr ""
-"Tapahtumien läpinäkyvyys kalenterinäkymissä. Arvo on väliltä 0 "
-"(läpinäkyvä) ja 1 (peittävä)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24-tunnin kello"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes"
 "\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Viikon alku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Käytetäänkö ilmoitusaluetta hälytysten näyttämiseen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kysytäänkö vahvistusta poistettaessa tapaamista tai tehtävää."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kysytäänkö vahvistusta siivottaessa tapaamisia tai tehtäviä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5090,87 +4970,79 @@ msgstr ""
 "Pakataanko viikonloput kuukausinäkymässä. Tämä tiivistää lauantain ja "
 "sunnuntain yhden viikonpäivän kokoisiksi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Piirretäänkö Marcus Bains-viiva (viiva nykyhetkessä) kalenteriin."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymstä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Näytetäänkö RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Näytetäänkö roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Näytetäänkö tilakenttä tapahtuman, tehtävät tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Näytetäänkö kello 24 tunnin vai am/pm muodossa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Näytetäänkö aiakavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Näytetäänkö tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Käytetäänkö kesäaikaa näytettäessä tapahtumia."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Työpäivät"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Työpäivän päättymistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Työpäivän päättymisminuutti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Työpäivän alkamistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Työpäivän alkamisminuutti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "kesäaika"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
@@ -5179,15 +5051,15 @@ msgstr "Yhteenveto sisältää"
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentti sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Sijainti sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
@@ -5198,6 +5070,20 @@ msgstr "Täsmäämättömät"
 msgid "Print"
 msgstr "Tulosta"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Kalenteri"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5213,10 +5099,10 @@ msgstr "Poista vanhemmat tapahtumat kuin"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "päivä"
 
@@ -5224,90 +5110,90 @@ msgstr "päivä"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Verkossa"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja vuosipäivät"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Sää"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Kalenterien päivitys epäonnistui."
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kalenterin \"%s\" avaus tehtävien ja kokousten luontia varten epäonnistui"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Kalenterilähteen valinta"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Koko _päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -5459,25 +5345,26 @@ msgid "A_dd"
 msgstr "_Lisää"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Hälytykset"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Ehdota liitteen automaattista näyttämistä"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../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 "Ehdota liitteen automaattista näyttämistä"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
@@ -5503,7 +5390,7 @@ msgstr ""
 "<i>%u ja %d korvataan käyttäjällä ja aluenimellä sähköpostiosoitteesta.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Hälytykset</span>"
 
@@ -5512,7 +5399,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Vapaa/varattu-tietojen oletuspalvelin</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Yleistä</span>"
@@ -5529,25 +5416,27 @@ msgstr "<span weight=\"bold\">Aika</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Työviikko</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Säädä _kesäajan mukaan"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Päivä _päättyy:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Näytä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:586
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Vapaa/Varattu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5557,13 +5446,13 @@ msgstr ""
 "tuntia\n"
 "päivää"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5581,225 +5470,226 @@ msgstr ""
 "lauantai\n"
 "sunnuntai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Valitse väri"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "_Su"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Select the calendars for alarm notification"
 msgstr "Valitse kalenterit, joiden hälytykset lähetetään"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Sh_ow a reminder"
 msgstr "Näytä muistutus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Show week _numbers in date navigator"
 msgstr "Näytä _viikkonumerot"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_asks due today:"
 msgstr "_Tänään erääntyvät tehtävät:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "T_hu"
 msgstr "_To"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Template:"
 msgstr "Pohja:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Aikavyöhyke: "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Wee_k starts on:"
 msgstr "Viikon ensimmäinen päivä:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Work days:"
 msgstr "Työpäivät:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tuntia (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_24 hour"
 msgstr "_24 tuntia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Compress weekends in month view"
 msgstr "_Tiivistä viikonloput kuukausinäkymässä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Day begins:"
 msgstr "_Päivä alkaa:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Fri"
 msgstr "_Pe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Mon"
 msgstr "_Ma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Overdue tasks:"
 msgstr "_Eräpäivän ylittäneet tehtävät:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Sat"
 msgstr "_La"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Show appointment end times in week and month view"
 msgstr "_Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Time divisions:"
 msgstr "_Aikajaot:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Tue"
 msgstr "_Ti"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Wed"
 msgstr "_Ke"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "before every appointment"
-msgstr "ennen tapaamista"
+msgstr "_Ennen joka tapaamista"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "_Kopioi kalenterin sisältö paikallisesti yhteydettömään käyttöön"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Kopioi kansion sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "_Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käyttöön"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "_Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Väri:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
-msgstr "Tehtävälista"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
+msgstr "Lista tehtävistä"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memo List"
-msgstr "Muistilappulista"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
+msgstr "_Muistilappulista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Lisää kalenteri"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Lisää tehtävälista"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "Lisää kalenteri"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Lisää tehtävälista"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
-msgstr "_Virkistysväli:"
+msgstr "_Virkistä:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5874,29 +5764,29 @@ msgstr "(erääntyy "
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Liitetty viesti - %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:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
 
@@ -5904,7 +5794,7 @@ msgstr "Peruuta _raahaus"
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5916,96 +5806,96 @@ msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Ominaisuudet..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Lisää liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Näytä liitteet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Näytä tai piilota liitepalkki välilyönnillä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päiväkirjamerkintä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:310
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voida käyttää!"
 
@@ -6021,10 +5911,6 @@ msgstr "Kohdetta ei voi avata"
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Tapahtumaa ei voi poistaa corba-virheen takia"
@@ -6087,11 +5973,11 @@ msgstr "Valtuuta:"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:559
 msgid "Appoint_ment"
 msgstr "Tapaa_minen"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:563
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Toistuvuus"
@@ -6102,9 +5988,8 @@ msgid "This event has alarms"
 msgstr "Tapahtumassa on hälytyksiä"
 
 #: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../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 "_Järjestäjä:"
@@ -6126,7 +6011,6 @@ msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
 #: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
@@ -6144,13 +6028,11 @@ msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
 #: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
 
 #: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
@@ -6196,19 +6078,24 @@ msgid "Customize"
 msgstr "Muokkaa"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: ../calendar/gui/dialogs/event-page.c:2963
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1691
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1507 ../widgets/misc/e-dateedit.c:1721
 msgid "None"
 msgstr "Määrittelemätön"
 
@@ -6225,8 +6112,9 @@ msgid "15 minutes before appointment"
 msgstr "15 minuuttia ennen tapaamista"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "O_sanottajat..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "_Osanottajat..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
@@ -6246,12 +6134,16 @@ msgstr "_Kuvaus:"
 msgid "Event Description"
 msgstr "Tapahtuman kuvaus:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+msgid "Locat_ion:"
+msgstr "_Sijainti:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Alarm"
 msgstr "_Hälytys"
 
@@ -6319,7 +6211,7 @@ msgstr "Kuittauspyyntö"
 #: ../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
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
 
@@ -6340,81 +6232,62 @@ msgid "Organizer"
 msgstr "Järjestäjä:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Järjestäjä:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "Vastaanottaja"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "_Alkamispäivä:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "_Yhteenveto"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-msgid "T_o:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "_Muistilapun sisältö:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalenterin vaihtoehdot</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Lisää uusi kalenteri"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Kalenteriryhmä"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Kalenterin sijainti"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Kalenterin nimi"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Tehtävälistan vaihtoehdot</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Lisää uusi tehtävälista"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Tehtävälistan ryhmä"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Tehtävälistan nimi"
 
@@ -6561,7 +6434,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Poikkeukset</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>Esikatselu</b>"
 
@@ -6626,15 +6499,15 @@ msgstr "<span weight=\"bold\">Tila</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Valmis"
 
 #: ../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-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Korkea"
 
@@ -6643,20 +6516,20 @@ msgstr "Korkea"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2379
 msgid "In Progress"
 msgstr "Työn alla"
 
 #: ../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-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Matala"
 
 #: ../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-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Tavallinen"
 
@@ -6664,7 +6537,7 @@ msgstr "Tavallinen"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2376
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
@@ -6677,7 +6550,7 @@ msgid "Stat_us:"
 msgstr "_Tila:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
@@ -6686,7 +6559,7 @@ msgid "_Date completed:"
 msgstr "_Valmistumispäivä:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
@@ -6712,10 +6585,6 @@ msgstr "Eräpäivä on virheellinen"
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Osanottajat..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "_Luokat..."
@@ -6724,6 +6593,10 @@ msgstr "_Luokat..."
 msgid "Or_ganiser:"
 msgstr "_Järjestäjä:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "_Alkamispäivä:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Aikavyöhyke:"
@@ -6732,46 +6605,46 @@ msgstr "Aikavyöhyke:"
 msgid "_Due date:"
 msgstr "_Eräpäivä:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Vapaa/Varattu _kalenterit</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Julkaisutiheys</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>Julkaisun _sijainti</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Vapaa/varattu-tiedon julkaisun asetukset"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Päivittäin"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Manuaalinen"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Viikoittain"
 
@@ -6852,42 +6725,35 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
-msgid "Untitled"
-msgstr "Nimetön"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "Muistilappu:"
 
-#: ../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
-msgid "Start Date:"
-msgstr "Alkamispäivä:"
-
-#: ../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
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Nimetön"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "Alkamispäivä:"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Eräpäivä:"
@@ -6897,7 +6763,7 @@ msgstr "Eräpäivä:"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:907
 msgid "Status:"
 msgstr "Tila:"
 
@@ -6905,18 +6771,26 @@ msgstr "Tila:"
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Kuvaus:"
+
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Julkinen"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
@@ -6925,25 +6799,24 @@ msgid "End Date"
 msgstr "Päättymispäivä"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Kuvaus"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Vapaa"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Varattu"
 
@@ -6957,17 +6830,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
@@ -6978,21 +6851,21 @@ msgstr "Ei"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1716
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:669
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
@@ -7000,7 +6873,7 @@ msgstr "Annettu tehtäväksi"
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 
@@ -7009,9 +6882,9 @@ msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 msgid "untitled_image.%s"
 msgstr "nimetön_kuva.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
@@ -7029,79 +6902,74 @@ msgstr "Tallenna _valitut"
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../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:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Uusi _tehtävä"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../calendar/gui/e-calendar-table.c: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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7109,52 +6977,44 @@ msgstr "_Avaa www-sivu"
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: ../calendar/gui/e-calendar-table.c: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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtävät valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Merkitse keskeneräiseksi"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Merkitse valitut tehtävät keskeneräisiksi"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Poista valitut tehtävät"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Lisää tehtävä näpäyttämällä tästä"
@@ -7164,7 +7024,7 @@ msgstr "Lisää tehtävä näpäyttämällä tästä"
 msgid "% Complete"
 msgstr "% valmiina"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Valmis"
 
@@ -7189,101 +7049,105 @@ msgstr "Aloituspäivä"
 msgid "Task sort"
 msgstr "Tehtävän tyyppi"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Siirretään kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Uusi _kokous"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Uusi _tehtävä"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Valitse päiväys..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2349
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -7296,7 +7160,7 @@ 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
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I.%M.%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #: ../calendar/gui/e-cell-date-edit-text.c:124
 #, c-format
@@ -7313,7 +7177,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin välein"
@@ -7324,21 +7188,19 @@ msgstr "%02i minuutin välein"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1538
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:858
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "pm"
@@ -7431,12 +7293,10 @@ msgstr "iCalendarin virhe"
 
 #: ../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:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
@@ -7450,22 +7310,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Accepted"
 msgstr "Hyväksytty"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Declined"
 msgstr "Hylätty"
 
@@ -7682,7 +7542,7 @@ msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1080
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Läsnäolon tilaa ei voida päivittää, koska kohdetta ei enää ole olemassa"
@@ -7730,35 +7590,48 @@ msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr " - "
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalenteriviesti"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Päiväys:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Ladataan kalenteria"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Ladataan kalenteria..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Palvelinviesti:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "loppumispäivä"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "alkamispäivä"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Toimi puheenjohtajana"
@@ -7777,65 +7650,65 @@ msgid "Resources"
 msgstr "Resurssit"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Huone"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Vapaaehoinen läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Alustava"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1713
 msgid "Delegated"
 msgstr "Valtuutettu"
 
@@ -7844,14 +7717,14 @@ msgstr "Valtuutettu"
 msgid "Attendee                          "
 msgstr "Osallistuja                       "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Työn alla"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7859,86 +7732,86 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Näytä _etäänpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu näpäyttämällä tästä"
 
@@ -7946,8 +7819,8 @@ msgstr "Lisää muistilappu näpäyttämällä tästä"
 msgid "Memo sort"
 msgstr "Muistilappujen järjestys"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7965,7 +7838,7 @@ msgstr "Ladataan muistilappuja"
 msgid "Opening memos at %s"
 msgstr "Avataan muistilappuja sijainnista %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Valtuutetaan seuraavat tehtävät...."
 
@@ -7974,20 +7847,20 @@ msgstr "Valtuutetaan seuraavat tehtävät...."
 msgid "Enter the password for %s"
 msgstr "Syötä salasana %s:lle"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Viimeistellään tehtäviä..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
@@ -7998,48 +7871,42 @@ msgstr "Valitse aikavyöhyke"
 #. 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:329 ../calendar/gui/print.c:1522
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Päivitetään kyselyä"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "_Oma näkymä"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_Tallenna oma näkymä"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Määrittele näkymät..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ladataan tehtäviä %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, c-format
-msgid "Loading memos at %s"
-msgstr "Ladataan muistilappuja lähteestä %s"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -8153,18 +8020,14 @@ msgstr "iCalendarin tiedot"
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "_Uusi muistilappulista"
-
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8172,58 +8035,46 @@ msgid_plural ", %d selected"
 msgstr[0] ", %d valittu"
 msgstr[1] ", %d valittua"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "Muistilappujen päivitys epäonnistui."
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Muistilappulistaa '%s' ei voi avata uusien tapahtumien ja kokousten "
 "lisäämistä varten"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Muistilappujen lähteen valinta"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
-msgstr "M_uistilappu"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr "_Muistilappu"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "Uusi jaettu muistilappu"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "_Jaettu muistilappu"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "Luo uusi jaettu muistilappu"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
-msgstr "Muistilappuli_sta"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
+msgstr "Muistilappul_ista"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
@@ -8565,14 +8416,14 @@ msgid "New task list"
 msgstr "Uusi tehtävälista"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "_Tehtävälista"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8584,11 +8435,11 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Älä kysy enää uudestaan"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
@@ -9164,7 +9015,7 @@ msgid "America/Nassau"
 msgstr "Amerikka/Nassau"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerikka/New_York"
 
@@ -10165,25 +10016,25 @@ msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
+#: ../widgets/misc/e-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
+#: ../widgets/misc/e-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
+#: ../widgets/misc/e-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:974
 msgid "Attachment Bar"
 msgstr "Liitepalkki"
 
@@ -10191,43 +10042,43 @@ msgstr "Liitepalkki"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:242 ../widgets/misc/e-attachment.c:258
+#: ../widgets/misc/e-attachment.c:449 ../widgets/misc/e-attachment.c:467
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Tiedoston %s liittäminen epäonnistui: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:250 ../widgets/misc/e-attachment.c:458
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Tiedoston %s liittäminen epäonnistui: epätavallinen tiedosto"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Tiedostonimi:"
 
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME-tyyppi:"
 
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja näpäyttämällä tästä"
 
@@ -10238,45 +10089,45 @@ msgstr "Avaa osoitekirja näpäyttämällä tästä"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Lähettäjä:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10287,15 +10138,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Valitse kansiot, joihin postituksia lähetetään, näpäyttämällä tästä"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "_Postita:"
 
@@ -10303,18 +10154,18 @@ msgstr "_Postita:"
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Lisää liite"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10322,52 +10173,52 @@ msgstr ""
 "Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Tiedostoa ei voi avata"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Viestiä ei voida hakea muokkaimelta"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10516,7 +10367,7 @@ msgstr "_Tallenna viesti"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10537,7 +10388,6 @@ msgid "calendar information"
 msgstr "Kalenterin tietoja"
 
 #: ../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"
@@ -10548,17 +10398,14 @@ msgstr ""
 "Haluatko muuttaa tilasi tilaan \"Konttorilla\"?"
 
 #: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Poissa konttorilta-viesti:</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Tila:</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"
@@ -10569,12 +10416,10 @@ msgstr ""
 "sinulle sähköpostia kun olet poissa konttorilta.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr "Olen tällä hetkellä konttorilla"
 
 #: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Olen tällä hetkellä poissa konttorilta"
 
@@ -10583,24 +10428,26 @@ msgid "No, Do not Change Status"
 msgstr "Älä vaihda tilaa"
 
 #: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
 msgstr "\"Poissa konttorilta\"-apulainen"
 
 #: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
 msgstr "Kyllä, vaihda tila"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr " "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Vastaanotetaan sähköpostia</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Lähetetään sähköpostia:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10612,33 +10459,33 @@ msgstr ""
 "ja määritellä, mitä Evolution tekee jos joku pyytää sinulta kuittausta.</"
 "small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Lähetä aina kuittaus viestin lukemisesta"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Kysy, lähetäänkö \"luettu\"-kuittaus takaisin"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Älä koskaan lähetä \"luettu\"-kuittausta"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Vastaanottajat"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Pyydä \"luettu\"-kuittausta kaikista sähköposteista, jotka lähetän"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "Paitsi jos viesti on lähetetty sähköpostilistalle eikä minulle "
 "henkilökohtaisesti"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10646,7 +10493,7 @@ msgstr ""
 "Mitä Evolutionin tulisi tehdä, kun vastaanotat sähköpostiviestin \"luettu\"-"
 "kuittauspyynnöllä?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10654,28 +10501,28 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolutionin virhe"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolutionin varoitus"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolutionin tiedot"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolutionin kysely"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Sisäinen virhe, tuntematonta virhettä \"%s\" haettiin"
@@ -10696,7 +10543,7 @@ msgstr "Haluatko ylikirjoittaa?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Tiedosto &quot;{0}&quot;on jo olemassa."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
@@ -10770,24 +10617,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Valitse tiedosto"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Tärkeä"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Tehtävää"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Myöhemmin"
 
@@ -10836,11 +10683,11 @@ msgid "Include threads"
 msgstr "Ota myös säikeet mukaan"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Lähtevät"
 
@@ -10865,7 +10712,7 @@ msgstr "Päiväys puuttuu."
 msgid "Missing file name."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -10937,7 +10784,7 @@ msgstr "sitten"
 msgid "months"
 msgstr "kuukautta"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -11009,22 +10856,22 @@ msgstr "Evolution sähköpostin muokkaimen asetukset"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution sähköpostin asetukset"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Sähköposti"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
@@ -11051,7 +10898,7 @@ msgstr ""
 "ja ruksita laatikko, jos hyväksyt lisenssin\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
@@ -11059,46 +10906,46 @@ msgstr "Valitse kansio"
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Vastaanotto"
 
-#: ../mail/em-account-editor.c:2014
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "T_arkista onko uutta postia joka"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Lähetys"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Turvallisuus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Vastaanoton asetukset"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Uusien viestien haku"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
@@ -11118,22 +10965,22 @@ msgid "[Default]"
 msgstr "[Oletus]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Tilin nimi"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protokolla"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
@@ -11303,7 +11150,7 @@ msgstr "Lista"
 msgid "is not Flagged"
 msgstr "ei ole merkitty"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Roskaposti"
@@ -11312,7 +11159,7 @@ msgstr "Roskaposti"
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Luokittelu"
 
@@ -11356,7 +11203,7 @@ msgstr "Soita ääni"
 msgid "Read"
 msgstr "Lue"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
@@ -11384,11 +11231,11 @@ msgstr "palauttaa vähämmän kuin"
 msgid "Run Program"
 msgstr "Suorita ohjelma"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Pistemäärä"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Lähettäjä"
 
@@ -11420,11 +11267,11 @@ msgstr "alkaa"
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Aihe"
@@ -11438,42 +11285,10 @@ msgstr "Poista tilan asetus"
 msgid "<b>Then</b>"
 msgstr "<b>Silloin</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Kaikki viestit"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Lukemattomat viestit"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Ei nimiötä"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Luetut viestit"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Äskettäiset viestit"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days' Messages"
-msgstr "Viimeisten viiden päivän viestit"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Viestit, joissa on liitteitä"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Viestit, jotka eivät ole roskapostia"
-
 #. 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
@@ -11490,7 +11305,7 @@ msgstr[0] "Lukemattomia viestejä:"
 msgstr[1] "Lukemattomia viestejä:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
@@ -11507,7 +11322,7 @@ msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Hakunäkymät"
 
@@ -11522,7 +11337,7 @@ msgstr "Luonnokset"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Saapuneet"
 
@@ -11538,77 +11353,77 @@ msgstr "Lähetetyt"
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voida tiputtaa ylätason taltioon"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopioi kansioon"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Siirrä..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -11617,14 +11432,13 @@ msgstr "_Tyhjennä roskakori"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopioidaan %s paikkaan %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Kopioi"
 
@@ -11646,168 +11460,158 @@ msgstr "Luo uusi kansio"
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse _edelleen lähetettäväksi..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Nimiö"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Hakunäkymä _aiheen perusteella"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Hakunäkymä _lähettäjän perusteella"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Hakunäkymä _vastaanottajien perusteella"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Hakunäkymä _listan perusteella"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Viestiä ei voida hakea"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Kopioi linkin sijainti"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Luo uusi hakunäkymä"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Osoitteeseen:"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:503
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Osumia: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "Etsi:"
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "Täsmää _kirjainkoko"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11815,11 +11619,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11827,11 +11631,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on "
 "hyvintodennäköisesti aito."
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11839,11 +11643,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voida tarkistaa, se on ehkä muuttunut "
 "siirron aikana."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11851,11 +11655,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voida varmistaa."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11863,11 +11667,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11877,11 +11681,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11889,11 +11693,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11903,72 +11707,72 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältön missään "
 "käytännöllisessä ajassa."
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voida näyttää"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Valmistui %B %d, %Y, %l.%M %p"
+msgstr "Valmistui %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "kirjoittanut %d %l.%M %p"
+msgstr "kirjoittanut %d %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Sovita _leveyteen"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Näytä alkuperäinen k_oko"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Valitse kansio, johon kaikki liitteet tallennetaan..."
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Tallenna valinta..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d lii_te"
-msgstr[1] "%d lii_tettä"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] "%d _liite"
+msgstr[1] "%d _liitettä"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "T_allenna"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Ei liitteitä"
 
@@ -11982,89 +11786,95 @@ msgstr "Sivu  %d / %d"
 msgid "Retrieving `%s'"
 msgstr "Haetaan %s"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Muotoillaan viestiä"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Vastaanottaja"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Piilokopiot"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Uutisryhmät"
@@ -12114,7 +11924,7 @@ msgstr "Kerran viikossa"
 msgid "Once per month"
 msgstr "Kerran kuussa"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12126,47 +11936,47 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kansiota '%s' ei voida luoda: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kansiota %s ei voi kopioidaan kohtaan %s: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Sähköpostin läpikäynti kohteesta '%s' epäonnistui: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Vanhaa POP keep-on-server tietoa '%s' ei voi avata: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 keep-on-server tietojen hakemistoa '%s' ei voi luoda: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server tietoa `%s' ei voi kopioida: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Paikallista sähköpostitilaa '%s' ei voi luoda: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Paikallisia sähköpostikansioita ei voi luoda paikkaan '%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12183,6 +11993,10 @@ msgstr "_Vastaa lähettäjälle"
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Avaa linkki selaimessa"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
@@ -12191,49 +12005,49 @@ msgstr "Lähetä uusi _viesti..."
 msgid "_Add to Address Book"
 msgstr "_Lisää osoitekirjaan"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Tämä varasto ei tue tilaamista tai tilaukset eivät ole käytössä."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Kansio"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Älä näytä tätä viestiä uudestaan."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "viesti"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Tallenna viesti..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Lisää osoite"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
@@ -12242,7 +12056,7 @@ msgstr "Viestit %s:ltä"
 msgid "Search _Folders"
 msgstr "_Hakunäkymät"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Hakunäkymän lähde"
 
@@ -12275,110 +12089,82 @@ msgid "Composer Window default width"
 msgstr "Viestinkirjoitusikkunan oletusleveys"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Rajaa näytettäviä To-, Cc- ja Bcc-osoitteita"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteden lukumäärä avaimessa "
-"address_count määrättyyn arvoon."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Viestinkirjoitusikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Viesti-ikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Tilausikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Viestinkirjoitusikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Viesti-ikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Tilausikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Näytä oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Käytetäänkö kirjoitettaessa toimivaa hakua"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Ota käyttöön sivupalkin hakutoiminto, jonka avulla voit aloittaa "
-"interaktiivisen haun kirjoittamalla haettavan tekstin. Voit käyttää tätä "
-"etsimään kansio sivupaneelista kirjoittamalla kansion nimi, jolloin valinta "
-"hyppää suoraan kansion kohdalle."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Viestilistapaneelin korkeus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Viestilistapaneelin korkeus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12386,15 +12172,7 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatkotodella "
 "tehdä sen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Jos \"Esikatselu\"-paneeli on käytössä, se näytetään viestilistan vieressä "
-"eikä alapuolella."
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12404,27 +12182,23 @@ msgstr ""
 "voidaan käyttää mitä tahansa Gnomen MIME-tyyppientietokannassa määriteltyä "
 "bonobo-komponentin katselinta viestin näyttämiseen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Näytetäänkö vahvistusikkuna merkittäessä useita viestejä."
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Hyväksytyt lisenssit"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lista tileistä"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12433,11 +12207,11 @@ msgstr ""
 "merkkijonoja, jotka nimeävät alihakemistoja hakemiston/apps/evolution/mail/"
 "accounts alla."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista omista otsakkeista ja tieto siitä ovatko ne käytössä."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12445,19 +12219,19 @@ msgstr ""
 "Evolutionin sähköpostiosan tuntemat etiketit. Lista sisältää nimi:väri "
 "pareja, jossa väri on määäritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista MIME-tyypeistä, joille etsitään bonobo komponenttikatselimia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista protokollista, joiden lisenssii on hyväksytty."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Hae HTML-viestien kuvat käyttäen HTTP:ta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12467,99 +12241,95 @@ msgstr ""
 "koskaan hae kuvia verkosta 1 - Hae kuvia, jos lähettäjä on osoitekirjassa 2 "
 "- Hae kuvat aina verkosta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Viestiikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Viestiikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Viestin näyttötyyli (\"normal\", \"full headers\" tai \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 "Pienin määrä päiviä, jonka kuluttua roskakori tyhjennetään suljettaessa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Vähimmäisaika roskakorin tyhjennysten välillä (päiviä)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Uudesta postista huomauttava äänitiedosto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Uutta postia-huomuksen tyyppi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "To-, Cc- ja Bcc-osoitteiden näytettävä lukumäärä"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Kysy kun käyttäjä yrittää avata kymmenen tai useampia kerralla"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12567,106 +12337,91 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
 "eivät sellaista halua vastaanottaa."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
 "kenttiä"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "Kysy vahvistus merkittäessä useita viestejä"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Suorita roskapostitarkistus saapuvalle postille"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Lähetä oletuksena HTML-sähköpostia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Lähetä HTML-postia oletuksena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestilistassa."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestilistalla"
 
-#: ../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 ""
-"Näytä lähettäjän sähköpostiosoite viesti-ikkunan viestien yhdistesarakkeessa"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Näytä lähettäjän sähköposti viestilistan viestisarakkeessa"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Äänitiedosto joka soitetaan, kun uusia viestejä saapuu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Määrittelee saapuneiden viestien huomautuksen, jota käyttäjä haluaa käyttää."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Tilausikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Tilausikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Päätteen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "Viimeisin kerta kun roskakori on tyhjennetty, päivinä epach:ista alkaen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Päätekirjasin viestien näyttöön"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Vaihtelevan levyinen kirjasin viestien näyttöön"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12677,111 +12432,99 @@ msgstr ""
 "otsakkeita ja sen, näytetäänkö niitä. XML-rakenteen muoto on &lt;header "
 "enabled&gt; - määrittele enabled, jos otsake halutaan näyttää postinäkymässä."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Tämä asettaa viestilistan oletusnäkymässä näytettävien viestin lukumäärän, "
-"jonka jälkeen näytetään '...'."
-
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Säikeistä viestilista"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Säikeistä viestilista"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestilista aiheen perusteella"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Käytä Spamassassin-palvelinta ja -asiakasta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Käytä Spamassassin-palvelinta ja -asiakasta (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Käytä omia kirjasimia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Käytä omia kirjasimia viestien näyttöön"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:ää)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Näytä vierekkäistä, leveää asettelua"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Näytä/Bcc on valittu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Näytä/Bcc on valittu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Näytä/Cc on valittu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Näytä/Cc on valittu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Näytä/Lähettäjä on valittu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Näytä/Lähettäjä on valittu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Näytä/Lähetä ryhmään on valittu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Näytä/Lähetä ryhmään on valittu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Näytä/Vastausosoite on valittu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Näytä/Vastausosoite on valittu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12789,14 +12532,6 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Viestilistapaneelin leveys"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Viestilistapaneelin leveys."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja Elmistä"
@@ -12828,15 +12563,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Odota, ole hyvä"
 
@@ -13016,31 +12751,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d lukematon"
 msgstr[1] ", %d lukematonta"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Viesti"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "Sähköpostikansio"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Sähköpostin asetusten tai kansioiden päivitys epäonnistui."
 
@@ -13068,220 +12803,226 @@ msgstr "Te_htävää"
 msgid "_Later"
 msgstr "_Myöhemmin"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr " "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Tar_kista tuetut tyypit"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL ei ole tuettu tässä Evolutionin käännöksessä</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Alle_kirjoitukset</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>Kielet</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Tämä tekee suodattimesta luotettavan mutta hitaamman</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Tilin tiedot</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tunnistustapa</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Tunnistus</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Viestien kirjoitus</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Asetukset</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Oletustoimintatapa</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Poista viesti</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Näytettävät otsakkeet</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Suodattimen asetukset</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Merkinnät ja värit</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Kuvien lataus</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Viestin näyttö</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Viestin kirjasimet</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Viestin vastaanottajat</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Huomautus uusista viesteistä</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Valinnaiset tiedot</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Vaihtoehdot</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tulostettavat kirjasimet</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Vaadittavat tiedot</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Turvallisuus</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Lähetetyt viestit ja luonnokset</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Palvelimen asetukset</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Lisää _skripti"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "_Salaa myös itselleni salattua sähköpostia lähetettäessä"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piiloitettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Salaa _aina myös itselle lähetettäessä salattua sähköpostia"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Liitä alkuperäinen viesti"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Lisää _hymiöt kuvina automaattisesti"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balttilainen (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balttilainen (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "_Piippaa kun uutta sähköpostia saapuu"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "_Merkistö:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Tar_kista tuetut tyypit"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Etsi _saapuvasta sähköpostista roskapostia"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Etsi roskapostia saapuneiden viestien joukosta"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Tyhjennä"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "_Tyhjennä"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Värit"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13297,135 +13038,135 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi näpäyttämällä painiketta \"Toteuta\""
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Oletustili"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Merkistön _oletuskoodaus:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Allekirjoita lähtevät viestit sähköisesti (oletuksena)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Älä lainaa alkuperäistä viestiä"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "_Luonnosten kansio:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "Kä_ytä"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Salausvarmenne:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Salaa lähtevät viestit oletuksena"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "_Tasalevyinen kirjasin:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Muotoile viestit HTML:nä"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML-viesti"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukeen käytetty väri"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "Lisää myös etätestit"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Sisäkkäisesti"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Sähköpostiasetukset"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Postilaatikon sijainti"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Viestin muokkain"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Huomio: salasanaa ei kysytä ennen kuin otat ensimmäistä kertaa yhteyttä"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _avaimen ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Soita äänitiedosto uuden sähköpostin saapuessa"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13433,7 +13174,7 @@ msgstr ""
 "Syötä kuvaava nimi tälle tilille allaolevaan kenttään.\n"
 "Tätä nimeä käytetään ainoastaan ohjelman sisäisesti tilin näyttöön."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13442,7 +13183,7 @@ msgstr ""
 "asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13452,43 +13193,39 @@ msgstr ""
 "kentät eivät ole pakollisia, jollet halua sisältää näitä tietoja "
 "lähettämiisi sähköpostiviesteihin."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Valitse joku seuraavista vaihtoehdoista"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Lainaa alkuperäinen viesti"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "_Valitse..."
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_end message receipts:"
-msgstr "Läh_etä viestin kuittaus:"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "_Oletuskirjaisin:"
@@ -13517,51 +13254,55 @@ msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "Lähetä viestin kuittaus:"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Allekirjoitusten taulu"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Anna _tiedostonimi:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "_Tyyppi:"
 
-#: ../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."
@@ -13569,7 +13310,7 @@ msgstr ""
 "Lista käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../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"
@@ -13579,7 +13320,7 @@ msgstr ""
 "Nimi jonka valitset on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13587,15 +13328,15 @@ msgstr ""
 "Anna nimi jolla haluaisit kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13605,73 +13346,69 @@ msgstr ""
 "\n"
 "Valitse \"Eteenpäin\" aloittaaksesi."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Lisää allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Älä huomauta uuden sähköpostin saapumisesta"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Hae viestin kuvat, jos yhteystieto on osoitekirjassa"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Älä koskaan lataa kuvia verkosta"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Kysy vahvistus lähetettäessä HTML-viestejä henkilöille, jotka eivät niitä "
 "halua"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Kysy vahvistus lähetettäessä viestejä tyhjällä Aihe-otsakkella"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Komentotiedosto:"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Rajaa To-, Cc- ja Bcc-otsakkeet lukumäärään "
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Käytä salattua yhteyttä:"
@@ -13681,21 +13418,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _kirjasimia kuin muut ohjelmat"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "osoitteet"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
-msgstr " väri"
+msgstr " "
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "kuvaus"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr " "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Hakunäkymöiden lähteet</b>"
@@ -13709,63 +13438,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Salaus</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Kaikki aktiiviset etäkansiot"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Kaikki paikalliset kansiot ja aktiiviset etäkansiot"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Kaikki paikalliset kansiot"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "Kirjain_koolla on merkitystä"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
-msgstr "_Etsi:"
+msgstr "Et_si:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Hae viestistä"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Ei mitään valittuna"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "_Palvelin: "
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Tietyt kansiot"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13773,42 +13486,67 @@ msgstr ""
 "Viestit jotka olet valinnut lähetettäviksi edelleen on listattu alla.\n"
 "Valitse tehtävä uudelleenlähetys \"Merkki\" valikosta."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Hyväksy lisenssi"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Erääntyy:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Merkki:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Subscribe"
+msgstr "_Tilaa"
+
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
+#: ../mail/mail-dialogs.glade.h:24
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "_Peru tilaus"
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "vain määritellyt kansiot"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "kaikki aktiiviset etäkansiot"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "kaikki paikalliset ja aktiiviset etäkansiot"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "kaikki paikalliset kansiot"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Suodatetaan kansiota"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Haetaan viestejä"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13817,114 +13555,123 @@ msgstr ""
 "Lisäys '%s':ään epäonnnistui: %s\n"
 "Lisätään paikalliseen 'Lähetetyt' kansioon."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Viestin lisäys paikalliseen 'Lähetetyt'-kansioon epäonnistui: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d viestin %d:stä epäonnistui"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä %s"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Virkistetään kansiota"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Haetaan %d viesti"
 msgstr[1] "Haetaan %d viestiä"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Tallenetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Tulostiedoston luonti epäonnistui: %s\n"
+"%s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13933,11 +13680,11 @@ msgstr ""
 "Virhe tallennettaessa viestejä: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13946,69 +13693,60 @@ msgstr ""
 "Tulostiedostoa ei voida luoda: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voi kirjoittaa: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Yhteyttä %s katkaistaan"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudestaan yhteyttä kohteeseen %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejä"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Anna salasana tunnukselle %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Anna salasana"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Käyttäjä perui toimenpiteen."
 
@@ -14021,7 +13759,7 @@ msgid "Enter a name for this signature."
 msgstr "Anna allekirjoitukselle nimi"
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -14064,11 +13802,11 @@ msgstr "Päivitetään hakunäkymää \"%s:%s\""
 msgid "Updating Search Folders for '%s'"
 msgstr "Päivitetään hakunäkymää \"%s\""
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunäkymää"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
@@ -14086,7 +13824,7 @@ msgid ""
 msgstr ""
 "Kansio &quot;{1}&quot; on jo olemassa ja sisältää tietoja.\n"
 "\n"
-"Voit ohittaa tämän kansion, kirjoittaa sen yli, lisätä kansioon tai poistua."
+"Voit ohittaa tämän kansion, kirjoittaa yli, lisätä kansioon tai poistua."
 
 #: ../mail/mail.error.xml.h:5
 msgid ""
@@ -14388,34 +14126,30 @@ msgid "Mark all messages as read"
 msgstr "Merkitse kaikki viestit luetuiksi"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Mark all messages in subfolders as read?"
-msgstr "Merkitse kaikki alikansioiden viestit luetuksi?"
+msgid "Mark all messages as read in the selected folder"
+msgstr "_Merkitse kaikki viestit luetuiksi valitussa kansiossa"
 
 #: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "Merkitse _luetuksi"
-
-#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Lähteitä ei ole valittuna."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Liian monen viestin avaus kerralla voi viedä pitkän ajan."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Tarkista tilisi asetukset ja yritä uudestaan."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Ota tili käyttöön tai lähetä käyttäen toista tiliä."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14423,7 +14157,7 @@ msgstr ""
 "Syötä kelvollinen sähköpostiosoite Vastaanottaja: kenttään. Voit etsiä "
 "sähköpostiosoitteita näpäyttämällä Vastaanottaja: painiketta kentän vieressä."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14435,55 +14169,55 @@ msgstr ""
 "\n"
 "Lähetetäänkö joka tapauksessa?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Virhe siirrettäessä vanhaa sähköpostikansiota &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Kysytään palvelimelta"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Kuittausta pyydetty."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Poistetaanko todella kansio &quot;{0}&quot; ja kaikki sen alikansiot?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Hakunäkymät päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Lähetä kuittaus"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Allekirjoitus on jo olemassa"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
+"Järjestelmän kansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
 "voida nimetä uudestaan, siirtää tai poistaa."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14500,7 +14234,7 @@ msgstr ""
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14514,7 +14248,7 @@ msgstr ""
 "   &quot;{0}&quot;\n"
 "ja ne on päivitetty."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14528,11 +14262,11 @@ msgstr ""
 "   &quot;{1}&quot;\n"
 "ja ne on päivitetty."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Skriptitiedoston tulee olla olemassa ja suoritettavissa."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14540,7 +14274,7 @@ msgstr ""
 "Kansio on ehkä lisätty järjestelmän puolesta.\n"
 "Siirry hakunäkymien muokkaukseen ja lisää se erikseen, jos tarpeen."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14548,12 +14282,12 @@ msgstr ""
 "Viestiä ei voida lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Viestiä ei voida lähettää, koska et ole määritellyt vastaanottajia"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14561,11 +14295,11 @@ msgstr ""
 "Palvelin ei tue tämän tyyppistä tunnistautumista eikä välttämättä tue "
 "lainkaan tunnistautumista."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14573,11 +14307,11 @@ msgstr ""
 "Tämä toiminto merkitsee kaikki viestit valitussa kansiossa ja sen "
 "alikansioissa luetuiksi."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise-palvelimeen ei saatu yhteyttä."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14585,40 +14319,40 @@ msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voi avata."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Käytä _oletuksia"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Käytä oletuskansiota luonnoksille?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14628,100 +14362,96 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
 "kaikki etä- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Kirjautumisesi palvelimelle  &quot;{0}&quot; käyttäjänä &quot;{0}&quot; "
 "epäonnistui."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Lisää"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
 #: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "Älä merkitse _luetuksi"
-
-#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
-msgstr "Tänään %l.%M %p"
+msgstr "Tänään %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
-msgstr "Eilen %l.%M %p"
+msgstr "Eilen %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
-msgstr "%a %l.%M %p"
+msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %l.%M %p"
+msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2064
 msgid "Messages"
 msgstr "Viestit"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3446
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -14741,15 +14471,15 @@ msgstr "Merkitty"
 msgid "Follow Up Flag"
 msgstr "Lähetä edelleen-merkki"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Alkuperäinen sijainti"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Lähetetyt viestit"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Koko"
@@ -14921,7 +14651,7 @@ msgstr "Valitse osoitekirja Gaimin kaverilistalle"
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
-msgstr "Yhdistä tiedot _kaverilistasta"
+msgstr "Synkronoi _kaverilistan yhteystiedot"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
@@ -15025,6 +14755,10 @@ msgstr ""
 "Testiliitännänen, joka tarjoaa ponnahdusikkunan jolla voit kopioida asioita "
 "leikepöydälle."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopioi sähköpostiosoite"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Kopiointityökalu"
@@ -15135,7 +14869,7 @@ msgid "Change the password for Exchange account"
 msgstr "Syötä Exchange-tilin salasana"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
@@ -15207,31 +14941,29 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Salasanat eivät ole samat. Syötä salasanat uudestaan."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "Varmista salasana:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "Nykyinen salasana:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "Uusi salasana:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr "Salasanasi on vanhentunut. Ole hyvä ja vaihda salasanasi nyt."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Salasanasi vanhenee seuraavan %d päivän kuluessa"
 
-#. 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
 msgid "Custom"
 msgstr "Oma näkymä"
 
@@ -15351,7 +15083,7 @@ msgstr "Kansion nimi"
 msgid "Folder Size"
 msgstr "Kansion koko"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Tilaa muiden käyttäjien kansioita"
@@ -15366,14 +15098,14 @@ msgstr "Exchangen kansiopuu"
 msgid "Unsubscribe Folder..."
 msgstr "Peru kansion tilaus..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Peru \"%s\" tilaus"
@@ -15406,66 +15138,62 @@ msgstr "Lisää käyttäjä:"
 msgid "Add User"
 msgstr "Lisää käyttäjä"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Oikeudet</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Ei voida poistaa"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Ei voida muokata"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Luo kohteita"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Luo alikansioita"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Poista kohteita"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Poista omat kohdat"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Muokkaa kohtia"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Muokka omia kohtia"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Kansion sisältö"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Kansion omistaja"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Kansio näkyvissä"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Luetut kohdat"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Rooli: "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Ei, älä muuta tilaa"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 msgid "Select User"
 msgstr "Valitse käyttäjä"
@@ -15503,26 +15231,22 @@ msgid "Cannot display folders."
 msgstr "Kansioita ei voida näyttää."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Toimenpidettä ei voi suorittaa."
-
-#: ../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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Muutokset Exchange-tilin \"{0}\" asetuksiin tulevat voimaan, kun olet "
-"sulkenut ja käynnistynyt Evolutionin uudestaan."
+"Muutokset Exchange-tilin asetuksiin tulevat voimaan, kun olet sulkenut ja "
+"käynnistynyt Evolutionin uudestaan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Palvelimelle tunnistautuminen epäonnistui."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Salasanan vaihto epäonnistui."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15532,55 +15256,55 @@ msgstr ""
 "tuntematon virhe. Tarkista URL, käyttäjätunnus ja\n"
 "salasana ja yritä uudestaan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Exchange-palvelimeen ei saatu yhteyttä."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Palvelimeen {0} ei saatu yhteyttä."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Kansion oikeuksia valtuutetuille ei voi selvittää."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Exchange Web Storage Systemiä ei löytynyt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Palvelinta {0} ei löytynyt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Käyttäjää {0} ei voi merkitä valtuutetuksi"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Kansion oikeuksia ei voi lukea"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Kansion oikeuksia ei voi lukea."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "\"Poissa konttorilta\"-tilaa ei voi lukea."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Kansion oikeuksia ei voi päivittää."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "\"Poissa konttorilta\"-tilaa ei voi päivittää."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Exchange-tili on yhteydettömässä tilassa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15607,32 +15331,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Valtuutuslistan päivitys epäonnistui:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Kansio on jo olemassa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Kansiota ei ole olemassa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Kansio on yhteydettömässä tilassa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Global Catalog Server is not reachable"
-msgstr "Yhteinen luettelopalvelin ei ole käytettävissä"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15640,69 +15360,65 @@ msgstr ""
 "Jos OWA on käytössä eri polussa täytyy se määritellä erikseen tilin "
 "asetuksissa."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Sähköpostit käyttäjälle {0} eivät ole tällä palvelimella."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Tarkista että URL on oikein ja yritä uudestaan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Tarkista että palvelimen nimi on kirjoitettu oikein ja yritä uudestaan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Tarkista että käyttäjätunnus ja salasana ovat oikein ja yritä uudestaan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Yhteistä luettelopalvelinta ei ole määritelty tälle tilille."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Käyttäjällä {0} ei ole postilaatikkoa palvelimella {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Käyttäjää {0} ei ole olemassa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Salasanan vaihto onnistui."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Sever name is correct."
-msgstr "Varmista, että yhteisen luettelopalvelimen nimi on oikein."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Käynnistä Evolution uudestaan, jotta muutokset tulevat voimaan"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Käynnistä Evolution uudestaan"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Valitse käyttäjä."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Palvelin hylkäsi salasanan, koska se on liian yksinkertainen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange-tili poistetaan käytöstä kun suljet evolutionin"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange-tili poistetaan, kun suljet Evolutionin"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange-palvelin ei ole yhteensopiva Exchange Connectorin kanssa."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15710,7 +15426,7 @@ msgstr ""
 "Palvelimen versio on Exchange 5.5. Exchange Connector \n"
 "tukee ainoastaan versioita Microsoft Exchange 2000 ja 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15723,52 +15439,52 @@ msgstr ""
 "osana käyttäjätunnusta (esim. &quot;ALUENIMI\\käyttäjä&quot;).\n"
 "Voi myös olla että syötit väärän salasanan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Yritä uudestaan eri salasanalla."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Käyttäjää ei voi lisätä pääsylistalle:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Valtuutuslistan muokkaus epäonnistui."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Tuntematon virhe etsittäessä {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Tuntematon tyyppi"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Toimenpide ei ole tuettu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Sähköpostisi tallennukseen varattu tila tällä palvelimella alkaa loppua."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Et voi valtuuttaa itseäsi."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Sähköpostillesi varattu tila tällä palvelimella on loppu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Voit määritellä vain yhden Exchange-tilin."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15776,14 +15492,14 @@ msgstr ""
 "Käytät tällä hetkellä {0} kt. Yritä vapauttaa tilaa poistamalla joitain "
 "viestejä."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "Käytät tällä hetkellä {0} kt. Et voi lähettää tai vastaanottaa sähköpostia."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15791,19 +15507,19 @@ msgstr ""
 "Käytät tällä hetkellä {0} kt. Et voi lähettää sähköpostia ennen kuin olet "
 "vapauttanut tilaa poistamalla joitain tallennettuja viestejä."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Salasanasi on vanhentunut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} ei voi lisätä pääsylistalle"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} on jo valtuutettu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} on jo listalla"
 
@@ -15829,17 +15545,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Peru kansioiden tilauksia"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "_Peru tilaus"
-
-#: ../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
-msgid "Notes"
-msgstr "Muistilaput"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Muistilista"
 
@@ -15884,21 +15590,13 @@ msgstr "_Käytä"
 msgid "_Junk List"
 msgstr "_Roskapostilista"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
-msgid "Message retracted successfully"
-msgstr "Viestin peruminen onnistui"
-
-#: ../plugins/groupwise-features/mail-retract.c:60
-msgid "Retract Mail"
-msgstr "Peru viesti"
-
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Lisää lähetysoptioita groupwise-viesteihin"
 
 #: ../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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Lähetyksen asetukset"
 
@@ -15914,40 +15612,40 @@ msgstr "Groupwisen ominaisuudet"
 msgid "Accept Tentatively"
 msgstr "Hyväksy alustavasti"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>Käyttäjät:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Viesti"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Jaetun kansion huomautus"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Osallistujat saavat seuraavan huomautuksen.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Yhteystiedot..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_Muokkaa huomautusviestiä"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Ei jaettu"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Jaettu henkilöille ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Jako"
 
@@ -16082,7 +15780,7 @@ msgid "Select Calendar"
 msgstr "Valitse kalenteri"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Tuo"
 
@@ -16142,103 +15840,103 @@ msgstr ""
 "varten."
 
 #: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kalenterin \"%s\" lataus epäonnistui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
 "kanssa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:494
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:501
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:505
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:509
 msgid "Unable to find this journal entry in any journal"
 msgstr "Tätä päiväkirjamerkintää ei löydy mistään päiväkirjasta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:582
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassaolevia versioita tapaamisesta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:833
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:844
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:848
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:853
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:858
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:951
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:958
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1045
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1076
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1203
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1204
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16246,15 +15944,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1239
+#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1330
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16262,11 +15960,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1265
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16276,270 +15974,270 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:2061
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:202
 msgid "Today %l:%M:%S %p"
-msgstr "Tänään %l.%M.%S %p"
+msgstr "Tänään %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Huomenna"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
-msgstr "Huomenna %l.%M %p"
+msgstr "Huomenna %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "Huomenna %l.%M.%S %p"
+msgstr "Huomenna %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%Ana klo %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
-msgstr "%Ana klo %l.%M %p"
+msgstr "%Ana klo %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
-msgstr "%Ana klo %l.%M.%S %p"
+msgstr "%Ana klo %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 msgid "%A, %B %e"
 msgstr "+%Ana %d. %Bn %Y"
 
 #. 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:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %d. %Bn klo %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:288
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %d. %Bn klo %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:293
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %l:%M %p"
-msgstr "+%Ana %d. %Bn klo %l.%M %p"
+msgstr "+%Ana %d. %Bn klo %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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "+%Ana %d. %Bn klo %l.%M.%S %p"
+msgstr "+%Ana %d. %Bn klo %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %d. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %d. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %d. %Bta %Y klo %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:317
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Ana %d. %Bta %Y klo %l.%M %p"
+msgstr "%Ana %d. %Bta %Y klo %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Ana %d. %Bta %Y klo %l.%M.%S %p"
+msgstr "%Ana %d. %Bta %Y klo %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegoi seuraavan kokouksen sinulle:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> toivoo lisäystänsä olemassaolevaan kokoukseen %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> perui seuraavan kokouksen %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> on perunut seuraavan tapaamisen."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> kieltäytyi seuraavista kokousmuutoksista."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> julkaisi seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> antoi sinulle tehtävän %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> antoi sinulle tehtävän:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään %s:n kautta"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -16547,152 +16245,114 @@ msgid ""
 msgstr ""
 "<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> on perunut seuraavan annetun tehtävän %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> on perunut seuraavan annetun tehtävän:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> julkaisi %s:n kautta seuraavan muistilapun:"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> julkaisi seuraavan muistilapun:"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> haluaa lisätä olemassaolevaan muistilappuun %s kautta:"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> haluaa lisätä olemassaolevaan muistilappuun:"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> perui seuraavan jaetun muistilapun %s:n kautta:"
-
-#: ../plugins/itip-formatter/itip-view.c:497
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> on perunut seuraavan jaetun muistilapun:"
-
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "_Hylkää"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "H_yväksy"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "_Hylkää"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "_Hyväksy kaikki"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "_Lähetä tiedot"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "_Päivitä"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:890
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:899
 msgid "End time:"
 msgstr "Loppumisaika:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:915
+#: ../plugins/itip-formatter/itip-view.c:965
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:979
 msgid "Send u_pdates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:988
 msgid "A_pply to all instances"
 msgstr "Käytä kaikkiin tapahtumakertoihin"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "_Tehtävät :"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "Muistilaput :"
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "Näytä kalenterin text/calendar-osia."
@@ -16704,10 +16364,10 @@ msgstr "Itip-muotoilija"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
-"&quot;{0}&quot; on antanut kokouksen järjestettäväksi. Haluatko lisätä "
-"osallistujan &quot;{1}&quot;?"
+"&quot;{0}&quot; on valtuuttanut kokouksen. Haluatko lisätä valtuutetun &quot;"
+"{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16798,14 +16458,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Muunna valittu viesti uudeksi tehtäväksi"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Ota yhteyttä listan _omistajaan"
 
 #: ../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 "Hae listan _arkisto"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Hae listan _käyttötietoja"
 
@@ -16827,14 +16490,17 @@ msgstr ""
 "perutilaus...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Lähetä viesti listalle"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Tilaa lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Peru listan tilaus"
 
@@ -16917,27 +16583,15 @@ msgstr "_Muokkaa viestiä"
 msgid "_Send message"
 msgstr "_Lähetä viesti"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Ota yhteyttä listan _omistajaan"
-
 #: ../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 "Ota yhteyttä viestin sisältämän sähköpostilistan omistajaan"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Hae listan _arkisto"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Hae tietoja listan _käytöstä"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Hae arkisto viestin sisäältämästä postituslistasta"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Hae tietoja viestin sisältämän postituslistan käytöstä"
 
@@ -16953,24 +16607,12 @@ msgstr "Tilaa viestin sisältämä postituslista"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Peru viestin sisältämän postituslistan tilaus"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Lähetä viesti listalle"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Tilaa lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "Per_u listan tilaus"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Merkitse kaikki _luetuksi"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Merkitse vie_stit luetuiksi"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -17236,12 +16878,12 @@ msgstr "Tallenna kaikki liitteet"
 msgid "Select save base name"
 msgstr "Valitse tallennuspaikan nimi"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:360
 msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
-#: ../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:368
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Tallenna"
 
@@ -17351,7 +16993,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF-muoto (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
@@ -17399,19 +17041,19 @@ msgstr ""
 "\n"
 "Valitse \"Jatka\" jatkaaksesi. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Tuodaan tietoja."
 
@@ -17499,15 +17141,11 @@ msgstr "Sivupaneeli on näkyvissä"
 msgid "Skip development warning dialog"
 msgstr "Hypätäänkö kehitysversiovaroituksen yli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Tilarivi on näkyvissä"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17515,19 +17153,19 @@ msgstr ""
 "Evolutionin konfiguraatioversio, major/minor/configuration tasoilla "
 "(esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Pääikkunan oletuskorkeus pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Pääikkunan oletusleveys pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Sivupaneelin oletusleveys pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17535,7 +17173,7 @@ msgstr ""
 "Viimeisin päivitetty Evolutionin konfiguraatioversio, major/minor/"
 "configuration tasoilla (esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17545,45 +17183,41 @@ msgstr ""
 "\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
 "asetusta."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Työkalupalkki on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Käynnistetäänkö Evolution yhteydettömässä vai yhteydellisessä tilassa."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Onko ikkuna suurennettu."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Näytetäänkö sivupaneeli."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Näytetäänkö tilarivi."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Piilotetaanko varoitusikkuna Evolutionin kehitysversion käytöstä vai ei."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Näytetäänkö ikkunan napit."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit näytetään"
 
@@ -17605,11 +17239,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17623,11 +17257,11 @@ msgstr ""
 "Voit valita myös \"Automaattisen\" jos et tiedä tiedoston muotoa, ja "
 "Evolution yrittää päätellä sen."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17639,23 +17273,23 @@ msgstr ""
 "tuoda Evolutioniin, ei löytynyt. Jos haluat yrittää uudestaan, valitse\n"
 "\"Takaisin\".\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
@@ -17716,7 +17350,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "_Yhtedellinen tila"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Yhteydetön tila"
 
@@ -17770,15 +17404,10 @@ msgstr "OAF:ia ei voidaan rekisteröidä"
 msgid "Configuration Database not found"
 msgstr "Asetustietokantaa ei löytynyt"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Uusi"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Uusi "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Uusi testi"
@@ -17830,7 +17459,7 @@ msgstr ""
 "Evolutionin käyttöön."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17866,7 +17495,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17874,39 +17503,35 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Aloita yhteydellisessä tilassa"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tuo tiedot väkisin uudestaan Evolution 1.4:stä"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään liitännäisiä."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "Evolution-sähköpostiohjelma"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18664,12 +18289,12 @@ msgstr "Tallenna valitut yhteystiedot VCardina."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Tallenna yhteytiedot valitussa kansiossa VCardina"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Valitse kaikki"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Valitse _kaikki"
@@ -18739,7 +18364,7 @@ msgstr "_Siirry yhteystieto..."
 msgid "_Move Folder Contacts To"
 msgstr "_Siirrä kansion sisältö..."
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Uusi"
 
@@ -18800,7 +18425,6 @@ msgid "Month"
 msgstr "Kuukausi"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Seuraava"
 
@@ -18809,7 +18433,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Edellinen"
 
@@ -18897,11 +18521,11 @@ msgstr "_Leikkaa valinta leikepöydälle"
 msgid "Paste from clipboard"
 msgstr "Liitä leikepöydältä"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Liitä tekstiä leikepöydältä"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
@@ -18936,31 +18560,30 @@ msgstr "Napsauta tästä näyttääksesi ohje"
 msgid "Close"
 msgstr "Sulje"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Li_sää"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "O_hje"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "Li_sää"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Vaihtoehdot"
@@ -19059,11 +18682,6 @@ msgstr "Määrittää näytetäänkö aika varattuna"
 msgid "_Alarms"
 msgstr "_Hälytykset"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Ryhmät"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19129,73 +18747,53 @@ msgid "F_older"
 msgstr "_Kansio"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Viestin esikatselu"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
 #. 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 "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Näytä viestin _esikatselu"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Näytä viestin esikatselu viestilistan alla"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Näytä viestin esikatselu viestilistan vieressä"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Perinteinen näkymä"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Esikatselu"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Tilatut kansiot"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "_Pystysuuntainen näkymä"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
@@ -19755,10 +19353,6 @@ msgid "_Unread"
 msgstr "l_ukematon"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Suurenna"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
@@ -19766,7 +19360,7 @@ msgstr "Lä_hennä"
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Päätyökalupalkki"
 
@@ -19841,6 +19435,11 @@ msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 msgid "HT_ML"
 msgstr "_HTML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Li_sää"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Avaa tiedosto"
@@ -20170,51 +19769,43 @@ msgstr "Kuvakkeina _ja tekstinä"
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "_Asettelu"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "As_etukset"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Muokkaa Pilotin asetuksia"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Näytä tietoja Evolutionista"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Näytä sivu_palkki"
+msgid "Side _Bar"
+msgstr "Sivu_palkki"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Näytä _tilarivi"
+msgid "Status _Bar"
+msgstr "_Tilarivi"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Näytä työ_kalupalkki"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Näytä tietoja Evolutionista"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Lähetä vikailmoitus"
 
@@ -20222,71 +19813,75 @@ msgstr "Lähetä vikailmoitus"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Lähetä _vikailmoitus"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Määritä, työskennelläänkö poissa linjoilta."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "_Työkalupalkki"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Näytä tai piilota sivupalkki"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Näytä tai piilota tilarivi"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "_Unohda salasanat"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Piilota napit"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Vain _kuvakkeina"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_Pilotin synkronointi..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Vain _teksti"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Ikkuna "
 
@@ -20323,34 +19918,26 @@ msgid "_Work Week View"
 msgstr "Työviikk_onäkymä"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Lähetetyt-kansion mukaan leveässä näkymässä"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "_Lähetetyt-kansion mukaan"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "_Tilan mukaan"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "_Lähettäjän mukaan"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "_Aiheen mukaan"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "_Vastaus viestiin-lipun mukaan"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Le_veälle näkymälle"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Viestit"
 
@@ -20366,32 +19953,28 @@ msgstr "_Eräpäivän kanssa"
 msgid "With _Status"
 msgstr "_Tilan kanssa"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Aikavyöhykkeet</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Valinta/</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Valitse _aikavyöhyke"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "Aikavyöhykeen komboboksi"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20427,7 +20010,7 @@ msgid "_Edit..."
 msgstr "_Muokkaa..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20441,11 +20024,11 @@ msgstr "Tapahtumiskerta"
 msgid "Save Current View"
 msgstr "Tallenna nykyinen näkymä"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "Luo uusi _näkymä"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
@@ -20480,31 +20063,26 @@ msgstr "Tehdas"
 msgid "Define New View"
 msgstr "Määrittele uusi näkymä"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "Uuden näkymän nimi:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "Näkymän tyyppi"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 msgstr "Näkymän tyyppi:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Ehdota liitteen automaattista näyttämistä"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20514,8 +20092,8 @@ msgstr "Kuukausikalenteri"
 
 #: ../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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Täytön väri"
 
@@ -20524,16 +20102,16 @@ msgstr "Täytön väri"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "GDK:n täyttöväri"
 
 #: ../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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Täytön kuviopeite"
 
@@ -20572,11 +20150,11 @@ msgid "Minimum Width"
 msgstr "Minimileveys"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Välistys"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Nyt"
 
@@ -20704,41 +20282,33 @@ msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 msgid "Time"
 msgstr "Aika"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "N_yt"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Tänään"
-
 #. 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"
+msgstr "%H.%M"
 
 #. 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-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Laajennettu"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Onko laajennin laajennettu"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Laajentimen otsikon teksti"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Käytä alleviivausta"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20746,80 +20316,64 @@ msgstr ""
 "Jos asetettu, tarkoittaa alleviivaus tekstissä, että seuraavaa merkkiä "
 "käytetään pikanäppäimenä"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Otsikon ja lapsen väliin laitettava tila"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Merkintä-elementti"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Tavallisen laajennin-otsikin tilalla näytettävä elementti"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Laajentimen koko"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Laajennusnuolen koko"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikaattioen välistys"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Laajennusnuolen ympärillä oleva tila"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Oma haku"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Tallenna haku"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Haut"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Haut"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Tallenna haku"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Kaikki tilit"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Valittu tili"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Valittu kansio"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Valittu viesti"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Valitse kuva"
@@ -20860,45 +20414,45 @@ msgstr "Uudelleenvirtauksen malli"
 msgid "Column width"
 msgstr "Sarakkeen leveys"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Etsi"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
-msgstr "Et_si"
+msgstr "_Etsi"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Haun tyyppi"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Kohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "Alikohteen ID"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Teksti"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:911
-msgid "Show: "
-msgstr "Näytä: "
-
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:927
-msgid "Sear_ch: "
-msgstr "_Etsi: "
-
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:939
-msgid " i_n "
-msgstr " lä_hteestä "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "_Etsi nyt"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20947,8 +20501,8 @@ msgid "A_uto-delete sent item"
 msgstr "Poista lähetetty _automaattisesti"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Luokittelu"
+msgid "C_lassification"
+msgstr "_Luokittelu"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -20972,29 +20526,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"Tavallinen\n"
-"Kaupallinen\n"
+"Julkinen\n"
+"Yksityinen\n"
 "Luottamuksellinen\n"
-"Salainen\n"
-"Erittäin salainen\n"
-"Ainoastaan sinulle"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "V_astausta pyydetty"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -21006,51 +20554,51 @@ msgstr ""
 "Normaali\n"
 "Matala"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Milloin hy_väksytty: "
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Milloin val_mistuu:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Milloin h_ylätty: "
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "S_isällä"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Jälkeen:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Kaikki tiedot"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Viivästä viestin toimitusta"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Toimitettu"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "Aseta _eräpäivä"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Kunnes:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "Milloin _sopii"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "_Milloin avattu:"
 
@@ -21068,19 +20616,19 @@ msgstr "%s (%d %% valmiina)"
 msgid "Click here to go to URL"
 msgstr "Napsauta tästä avataksesi URLin"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "Muokkaa luokkien päälistaa..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "Näihin _luokkiin kuuluvat kohdat:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "Valittavat _luokat:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "luokat"
 
@@ -21090,7 +20638,7 @@ msgstr "ponnahduslista"
 
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
-msgstr "%l.%M %p"
+msgstr "%H.%M %p"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Selected Column"
@@ -21104,23 +20652,23 @@ msgstr "Kohdistettu sarake"
 msgid "Unselected Column"
 msgstr "Valitsematon sarake"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1786
 msgid "Strikeout Column"
 msgstr "Yliviivattu sarake"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1793
 msgid "Underline Column"
 msgstr "Alleviivaa sarake"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1800
 msgid "Bold Column"
 msgstr "Vahva sarake"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Color Column"
 msgstr "Värillinen sarake"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1821
 msgid "BG Color Column"
 msgstr "Taustan värinen sarake"
 
@@ -21135,7 +20683,6 @@ msgstr "Valittavat kentät:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Nouseva"
 
@@ -21146,7 +20693,6 @@ msgstr "Tyhjennä merkki"
 
 #: ../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 "Descending"
 msgstr "Laskeva"
 
@@ -21244,14 +20790,14 @@ msgstr "_Näytä kentät järjestyksessä:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD-koodi"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Täysi otsake"
 
@@ -21271,19 +20817,25 @@ msgstr ""
 "Lisää sarake taulukkoon raahaamalla se kohtaan,\n"
 "johon haluat sen ilmestyvän."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d kohta)"
-msgstr[1] "%s : %s (%d kohtaa)"
+msgstr "%s : %s (%d kohde)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d kohdetta)"
+
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d kohta)"
-msgstr[1] "%s (%d kohtaa)"
+msgstr "%s (%d kohde)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d kohdetta)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21363,69 +20915,65 @@ msgstr "Yhtenäinen rivinkorkeus"
 msgid "Frozen"
 msgstr "Jäädytetty"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "järjestä nousevasti"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Järjestä laskevasti"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Poista järjestys"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Ryhmittele tämän kentän mukaan"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Ryhmittele laatikoittain"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Poista tämä sarake"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Lisää sarake..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Tasaus"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Paras koko"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Muotoile sarakkeet..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Mukauta nykyistä näkymää..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Järjestä kentän mukaan"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Kirjasinjoukko"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Tietoja järjestyksestä"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21477,7 +21025,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Tämän pitäisi testata minicard-kangasta"
 
 #: ../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:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Tapahtumaprosessori"
 
@@ -21490,57 +21038,57 @@ 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
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Asemointi"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Käytä ellipsejä"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Ellipsit"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Rivitys"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Katkaisevat merkit"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Rivejä enintään"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Salli rivinvaihdot"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Piirrä reunat"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Piirrä tausta"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Piirrä nappi"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Kohdistimen sijainti"
 
@@ -21548,143 +21096,65 @@ msgstr "Kohdistimen sijainti"
 msgid "Emulate label resize"
 msgstr "Emuloi otsikon koon muutosta"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Vahva"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Yliviivattu"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Ankkuri"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Leikkeen leveys"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Leikkeen korkeus"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Leike"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Täytä leikkauksen suorakulmio"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "X-offset"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Y-offset"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Tekstin leveys"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Tekstin korkeus"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "IM-konteksti"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Tilaa"
-
-#~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "Merkitään kaikki kansion viestit luetuiksi"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "Valitsemasi kalenteri on vain luettavissa"
-
-#~ msgid "Memo:"
-#~ msgstr "Muistilappu:"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "work"
-#~ msgstr "työ"
-
-#~ msgid "personal"
-#~ msgstr "henkilökohtainen"
-
-#~ msgid "C_lassification"
-#~ msgstr "_Luokittelu"
-
-#~ msgid ""
-#~ "Public\n"
-#~ "Private\n"
-#~ "Confidential\n"
-#~ msgstr ""
-#~ "Julkinen\n"
-#~ "Yksityinen\n"
-#~ "Luottamuksellinen\n"
-
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s : %s (%d kohdetta)"
-
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d kohdetta)"
-
 #~ msgid "Cale_ndar:"
 #~ msgstr "_Kalenteri:"
 
-#~ msgid "      "
-#~ msgstr " "
-
-#~ msgid "_Memo"
-#~ msgstr "_Muistilappu"
-
-#~ msgid "Category is"
-#~ msgstr "Luokka on"
-
-#~ msgid "Original Location"
-#~ msgstr "Alkuperäinen sijainti"
-
-#~ msgid "Search Type"
-#~ msgstr "Haun tyyppi"
-
-#~ msgid "Subitem ID"
-#~ msgstr "Alikohteen ID"
-
-#~ msgid "Find No_w"
-#~ msgstr "_Etsi heti"
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "date-end"
-#~ msgstr "loppumispäivä"
-
-#~ msgid "date-start"
-#~ msgstr "alkamispäivä"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Videoneuvottelu"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "_Sijainti:"
-
 #~ msgid "Dele_gatees"
 #~ msgstr "_Valtuutetut"
 
@@ -21695,13 +21165,6 @@ msgstr "Kahvan ponnahdusikkuna"
 #~ msgstr "Ominaisuudet..."
 
 #~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Tulostiedoston luonti epäonnistui: %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 "
@@ -21716,9 +21179,6 @@ msgstr "Kahvan ponnahdusikkuna"
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "Viestiäsi aiheesta &quot;{0}&quot; ei lähetetty."
 
-#~ msgid "_Insert"
-#~ msgstr "Li_sää"
-
 #~ msgid "(%ld seconds)"
 #~ msgstr "(%ld sekuntia)"
 
@@ -21803,6 +21263,9 @@ msgstr "Kahvan ponnahdusikkuna"
 #~ msgid "Attachment Button"
 #~ msgstr "Liitepainike"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Näytä tai piilota liitepalkki"
+
 #~ msgid "Filters"
 #~ msgstr "Suodattimet"
 
@@ -22128,43 +21591,43 @@ msgstr "Kahvan ponnahdusikkuna"
 #~ "Päättyy %s"
 
 #~ msgid "%a %m/%d/%Y %I:%M %p"
-#~ msgstr "%a %d/%m/%Y %I.%M %p"
+#~ msgstr "%a %d/%m/%Y %I:%M %p"
 
 #~ msgid "%a %m/%d/%Y %H:%M"
 #~ msgstr "%a %d/%m/%Y %H.%M"
 
 #~ msgid "%a %m/%d/%Y %I %p"
-#~ msgstr "%a %d.%m.%Y %I %p"
+#~ msgstr "%a %d.%m.%Y %l %p"
 
 #~ msgid "%a %m/%d/%Y %H"
 #~ msgstr "%a %d.%m.%Y %H"
 
 #~ msgid "%m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%d.%m.%Y %I.%M.%S %p"
+#~ msgstr "%d.%m.%Y %l.%M.%S %p"
 
 #~ msgid "%m/%d/%Y %H:%M:%S"
 #~ msgstr "%d.%m.%Y %H.%M.%S"
 
 #~ msgid "%m/%d/%Y %I:%M %p"
-#~ msgstr "%d.%m.%Y %I.%m %p"
+#~ msgstr "%d.%m.%Y %l.%m %p"
 
 #~ msgid "%m/%d/%Y %H:%M"
 #~ msgstr "%d.%m.%Y %H.%M"
 
 #~ msgid "%m/%d/%Y %I %p"
-#~ msgstr "%d.%m.%Y %I %p"
+#~ msgstr "%d.%m.%Y %l %p"
 
 #~ msgid "%m/%d/%Y %H"
 #~ msgstr "%d.%m.%Y %H"
 
 #~ msgid "%I:%M:%S %p"
-#~ msgstr "%I.%M.%S %p"
+#~ msgstr "%I:%M:%S %p"
 
 #~ msgid "%H:%M:%S"
 #~ msgstr "%H.%M.%S"
 
 #~ msgid "%I %p"
-#~ msgstr "%I %p"
+#~ msgstr "%l %p"
 
 #~ msgid "Exchange Connector access error."
 #~ msgstr "Exchange Connectorin yhdistämisvirhe."
diff --git a/po/fr.po b/po/fr.po
index cbde174fae..31d0195679 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,13 +18,12 @@
 # Robert-André Mauchin <zebob.m@gmail.com>, 2006.
 # Jonathan Ernst <jonathan@ernstfamily.ch>, 2006.
 #
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.7.90\n"
+"Project-Id-Version: evolution 2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-30 13:11+0200\n"
-"PO-Revision-Date: 2006-07-30 13:03+0200\n"
+"POT-Creation-Date: 2006-07-31 16:38+0200\n"
+"PO-Revision-Date: 2006-07-31 16:38+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +33,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "carnet d'adresses d'Evolution"
 
@@ -48,12 +47,12 @@ msgstr "Nouveau contact"
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "dossier actuel du carnet d'adresses %s possède %d carte"
-msgstr[1] "dossier actuel du carnet d'adresses %s possède %d cartes"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "dossier actuel du carnet d'adresses possède %d carte"
+msgstr[1] "dossier actuel du carnet d'adresses possède %d cartes"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -72,32 +71,32 @@ msgstr "Contact : "
 msgid "evolution minicard"
 msgstr "mini-carte d'Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Il possède des alarmes."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Il possède des récurrences."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "C'est une réunion."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Événement du calendrier : le résumé est %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Événement du calendrier : il n'a pas de résumé."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../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:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Capturer le focus"
 
@@ -127,47 +126,37 @@ msgid "a table to view and select the current time range"
 msgstr ""
 "un tableau pour consulter et sélectionner l'intervalle de temps courant"
 
-#. 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Il possède %d événement."
 msgstr[1] "Il possède %d événements."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:152
 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 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:158
 #, 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:189
 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:191
 msgid "calendar view for one or more days"
 msgstr "vue du calendrier pour un ou plusieurs jours"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -178,20 +167,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:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../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
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -199,10 +186,10 @@ msgstr "%a %d %b %Y"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -212,11 +199,9 @@ 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:220
-#: ../calendar/gui/calendar-component.c:732
-#: ../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
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -346,14 +331,6 @@ msgstr "Utiliser le défaut"
 msgid "Popup Menu"
 msgstr "Menu contextuel"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Affiche/Masque la barre des pièces jointes"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "activer"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -536,9 +513,9 @@ msgstr ""
 "Vos contacts pour {0} ne seront plus disponibles tant que Evolution n'aura "
 "pas été redémarré."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "A_jouter"
@@ -548,7 +525,7 @@ msgid "_Discard"
 msgstr "_Abandonner"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -588,9 +565,9 @@ msgstr "Configurez la complétion automatique ici"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -630,8 +607,8 @@ 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:141
 #: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -646,13 +623,12 @@ msgstr "Sur cet ordinateur"
 #. 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:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Personnel"
 
@@ -679,7 +655,7 @@ msgid "Create a new contact list"
 msgstr "Crée une nouvelle liste de contacts"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
@@ -697,73 +673,72 @@ msgstr ""
 "Échec lors de la mise à jour des paramètres ou des dossiers du carnet "
 "d'adresses."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type :"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 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:984
+#: ../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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:2003
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Général"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Informations sur le serveur"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Authentification"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Détails"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Recherche"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Téléchargement"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Propriétés du carnet d'adresses"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Migration..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migration de « %s » :"
@@ -838,35 +813,35 @@ msgstr "Les noms des dossiers ne peuvent pas contenir le caractère « / »"
 msgid "A Folder with this name already exists"
 msgstr "Un dossier avec ce nom existe déjà"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Nouveau carnet d'adresses"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Enregistrer comme VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Sélecteur de source des contacts"
 
@@ -875,12 +850,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
@@ -928,7 +903,7 @@ msgstr ""
 "L'URI du dossier utilisé en dernier dans le dialogue de sélection de noms."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Position du panneau vertical"
 
@@ -957,7 +932,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Authentification</b>"
 
@@ -1209,9 +1184,9 @@ msgstr "_Méthode d'identification :"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Nom :"
 
@@ -1224,10 +1199,10 @@ msgid "_Search scope:"
 msgstr "Domain_e de recherche :"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
-msgstr "S_erveur :"
+msgstr "_Serveur :"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
@@ -1244,249 +1219,270 @@ msgstr "cartes"
 #: ../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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "minutes"
 
 #: ../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/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Adresse électronique</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Domicile</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Messagerie instantanée</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Travail</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Divers</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Autre</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Téléphone</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Sites Web</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Bureau</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../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-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Contact"
 
-#: ../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/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2407
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "_Nom complet..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Image"
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "Messagerie MSN"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Adresse postale"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Surnom :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Téléphone"
 
 #. 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/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/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Bureau"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Anniversaire :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Adjoint :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "Date de _naissance :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1707
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/itip-formatter/itip-view.c:1654
 msgid "_Calendar:"
 msgstr "_Calendrier :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Catégories..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Catégories"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Ville :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Société :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Pays :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Service :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Classer sous :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Libre/Occupé :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Site Web :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Directeur :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notes :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Bureau :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Boîte postale :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Profession :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Conjoint(e) :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "État/Pro_vince :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Vidéo-conférence :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Préfère recevoir les courriels en HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Journal en ligne :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Où :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Code postal :"
 
 #: ../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/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 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:303
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1814 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Modifiable"
 
@@ -2462,7 +2458,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:371
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nom"
@@ -2473,7 +2469,7 @@ msgstr "Messagerie instantanée 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/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2481,102 +2477,91 @@ msgstr "Jabber"
 msgid "Yahoo Messenger"
 msgstr "Messagerie Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Messagerie 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:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
 msgstr "Service"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
-msgstr "Nom d'utilisateur"
+msgstr "Identifiant"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "Domicile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "Autre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../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:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Livre source"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Livre cible"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Nouveau contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Champs modifiables"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Champs requis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Modifié"
 
-#: ../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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Éditeur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2780
 msgid "Please select an image for this contact"
 msgstr "Veuillez sélectionner une image pour ce contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
-msgid "_No image"
-msgstr "_Aucune image"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2781
+msgid "No image"
+msgstr "Pas d'image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3066
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2584,23 +2569,23 @@ msgstr ""
 "La donnée sur le contact n'est pas valide :\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "« %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3077
 #, 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:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3092
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s « %s » est vide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3118
 msgid "Invalid contact."
 msgstr "Contact non valide."
 
@@ -2617,7 +2602,7 @@ msgid "_Full name"
 msgstr "_Nom complet"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+msgid "E-_mail"
 msgstr "_Adresse électronique"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
@@ -2628,7 +2613,7 @@ msgstr "_Sélectionner le carnet d'adresses"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Êtes-vous sûr de vouloir\n"
 "supprimer cette liste de contacts (%s) ?"
@@ -2645,7 +2630,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Êtes-vous sûr de vouloir\n"
 "supprimer ce contact (%s) ?"
@@ -2658,105 +2643,104 @@ msgstr ""
 "Êtes-vous sûr de vouloir \n"
 "supprimer ces contacts ?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2 :"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Ville :"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Pays :"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Adresse complète"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Code postal :"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Monsieur"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Mlle"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "M."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "MM"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Mme"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Prénom :"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Nom :"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "Second préno_m :"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Suffixe :"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Ajouter un compte d'IM"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Nom du compte :"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_Service d'IM :"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2767,63 +2751,63 @@ msgstr "_Emplacement :"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Ajouter une adresse électronique à la liste"
 
-#: ../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:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Éditeur de liste de contacts"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "Insérer des adresses électroniques à partir du carnet d'adresses"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Membres"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Supprimer une adresse électronique de la liste"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Masquer les adresses lors de l'envoi d'un mail à _cette liste"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Nom de la liste :"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "_Sélectionner"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../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 ""
 "_Saisissez une adresse électronique ou déplacez un contact dans la liste ci-"
 "dessous :"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "Carnet"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Est une nouvelle liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Membres"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Membres de la liste de contacts"
 
@@ -2864,18 +2848,25 @@ msgstr ""
 "Le nom ou l'adresse électronique de ce contact existe déjà\n"
 "dans ce dossier. Voulez-vous quand même l'ajouter ?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "La catégorie est"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Le nom commence par"
@@ -2893,7 +2884,7 @@ msgstr[1] "%d contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
@@ -2909,7 +2900,7 @@ msgstr "Erreur d'obtention de l'affichage du carnet"
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Modèle"
 
@@ -2917,114 +2908,113 @@ msgstr "Modèle"
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Source"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2069
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Enregistrer comme VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Nouveau contact..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "_Nouvelle liste de contacts..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Enregistrer comme VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Faire suivre le contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Faire suivre les contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Envoyer un _message au contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Envoyer un _message à la liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Envoyer un _message aux contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Copier vers le carnet d'adresses..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "_Déplacer vers le carnet d'adresses..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Co_uper"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "C_oller"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Toute catégorie"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1804
 msgid "Print cards"
 msgstr "Imprimer les cartes"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "Adjoint"
 
@@ -3065,7 +3055,7 @@ msgid "Company Phone"
 msgstr "Téléphone (société)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Adresse électronique"
@@ -3111,22 +3101,20 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "Directeur"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Téléphone portable"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "Surnom"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Note"
 
@@ -3135,7 +3123,7 @@ msgid "Office"
 msgstr "Bureau"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisation"
 
@@ -3168,7 +3156,6 @@ msgid "Role"
 msgstr "Rôle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
@@ -3199,7 +3186,7 @@ msgid "Web Site"
 msgstr "Site Web"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3210,12 +3197,12 @@ msgstr "Site Web"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Largeur"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3225,12 +3212,12 @@ msgstr "Largeur"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Hauteur"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "A le focus"
 
@@ -3306,139 +3293,76 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptateur"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "Adresse électronique (travail)"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "Adresse électronique (domicile)"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "Autre adresse électronique"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "Sélectionné"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "A le curseur"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Ouvrir un lien dans le navigateur"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Copier l'emplacement du lien"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "_Envoyer un nouveau message à..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Copier l'_adresse électronique"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(carte)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "carte"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Membres de la liste"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Department"
-msgstr "Service"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-msgid "Profession"
-msgstr "Profession"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-msgid "Video Chat"
-msgstr "Vidéo-conférence"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Calendrier"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "Libre/Occupé"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Visioconférence"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Home Page"
-msgstr "Site Web"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "bureau"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Web Log"
-msgstr "Journal en ligne"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "Web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "Date de naissance"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "Anniversaire"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "personnel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Fonction"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Page Web personnelle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3469,7 +3393,7 @@ msgstr "Aucun contact personnel défini"
 #. 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Permission refusée"
 
@@ -3494,7 +3418,7 @@ msgstr "Protocole non supporté"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2385
 msgid "Canceled"
 msgstr "Annulé"
 
@@ -3633,7 +3557,7 @@ msgid "Error adding list"
 msgstr "Erreur lors de l'ajout de la liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Erreur lors de l'ajout du contact"
 
@@ -3650,7 +3574,7 @@ msgid "Error removing list"
 msgstr "Erreur lors de la suppression de la liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Erreur lors de la suppression du contact"
 
@@ -3667,9 +3591,9 @@ msgstr[0] ""
 "Voulez-vous vraiment afficher ce contact ?"
 msgstr[1] ""
 "L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres.\n"
-"Voulez-vous vraiment afficher ces contacts ?"
+"Voulez-vous vraiment afficher tous ces contacts ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3678,64 +3602,64 @@ msgstr ""
 "%s existe déjà.\n"
 "Voulez-vous l'écraser ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contact"
 msgstr[1] "contacts"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Sélection du carnet d'adresses"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Déplacer le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Copier le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Déplacer les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Copier les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "VCards multiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pour %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Information sur le contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Information sur le contact %s"
@@ -3830,12 +3754,12 @@ msgstr "Assistant d'importation VCard d'Evolution"
 msgid "Print envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Imprimer les contacts"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Imprimer les contacts"
 
@@ -3884,7 +3808,7 @@ msgstr "Format"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "En-tête"
@@ -3988,7 +3912,7 @@ msgstr "Ombrage"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4228,17 +4152,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce rendez-vous ?"
 
 #: ../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 "Êtes-vous sûr de vouloir supprimer cette entrée de journal ?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette réunion ?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette tâche ?"
 
@@ -4376,17 +4297,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Le calendrier d'Evolution a quitté de façon inattendue."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Le memo d'Evolution a quitté de façon inattendue."
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Le gestionnaire de tâches d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "Le calendrier n'est pas marqué pour une utilisation hors-ligne."
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "Le calendrier que vous avez sélectionné est en lecture seule"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "La liste des mémos n'est pas marquée pour une utilisation hors-ligne."
@@ -4460,71 +4381,59 @@ msgstr ""
 "une version supportée."
 
 #: ../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
 msgid "You have changed this appointment, but not yet saved it."
 msgstr ""
 "Vous avez effectué, à ce rendez-vous, des modifications que vous n'avez pas "
 "encore sauvegardées."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr ""
 "Vous avez effectué, à cette tâche, des modifications que vous n'avez pas "
 "encore sauvegardées."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr ""
 "Vous avez effectué, à ce mémo, des modifications que vous n'avez pas encore "
 "sauvegardées."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Vos calendriers ne seront plus disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr ""
-"Vos mémos ne seront plus disponibles tant que Evolution n'aura pas été "
-"redémarré."
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Vos tâches ne seront plus disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "A_bandonner les modifications"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "_Enregistrer les changements"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "_Envoyer un avis"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
@@ -4541,8 +4450,8 @@ msgstr "Partager les événements sur plusieurs jours :"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Impossible de démarrer evolution-data-server"
 
@@ -4577,12 +4486,12 @@ msgid "Could not write pilot's ToDo application block"
 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:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "Calendar and Tasks"
 msgstr "Calendrier et tâches"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendriers"
 
@@ -4625,21 +4534,21 @@ msgid "Memo_s"
 msgstr "Mémo_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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Mémos"
 
 #: ../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/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tâches"
@@ -4657,16 +4566,16 @@ 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:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4675,7 +4584,7 @@ msgid_plural "hours"
 msgstr[0] "heures"
 msgstr[1] "heures"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:275
 msgid "Start time"
 msgstr "Heure de début"
 
@@ -4686,10 +4595,10 @@ msgstr "Rendez-vous"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "Location:"
 msgstr "Lieu :"
 
@@ -4699,16 +4608,16 @@ msgstr "_Durée du report :"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "É_dition"
 
@@ -4720,31 +4629,32 @@ msgstr "_Report"
 msgid "location of appointment"
 msgstr "lieu du rendez-vous"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Aucun résumé disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Aucune information sur l'emplacement disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d alarmes sont présentes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4757,7 +4667,7 @@ msgstr ""
 "un courriel. Evolution affichera une fenêtre\n"
 "d'avertissement classique à la place."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4774,7 +4684,7 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Ne plus m'interroger à propos de ce programme."
 
@@ -4881,110 +4791,97 @@ msgid "Default reminder value"
 msgstr "Valeur par défaut du rappel"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-#, fuzzy
-msgid "Event Gradient"
-msgstr "Informations de l'événement"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Transparence de l'événement"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "URLs des serveurs Libre/Occupé"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "URL du modèle Libre/Occupé"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Masquer les tâches terminées"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Masquer les unités des tâches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Masquer la valeur de la tâche"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Position du panneau horizontal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Heure à laquelle la journée de travail se termine, dans le format 24 heures, "
 "de 0 à 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Heure à laquelle la journée de travail commence, dans le format 24 heures, "
 "de 0 à 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Intervalles affichés dans les vues quotidiennes et hebdomadaires, en minutes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Dernier déclenchement de l'alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Liste des URLs des serveurs pour les publications des informations de type "
 "Libre/Occupé."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Ligne de l'heure courante (MBL)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Couleur de la ligne de l'heure courante (MBL) - Vue du jour"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Couleur de la ligne de l'heure courante (MBL) - Barre de temps"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minute à laquelle les journées de travail se terminent, de 0 à 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minute à laquelle les journées de travail commencent, de 0 à 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Position du panneau horizontal dans la vue mensuelle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Position du panneau vertical dans la vue mensuelle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Nombre d'unités pour déterminer un rappel par défaut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Nombre d'unités pour déterminer quand masquer les tâches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Couleur des tâches en retard"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4992,7 +4889,7 @@ msgstr ""
 "Position du panneau horizontal hors vue mensuelle, entre le navigateur de "
 "vues et de dates du calendrier et la liste des tâches, en pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5000,16 +4897,7 @@ msgstr ""
 "Position du panneau horizontale en vue mensuelle, entre le navigateur de "
 "vues et de dates du calendrier et la liste des tâches, en pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-#, fuzzy
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Position du panneau vertical, entre les cartes, la vue en liste et le "
-"panneau d'aperçu, en pixels."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5017,7 +4905,7 @@ msgstr ""
 "Position du panneau vertical, entre la liste des tâches et le panneau "
 "d'aperçu des tâches, en pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5025,7 +4913,7 @@ msgstr ""
 "Position du panneau vertical en vue mensuelle, entre le navigateur de vues "
 "et de dates du calendrier et la liste des tâches, en pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5033,69 +4921,69 @@ msgstr ""
 "Position du panneau vertical hors vue mensuelle, entre le navigateur de vues "
 "et de dates du calendrier et la liste des tâches, en pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmes qui peuvent être lancés par les alarmes."
 
 # Resource Reservation Protocol
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Afficher le champ RSVP dans l'éditeur d'événement/tâche/réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Afficher le champ rôle dans l'éditeur d'événement/tâche/réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
 "hebdomadaires"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 "Afficher le champ des catégories dans l'éditeur d'événement/tâche/réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Afficher les alarmes dans la zone de notification"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 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.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Afficher le panneau « Aperçu »"
 
-#: ../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.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Afficher le panneau « Précédent »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Afficher le champ fuseau horaire dans l'éditeur d'événement/réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Afficher le champ type dans l'éditeur d'événement/tâche/réunion"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Afficher les numéros de semaine dans le navigateur de dates"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Couleurs des tâches à effectuer aujourd'hui"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Position du panneau vertical des tâches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5105,7 +4993,7 @@ msgstr ""
 "remplacé par le nom d'utilisateur de l'adresse électronique tandis que %d "
 "sera remplacé par le nom de domaine."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5114,66 +5002,60 @@ msgstr ""
 "le calendrier, comme un emplacement non traduit de la base de données des "
 "fuseaux horaires d'Olsen par exemple « America/New York »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Divisions horaires"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Heure à laquelle la dernière alarme est lancée, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-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:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Format de date 24 heures"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Unités pour le rappel par défaut, « minutes », « hours » ou « days »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unités pour déterminer quand masquer les tâches, « minutes », « hours » ou "
 "« days »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Début de la semaine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Jour de début de la semaine, de dimanche (0) à samedi (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Indique si il faut utiliser ou non une icône de notification pour afficher "
 "les alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Indique si il faut demander une confirmation pour la suppression des rendez-"
 "vous ou des tâches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Indique si il faut demander une confirmation pour le nettoyage des rendez-"
 "vous et des tâches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5181,105 +5063,97 @@ msgstr ""
 "Indique si les week-ends doivent être compressés dans la vue mensuelle, ce "
 "qui placera samedi et dimanche dans l'espace d'un seul jour."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indique si il faut afficher l'heure de fin des événements dans les vues "
 "hebdomadaire et mensuelle."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indique si il faut dessiner la ligne Marcus Bains (ligne à la date courante) "
 "dans le calendrier."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 "Indique si il faut masquer les tâches terminées dans la vue des tâches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 "Indique si il faut mettre en place un rappel par défaut des rendez-vous."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indique si il faut afficher le champ RSVP dans l'éditeur d'événement/tâche/"
 "réunion."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indique si il faut afficher le champ catégories dans l'éditeur d'événement/"
 "tâche/réunion."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indique si il faut afficher le champ rôle dans l'éditeur d'événement/tâche/"
 "réunion."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indique si il faut afficher le champ état dans l'éditeur d'événement/tâche/"
 "réunion."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indique si il faut afficher l'heure en format 24h au lieu du format am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indique si il faut afficher le champ fuseau horaire dans l'éditeur "
 "d'événement/tâche/réunion."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indique si il faut afficher le champ type dans l'éditeur d'événement/tâche/"
 "réunion."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 "Indique si il faut afficher les numéros de semaine dans l'éditeur "
 "d'événement/tâche/réunion."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "Jours ouvrés"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Heure à laquelle les jours ouvrés se terminent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minute à laquelle les jours ouvrés se terminent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Heure à laquelle les jours ouvrés commencent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minute à laquelle les jours ouvrés commencent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr ""
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Le résumé contient"
@@ -5288,15 +5162,15 @@ msgstr "Le résumé contient"
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "L'emplacement contient"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Différent"
 
@@ -5307,6 +5181,20 @@ msgstr "Différent"
 msgid "Print"
 msgstr "Imprimer"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Calendrier"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5323,10 +5211,10 @@ msgstr "Nettoyer les événements plus vieux que"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "jours"
 
@@ -5334,93 +5222,93 @@ msgstr "jours"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Sur le Web"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Météo"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "_Nouveau calendrier"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Échec de la mise à jour des calendriers."
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, 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:1210
+#: ../calendar/gui/calendar-component.c:1152
 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:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Sélecteur de source de calendrier"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Nouveau rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Crée un nouveau rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Réunion"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Crée une nouvelle demande de réunion"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Nouveau rendez-vous toute la journée"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Rendez-vous toute la _journée"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Crée un nouveau rendez-vous toute la journée"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_Calendrier"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Crée un nouveau calendrier"
 
@@ -5572,25 +5460,26 @@ msgid "A_dd"
 msgstr "A_jouter"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../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
-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:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../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 "Suggérer l'affichage automatique de la pièce jointe"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Joindre des fichiers"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Calendriers sélectionnés pour les alarmes"
 
@@ -5617,7 +5506,7 @@ msgstr ""
 "domaine de l'adresse électronique.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertes</span>"
 
@@ -5626,7 +5515,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Serveur Libre/Occupé par défaut</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Général</span>"
@@ -5643,25 +5532,27 @@ msgstr "<span weight=\"bold\">Heure</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Semaine de travail</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "La journée se _termine :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Affichage"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:586
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Libre/Occupé"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Vendredi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5671,13 +5562,13 @@ msgstr ""
 "Heures\n"
 "Jours"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Lundi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5695,235 +5586,233 @@ msgstr ""
 "Samedi\n"
 "Dimanche"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "_Dim"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Samedi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Select the calendars for alarm notification"
 msgstr "Sélectionnez les calendriers pour les notifications d'alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Sh_ow a reminder"
 msgstr "A_fficher un rappel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Show week _numbers in date navigator"
 msgstr "Afficher les _numéros de semaine dans le navigateur de dates"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_asks due today:"
 msgstr "Tâches d'_aujourd'hui :"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "T_hu"
 msgstr "_Jeu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Template:"
 msgstr "Modèle :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Fuseau _horaire :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Time format:"
 msgstr "Format de date :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Mercredi"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Wee_k starts on:"
 msgstr "La s_emaine débute un :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Work days:"
 msgstr "Jours ouvrés :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_12 hour (AM/PM)"
 msgstr "_12 heures (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_24 hour"
 msgstr "_24 heures"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Demander une confirmation pour l'effacement des éléments"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Compress weekends in month view"
 msgstr "_Compresser les week-ends dans la vue mensuelle"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Day begins:"
 msgstr "La journée débute à :"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Fri"
 msgstr "_Ven"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Hide completed tasks after"
 msgstr "_Masquer les tâches effectuées après"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Overdue tasks:"
 msgstr "Tâches en _retard :"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Sat"
 msgstr "_Sam"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
 "hebdomadaires"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Time divisions:"
 msgstr "Di_visions horaires :"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Tue"
 msgstr "_Mar"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Wed"
 msgstr "M_er"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-#, fuzzy
-msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr ""
 "Copier localement le contenu du calendrier pour les opérations hors-ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-#, fuzzy
-msgid "Cop_y task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr ""
 "Copier localement le contenu de la liste des tâches pour les opérations hors-"
 "ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-#, fuzzy
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr ""
 "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.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_ouleur :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
 msgstr "Liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memo List"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
 msgstr "Liste des mémos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Propriétés du calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Propriétés de la liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Nouvelle liste des mémos"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Ajouter un calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Ajouter une liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "A_jouter un calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "A_jouter une liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "_Rafraîchir :"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL :"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -6002,29 +5891,29 @@ msgstr " (Date d'échéance "
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Message joint - %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:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Message joint"
 msgstr[1] "%d messages joints"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Déplacer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Annuler le _déplacement"
 
@@ -6032,7 +5921,7 @@ msgstr "Annuler le _déplacement"
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet."
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6044,98 +5933,98 @@ msgid "Hide Attachment _Bar"
 msgstr "Masquer la _barre des pièces jointes"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Afficher la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "A_jouter une pièce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Afficher les pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Appuyez sur la barre espace pour basculer la barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Réunion - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tâche assignée - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:310
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les changements apportés à cet élément peuvent être annulés en cas de "
 "réception d'une mise à jour."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version actuelle !"
 
@@ -6151,12 +6040,6 @@ msgstr "Impossible d'ouvrir la destination"
 msgid "Destination is read only"
 msgstr "La destination est en lecture seule"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-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:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'événement à cause d'une erreur CORBA."
@@ -6223,11 +6106,11 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:559
 msgid "Appoint_ment"
 msgstr "_Rendez-vous"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:563
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Récurrence"
@@ -6238,9 +6121,8 @@ msgid "This event has alarms"
 msgstr "Cet événement possède des alarmes"
 
 #: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../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 "Or_ganisateur :"
@@ -6262,7 +6144,6 @@ msgid "Event with no end date"
 msgstr "Événement sans date de fin"
 
 #: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "La date de début est erronée."
@@ -6280,13 +6161,11 @@ msgid "End time is wrong"
 msgstr "L'heure de fin est erronée."
 
 #: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "L'organisateur sélectionné n'a plus de compte."
 
 #: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
@@ -6332,21 +6211,26 @@ msgid "Customize"
 msgstr "Personnaliser"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: ../calendar/gui/dialogs/event-page.c:2963
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1691
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1507 ../widgets/misc/e-dateedit.c:1721
 msgid "None"
-msgstr "Aucune"
+msgstr "Aucun"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
@@ -6361,8 +6245,9 @@ msgid "15 minutes before appointment"
 msgstr "15 minutes avant le rendez-vous"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "Participant_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "Participa_nts..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
@@ -6382,12 +6267,16 @@ msgstr "_Description :"
 msgid "Event Description"
 msgstr "Description de l'événement :"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+msgid "Locat_ion:"
+msgstr "_Lieu :"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../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:15
 msgid "_Alarm"
 msgstr "_Alarme"
 
@@ -6455,7 +6344,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
 
@@ -6476,81 +6365,62 @@ msgid "Organizer"
 msgstr "Organisateur"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisateur :"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
 msgid "Memo"
 msgstr "Mémo"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Impossible d'ouvrir les mémos dans « %s »."
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "À"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "Date de _début :"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "_Résumé"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-msgid "T_o:"
-msgstr "_À :"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Groupe :"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "Contenu du _mémo :"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Options du calendrier</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Ajouter nouveau calendrier"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Groupe de calendrier"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Emplacement du calendrier"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Nom du calendrier"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Options de la liste de tâches</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Ajouter nouvelle liste des tâches"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Groupe de listes des tâches"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Nom de la liste des tâches"
 
@@ -6704,7 +6574,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Exceptions</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>Aperçu</b>"
 
@@ -6769,15 +6639,15 @@ msgstr "<span weight=\"bold\">État</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Achevée"
 
 #: ../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-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Haute"
 
@@ -6786,20 +6656,20 @@ msgstr "Haute"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2379
 msgid "In Progress"
 msgstr "En cours"
 
 #: ../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-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Basse"
 
 #: ../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-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
@@ -6807,7 +6677,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2376
 msgid "Not Started"
 msgstr "Non démarrée"
 
@@ -6820,7 +6690,7 @@ msgid "Stat_us:"
 msgstr "É_tat :"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Indéfinie"
 
@@ -6829,7 +6699,7 @@ msgid "_Date completed:"
 msgstr "_Date d'achèvement :"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Priorité :"
 
@@ -6855,10 +6725,6 @@ msgstr "La date d'échéance est erronée."
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tâches dans '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "Participa_nts..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Ca_tégories..."
@@ -6867,6 +6733,10 @@ msgstr "Ca_tégories..."
 msgid "Or_ganiser:"
 msgstr "Or_ganisateur :"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "Date de _début :"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Fuseau horaire :"
@@ -6875,46 +6745,46 @@ msgstr "Fuseau horaire :"
 msgid "_Due date:"
 msgstr "_Date d'échéance :"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>C_alendriers Libre/Occupé</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Fréquence de publication</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>Emplacement de _publication</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Paramètres de la publication Libre/Occupé"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Journalière"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Manuel"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_Mot de passe :"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "Mémo_riser le mot de passe"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
-msgstr "Nom d'_utilisateur :"
+msgstr "_Identifiant :"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Hebdomadaire"
 
@@ -6995,42 +6865,35 @@ msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
-msgid "Untitled"
-msgstr "Sans titre"
-
-#: ../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
-msgid "Start Date:"
-msgstr "Date de début :"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "Mémo :"
 
-#: ../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
-msgid "Description:"
-msgstr "Description :"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Page Web :"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Sans titre"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "Date de début :"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Date d'échéance :"
@@ -7040,7 +6903,7 @@ msgstr "Date d'échéance :"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:907
 msgid "Status:"
 msgstr "État :"
 
@@ -7048,18 +6911,26 @@ msgstr "État :"
 msgid "Priority:"
 msgstr "Priorité :"
 
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Description :"
+
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Privé"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Confidentiel"
 
@@ -7068,25 +6939,24 @@ msgid "End Date"
 msgstr "Date de fin"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "Date de début"
 
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Résumé"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Libre"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Occupé"
 
@@ -7100,17 +6970,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Oui"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
@@ -7121,21 +6991,21 @@ msgstr "Non"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1716
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:669
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Récurrent"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Attribué"
 
@@ -7143,7 +7013,7 @@ msgstr "Attribué"
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Choisir le dossier où enregistrer les pièces jointes sélectionnées..."
 
@@ -7152,9 +7022,9 @@ msgstr "Choisir le dossier où enregistrer les pièces jointes sélectionnées..
 msgid "untitled_image.%s"
 msgstr "image_sansnom.%s"
 
-#: ../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:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
@@ -7172,79 +7042,74 @@ msgstr "_Enregistrer la sélection"
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: ../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:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: ../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:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Nouvelle _tâche"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site Web"
 
-#: ../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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7252,52 +7117,44 @@ msgstr "Ouvrir le _site Web"
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ../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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: ../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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "C_oller"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Assigner une tâche"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches sélectionnées comme terminées"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Marquer comme incomplet"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Marquer les tâches sélectionnées comme imcomplète"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Supprimer les tâches sélectionnées"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -7307,7 +7164,7 @@ msgstr "Cliquez ici pour ajouter une tâche"
 msgid "% Complete"
 msgstr "% Fait"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Terminé"
 
@@ -7332,101 +7189,105 @@ msgstr "Date de début"
 msgid "Task sort"
 msgstr "Tri par tâche"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Déplacement d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copie d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Nouveau _rendez-vous..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Nouvel évén_ement toute la journée"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nouvelle _réunion"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Nouvelle _tâche"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Vue a_ctive"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Sélectionner au_jourd'hui"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Sélectionner une date..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_Copier vers le calendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le calendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "Déléguer une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurrence _déplaçable"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisateur : %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisateur : %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2349
 #, c-format
 msgid "Location: %s"
 msgstr "Lieu : %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Heure : %s %s"
@@ -7456,7 +7317,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions par minute"
@@ -7467,22 +7328,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: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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1538
 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:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:858
 msgid "am"
 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:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "pm"
 
@@ -7574,12 +7433,10 @@ msgstr "Erreur iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
@@ -7594,22 +7451,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Accepted"
 msgstr "Accepté"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Declined"
 msgstr "Refusé"
 
@@ -7834,7 +7691,7 @@ msgid "Attendee status updated\n"
 msgstr "État du participant mis à jour\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1080
 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"
@@ -7882,35 +7739,48 @@ msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--à--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Message du calendrier"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Date :"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Chargement du calendrier"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Chargement du calendrier..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Message du serveur :"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "date de fin"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "date de début"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Présidents"
@@ -7929,65 +7799,65 @@ msgid "Resources"
 msgstr "Ressources"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individuel"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Groupe"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Salle"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Président"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Participant attendu"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Non participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Nécessite une action"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Provisoire"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1713
 msgid "Delegated"
 msgstr "Délégué"
 
@@ -7996,14 +7866,14 @@ msgstr "Délégué"
 msgid "Attendee                          "
 msgstr "Participant                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "En 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -8011,86 +7881,86 @@ 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:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Absent du bureau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Aucune information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Par_ticipants..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
-msgstr "Afficher Zoom a_rrière"
+msgstr "Afficher _Zoom arrière"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Mettre à jour Libre/Occupé"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Toutes les _personnes et une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Personnes atte_ndues"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Personnes attendues et _une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Heure de _début :"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Heure de _fin :"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Supprimer les mémos sélectionnés"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Cliquez ici pour ajouter un mémo"
 
@@ -8098,8 +7968,8 @@ msgstr "Cliquez ici pour ajouter un mémo"
 msgid "Memo sort"
 msgstr "Ordre du mémo"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8117,7 +7987,7 @@ msgstr "Chargement des mémos"
 msgid "Opening memos at %s"
 msgstr "Ouverture des mémos de %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
@@ -8126,20 +7996,20 @@ msgstr "Suppression des objets sélectionnés..."
 msgid "Enter the password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Chargement des tâches"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Nettoyage"
 
@@ -8150,48 +8020,42 @@ 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1522
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Mise à jour de la requête"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "Vue _personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_Enregistrer la vue personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Définir les vues..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, c-format
-msgid "Loading memos at %s"
-msgstr "Chargement des mémos à %s"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Nettoyage"
 
@@ -8305,18 +8169,14 @@ 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:451
-msgid "_New Memo List"
-msgstr "_Nouvelle liste des mémos"
-
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d mémo"
 msgstr[1] "%d mémos"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8324,58 +8184,46 @@ msgid_plural ", %d selected"
 msgstr[0] ", %d sélectionné"
 msgstr[1] ", %d sélectionnés"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "La mise à jour des mémos a échoué."
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, 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:885
+#: ../calendar/gui/memos-component.c:884
 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:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Sélecteur de source de mémos"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Nouveau mémo"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
-msgstr "Mém_o"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr "_Mémo"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Crée un nouveau mémo"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "Nouveau mémo partagé"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "Mémo _partagé"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "Crée un nouveau mémo partagé"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Nouvelle liste des mémos"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
 msgstr "L_iste des mémos"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Crée une nouvelle liste de mémos"
 
@@ -8718,14 +8566,14 @@ msgid "New task list"
 msgstr "Nouvelle liste des tâches"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "_Liste de tâches"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Crée une nouvelle liste des tâches"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8737,11 +8585,11 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Ne plus poser la question."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
@@ -9317,7 +9165,7 @@ msgid "America/Nassau"
 msgstr "Amérique/Nassau"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amérique/New_York"
 
@@ -10318,25 +10166,25 @@ msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
+#: ../widgets/misc/e-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fk"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
+#: ../widgets/misc/e-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
+#: ../widgets/misc/e-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:974
 msgid "Attachment Bar"
 msgstr "Barre des pièces jointes"
 
@@ -10344,44 +10192,44 @@ msgstr "Barre des pièces jointes"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:242 ../widgets/misc/e-attachment.c:258
+#: ../widgets/misc/e-attachment.c:449 ../widgets/misc/e-attachment.c:467
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Impossible de joindre le fichier %s : %s."
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:250 ../widgets/misc/e-attachment.c:458
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
 "Impossible de joindre le fichier %s : il ne s'agit pas d'un fichier normal."
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Propriétés de la pièce jointe"
 
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Nom du fichier :"
 
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Type MIME :"
 
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Destination d'envoi"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Choisissez les dossiers auxquels envoyer ce message."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
@@ -10392,45 +10240,45 @@ msgstr "Cliquez ici pour le carnet d'adresses"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Répondre à :"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_De :"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Sujet :"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_À :"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc :"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "Cc_i :"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10441,15 +10289,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Poster à :"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Cliquez ici pour sélectionner les dossiers de destination"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Poster à :"
 
@@ -10457,18 +10305,18 @@ msgstr "Poster à :"
 msgid "A_ttach"
 msgstr "_Joindre"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Insertion d'une pièce jointe"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossible de signer le message sortant : aucun certificat de signature "
 "définit pour ce compte"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10476,52 +10324,52 @@ msgstr ""
 "Impossible de chiffrer le message sortant : aucun certificat de chiffrement "
 "définit pour ce compte"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Masquer la barre des pièces _jointes"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Afficher la barre des pièces _jointes"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Impossible d'ouvrir le fichier"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Impossible de récupérer le message depuis l'éditeur."
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Message sans sujet"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Ouvrir un fichier"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Générée automatiquement"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Si_gnature :"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Rédaction d'un message"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10679,7 +10527,7 @@ msgstr "_Enregistrer le message"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10700,7 +10548,6 @@ msgid "calendar information"
 msgstr "Informations du calendrier"
 
 #: ../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"
@@ -10708,36 +10555,31 @@ msgid ""
 msgstr ""
 "<b>Votre état actuel est « Absent du bureau ». </b>\n"
 "\n"
-"Voulez-vous activer l'état « Au bureau » ? "
+"Voulez-vous remplacer votre état par « Au bureau » ? "
 
 #: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Message « Absent du bureau » :</b>"
+msgstr "<b>Message d'absence du bureau :</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>État :</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>Le message spécifié ci-dessous sera automatiquement envoyé à toute "
-"personne vous\n"
-"envoyant des courriels pendant votre absence du bureau.</small>"
+"<small>Le message spécifié ci-dessous sera envoyé automatiquement à toutes "
+"les personnes vous\n"
+"envoyant des courriels en votre absence du bureau.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr "Je suis actuellement au bureau"
 
 #: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Je suis actuellement absent du bureau"
 
@@ -10746,24 +10588,26 @@ msgid "No, Do not Change Status"
 msgstr "Non, ne pas modifier l'état"
 
 #: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
-msgstr "Assistant Absent du bureau"
+msgstr "Assistant d'absence du bureau"
 
 #: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
-msgstr "Oui, modifier l'état"
+msgstr "Oui, changer l'état"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Réception des courriels</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Envoi des courriels :</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10775,33 +10619,33 @@ msgstr ""
 "vous avez envoyé et vous pouvez spécifier le comportement d'Evolution en cas "
 "de requête d'accusé de réception provenant de l'extérieur.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Toujours envoyer un accusé de réception"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Me demander si je souhaite envoyer un accusé de réception."
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Ne jamais envoyer d'accusé de réception."
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Accusés de réception"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Demander un accusé de réception pour tous les messages envoyés."
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "Sauf si le message est envoyé à une liste de diffusion, et non à titre "
 "personnel."
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10809,7 +10653,7 @@ msgstr ""
 "Comportement d'Evolution à l'arrivée d'un courriel avec demande d'accusé de "
 "réception :"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10817,28 +10661,28 @@ msgstr ""
 "Un fichier du même nom existe déjà.\n"
 "L'écraser ?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Écraser le fichier ?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Erreur d'Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Avertissement d'Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Information d'Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Requête d'Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erreur interne, erreur inconnue « %s » demandée"
@@ -10859,7 +10703,7 @@ msgstr "Voulez-vous l'écraser ?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Fichier existant « {0} »."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "É_craser"
 
@@ -10933,24 +10777,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Sélectionnez une heure pour la comparaison"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Plus tard"
 
@@ -10999,11 +10843,11 @@ msgid "Include threads"
 msgstr "Inclure les messages"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Entrant"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Sortant"
 
@@ -11027,7 +10871,7 @@ msgstr "Date manquante."
 msgid "Missing file name."
 msgstr "Nom de fichier manquant."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Nom manquant."
 
@@ -11099,7 +10943,7 @@ msgstr "écoulé(e)s"
 msgid "months"
 msgstr "mois"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "secondes"
 
@@ -11172,22 +11016,22 @@ msgstr "Configuration de l'éditeur de courriel d'Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Préférences de la messagerie d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Courriel"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Comptes de messagerie"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Préférences du courriel"
 
@@ -11214,7 +11058,7 @@ msgstr ""
 "et cochez la case pour l'accepter\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier"
 
@@ -11222,46 +11066,46 @@ msgstr "Sélectionnez un dossier"
 msgid "Ask for each message"
 msgstr "Demander à chaque message"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identité"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Réception des courriels"
 
-#: ../mail/em-account-editor.c:2014
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "Vérifier automatiquement les _nouveaux courriels toutes les"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
-msgstr "Envoi du courriel"
+msgstr "Envoi des courriels"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Valeurs par défaut"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Sécurité"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Options de réception"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Recherche de nouveaux courriels"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Éditeur de comptes"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
@@ -11281,22 +11125,22 @@ msgid "[Default]"
 msgstr "[Défaut]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protocole"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Sans nom"
 
@@ -11466,7 +11310,7 @@ msgstr "n'est pas"
 msgid "is not Flagged"
 msgstr "n'est pas marqué"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Pourriel"
@@ -11475,7 +11319,7 @@ msgstr "Pourriel"
 msgid "Junk Test"
 msgstr "Test pourriel"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Étiquette"
 
@@ -11519,7 +11363,7 @@ msgstr "Jouer le son"
 msgid "Read"
 msgstr "Lu"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Destinataires"
 
@@ -11547,11 +11391,11 @@ msgstr "est inférieur à"
 msgid "Run Program"
 msgstr "Lancer le programme"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Expéditeur"
 
@@ -11583,11 +11427,11 @@ msgstr "débute par"
 msgid "Stop Processing"
 msgstr "Arrêter le traitement"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Sujet"
@@ -11601,42 +11445,10 @@ msgstr "État non défini"
 msgid "<b>Then</b>"
 msgstr "<b>Alors</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Créer un dossier de _recherche à partir d'une recherche..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Tous les messages"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Messages non lus"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Pas d'étiquette"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Messages _lus"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Messages récents"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days' Messages"
-msgstr "Messages des 5 derniers jours"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Messages avec une pièce jointe"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Messages non pourriels"
-
 #. 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
@@ -11653,7 +11465,7 @@ msgstr[0] "Messages non lus :"
 msgstr[1] "Messages non lus :"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Propriétés du dossier"
 
@@ -11670,7 +11482,7 @@ msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Dossiers de recherche"
 
@@ -11685,7 +11497,7 @@ msgstr "Brouillons"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Boîte de réception"
 
@@ -11701,78 +11513,78 @@ msgstr "Envoyé"
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Arborescence des courriels"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Déplacement du dossier %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 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:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copier vers le dossier"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Déplacer vers le dossier"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "Afficha_ge"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Déplacer..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
@@ -11781,14 +11593,13 @@ msgstr "_Vider la corbeille"
 msgid "Copying `%s' to `%s'"
 msgstr "Copie de %s vers %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opier"
 
@@ -11810,168 +11621,158 @@ msgstr "Création d'un dossier"
 msgid "Specify where to create the folder:"
 msgstr "Précisez l'emplacement de création du dossier :"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "Édit_er comme un nouveau message..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Déplacer vers le dossier..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "Marquer comme non im_portant"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marquer comme _pourriel"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marquer comme non _pourriel"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marquer pour _donner suite..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Aucun"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Dossier de recherche sur le _sujet"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Dossier de recherche sur l'e_xpéditeur"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Dossier de recherche sur les de_stinataires"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Dossier de recherche sur la _liste de diffusion"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le _sujet"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'e_xpéditeur"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les de_stinataires"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Impossible de récupérer le message"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Copier l'emplacement du lien"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Créer un nouveau dossier de _recherche"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_De cette adresse"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_À cette adresse"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer sur le message %s"
 
-#: ../mail/em-folder-view.c:2860
-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:503
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Correspond : %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "Rechercher :"
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "_Respecter la casse"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Non signé"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11979,11 +11780,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:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Signature valide"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11991,11 +11792,11 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Signature non valide"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12003,11 +11804,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:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Signature valide, impossible de vérifier l'expéditeur"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12015,11 +11816,11 @@ 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:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Non chiffré"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12027,11 +11828,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:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Chiffré, faiblement"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12041,11 +11842,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:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12053,11 +11854,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:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Chiffré, fortement"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12067,72 +11868,72 @@ 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:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 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:1174
 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:1182
 msgid "Overdue:"
 msgstr "Retard :"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "le %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Adapter à la _largeur"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Afficher à la taille d'_origine"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pièce jointe"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Sélectionner le dossier où enregistrer toutes les pièces jointes..."
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "Enregi_strer la sélection..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
 msgstr[0] "%d pièce joi_nte"
 msgstr[1] "%d pièces joi_ntes"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "Enregi_strer"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "_Tout enregistrer"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Aucune pièce jointe"
 
@@ -12146,88 +11947,94 @@ msgstr "Page %d sur %d"
 msgid "Retrieving `%s'"
 msgstr "Récupération de « %s »"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Signature valide mais impossible de vérifier l'expéditeur"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Partie corps externe mal formée."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointeur sur le fichier local (%s) valide sur le site « %s »"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formatage des messages"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Répondre à"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "À"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Cci"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Client de messagerie"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Date"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Groupes de discussion"
@@ -12277,7 +12084,7 @@ msgstr "Une fois par semaine"
 msgid "Once per month"
 msgstr "Une fois par mois"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12289,56 +12096,56 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Impossible de créer le nouveau dossier « %s » : %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Impossible de copier le dossier « %s » vers « %s » : %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Impossible de rechercher les boîtes à lettres existant dans « %s » : %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Impossible d'ouvrir les anciennes données POP conservées sur le serveur « %"
 "s » : %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Impossible de créer un dossier pour les données POP3 restées sur le serveur "
 "« %s » : %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 "Impossible de copier les données POP3 restées sur le serveur « %s »  : %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 "La création du dossier de stockage de courriel local « %s » a échoué : %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Impossible de créer les dossiers de stockage de courriel local sur « %s » : %"
 "s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12355,6 +12162,10 @@ msgstr "_Répondre à l'expéditeur"
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Ouvrir un lien dans le navigateur"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "Envoyer un nouveau _message à..."
@@ -12363,51 +12174,51 @@ msgstr "Envoyer un nouveau _message à..."
 msgid "_Add to Address Book"
 msgstr "_Ajouter dans le carnet d'adresses"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Soit ce stockage ne supporte pas les abonnements, ou soit ils ne sont pas "
 "activés."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Dossier"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Veuillez sélectionner un serveur."
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné."
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Filtres de message"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "message"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Enregistrer le message..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Ajouter adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
@@ -12416,7 +12227,7 @@ msgstr "Messages de %s"
 msgid "Search _Folders"
 msgstr "Dossiers de _recherche"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Source du dossier de recherche"
 
@@ -12449,108 +12260,86 @@ msgid "Composer Window default width"
 msgstr "Largeur par défaut de la fenêtre d'édition"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Jeu de caractère par défaut pour la rédaction des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Jeu de caractère par défaut pour la rédaction des messages."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Jeu de caractère par défaut pour l'affichage des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Jeu de caractère par défaut pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Style de transfert par défaut"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Hauteur par défaut de la fenêtre d'édition"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Hauteur par défaut du dialogue des abonnements"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Style de réponse par défaut"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Largeur par défaut de la fenêtre d'édition"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Largeur par défaut du dialogue des abonnements"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Afficher les indicateurs d'erreurs d'orthographe sur les mots que vous "
 "entrez."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Vider les dossiers Corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vider les dossiers Corbeille en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Activer la lecture au curseur, ainsi vous pouvez voir un curseur quand vous "
 "lisez vos mails."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Activer/désactiver la lecture au curseur"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Hauteur du panneau de la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12558,15 +12347,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.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Si la panneau de prévisualisation est activé, il sera affiché côte à côte "
-"plutôt que verticalement."
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12577,27 +12358,23 @@ msgstr ""
 "qui est assigné à une vue de composant bonobo dans la base des types mime "
 "GNOME pouvant être utilisée pour l'affichage du contenu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Dernière fois où la corbeille a été vidée"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 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.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Liste des licences acceptées"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Liste de comptes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12606,11 +12383,11 @@ msgstr ""
 "liste contient des chaînes désignant les noms des sous-dossiers relatifs à /"
 "apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste des en-têtes personnelles et de leur activation."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12619,20 +12396,20 @@ msgstr ""
 "liste contient des chaînes de type nom:couleur où les couleurs utilisent "
 "l'encodage hexadécimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 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.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste des noms de protocoles dont la licence à été acceptée."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Charger les images pour les messages HTML utilisant http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12643,104 +12420,100 @@ msgstr ""
 "Charger les images si l'expéditeur est dans le carnet d'adresses 2 - "
 "Toujours charger les images à partir du net"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 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.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Fichier de journal où enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Fichier de journal où enregistrer les actions des filtres."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Marquer comme lu après le délai spécifié"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Marquer comme lu après le délai spécifié."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marquer les citations dans le message « Preview »"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message « Preview »."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Style d'affichage des messages (« normal », « en-têtes complètes », "
 "« source »)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Nombre minimal de jours avant de vider la corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Durée minimale avant de vider la corbeille en quittant, en jours."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Fichier sonore de notification des nouveaux courriels"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Type de notification des nouveaux courriels"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Nombre d'adresses à afficher pour À/Cc/Cci"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Demander pour les sujets vides"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 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.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans sujet."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Demander quand l'utilisateur nettoie"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Cci"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Demander lorsqu'un utilisateur essaye d'ouvrir 10 messages ou plus en une "
 "fois."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12748,116 +12521,97 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "pas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires sans À ou Cc "
 "définis."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 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.in.h:71
-#, fuzzy
-msgid "Prompt while marking multiple messages"
-msgstr "Demander quand l'utilisateur nettoie"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Reconnaître les liens dans le texte et les remplacer."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys 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.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Lancer le test de pourriel sur les messages entrants"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Envoyer par défaut le courriel au format HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Envoyer par défaut le courriel au format HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Afficher les images animées et animations."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 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.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 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.in.h:83
-#, fuzzy
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr ""
-"Afficher les messages marqués comme supprimés dans la liste des messages"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-#, fuzzy
-msgid "Show the sender email in the messages column in the message list"
-msgstr ""
-"Afficher les messages marqués comme supprimés dans la liste des messages"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Jouer un fichier son lors de l'arrivée de nouveaux messages."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Indique le type de notification d'arrivée de courriel que l'utilisateur "
 "désire utiliser."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Hauteur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Largeur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "La dernière fois que la corbeille a été vidée, en jours depuis l'époque."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Les polices de terminal pour l'affichage des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr ""
 "Sélection d'une police HTML à largeur variable pour l'afficher des messages"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12869,109 +12623,99 @@ msgstr ""
 "XML est &lt;header enabled&gt; - activé si l'en-tête est affichée dans la "
 "vue du courriel."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-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:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Liste de messages par fil de discussion."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Liste de messages par fil de discussion"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Liste de messages basée sur les sujets"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Délai avant de marquer les messages comme vus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Délai avant de marquer les messages comme vus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Chaîne UID pour le compte par défaut."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Utiliser le démon et le client Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Utiliser le démon et le client Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Utiliser des polices personnalisées"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Utiliser des polices personnalisées pour afficher le courriel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Utiliser seulement des tests de pourriels locaux."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Utiliser seulement des tests de pourriels locaux (pas de DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Utiliser l'agencement côte à côte ou large"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Largeur de polices variable"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "L'élément du menu Affichage/Cci est coché"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "L'élément du menu Affichage/Cci est coché."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "L'élément du menu Affichage/Cc est coché"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "L'élément du menu Affichage/Cc est coché."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "L'élément du menu Affichage/De est coché"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "L'élément du menu Affichage/De est coché."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "L'élément du menu Affichage/Envoyer À est coché"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "L'élément du menu Affichage/Envoyer À est coché."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "L'élément du menu Affichage/Répondre À est coché"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "L'élément du menu Affichage/Répondre À est coché."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12979,14 +12723,6 @@ msgstr ""
 "Retomber sur le tri par sujets quand les messages ne contiennent pas d'en-"
 "têtes In-Reply-To ou References."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Largeur du panneau de la liste des messages"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Largeur du panneau de la liste des messages."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Importation des données Elm"
@@ -13018,15 +12754,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importe les dossiers au format de boîte à lettres Berkeley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importation de « %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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
@@ -13206,31 +12942,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d non lu"
 msgstr[1] ", %d non lus"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Nouveau message"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Rédiger un nouveau courriel"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Nouveau dossier pour le courriel"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "_Dossier de courriel"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Crée un nouveau dossier pour le courriel"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Échec lors de la mise à jour des dossiers ou paramètres de courriel."
 
@@ -13258,222 +12994,228 @@ msgstr "À _faire"
 msgid "_Later"
 msgstr "Plus _tard"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
-msgstr " _Vérifier les types supportés "
+msgstr " Vé_rifier les types supportés "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL n'est pas supporté dans cette compilation d'Evolution</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Sig_natures</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Langues</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Ceci va rendre le filtre plus efficace, mais plus lent</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Informations sur le compte</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Type d'authentification</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Authentification</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">Rédaction de messages</span>"
+msgstr "<span weight=\"bold\">Rédaction des messages</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuration</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Comportement par défaut</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Supprimer le courriel</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Afficher les en-têtes des mails</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Options de filtrage</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Étiquettes and couleurs</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Chargement des images</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Affichage des messages</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Police des messages</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Accusés de réception des messages</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notification des nouveaux courriels</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Informations optionnelles</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Options</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Polices d'impression</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informations requises</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sécurité</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Messages envoyés et brouillons</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuration du serveur</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "Ajouter une _nouvelle signature..."
+msgstr "A_jouter une nouvelle signature..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Ajouter un sc_ript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 "_Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Éga_lement chiffrer pour moi-même lors de l'envoi de courriel chiffré"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) à :"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Toujours envoyer une copie cachée (Cc_i) à :"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
-"Toujours faire _confiance aux clés de mon trousseau lors du chiffrement."
+"Toujours faire _confiance aux clés de mon trousseau lors du chiffrement"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "Toujours chiffrer pour _moi-même lors de l'envoi de courriel chiffré."
+msgstr "Toujours chiffrer pour _moi-même lors de l'envoi de courriel chiffré"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Joindre le message d'origine"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Insérer automatiquement les images de frimou_sses"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balte (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balte (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "Émettre un _bip lors de l'arrivée de nouveaux messages"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Jeu de _caractères :"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
-msgstr "_Vérifier les types supportés "
+msgstr "Vé_rifier les types supportés "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Vérifier la présence de pourriels dans les messages _entrants"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
-msgstr "Vérifier l'or_thographe pendant la frappe"
+msgstr "_Vérifier l'orthographe pendant la frappe"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Vérifier si les messages entrants sont du pourriel"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Effacer"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "E_ffacer"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
-msgstr "Couleur pour les _mots mal orthographiés :"
+msgstr "_Couleur des mots mal orthographiés :"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Couleurs"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmer avant le nettoyage du dossier"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13488,116 +13230,116 @@ msgstr ""
 "\n"
 "Cliquez sur « Appliquer » pour enregistrer les paramètres."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "Dé_faut"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "_Codage des caractères par défaut :"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Signer numériquement les messages sortants (par défaut)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Ne pas citer le message d'origine"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Fait"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Dossier des _brouillons :"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "A_ctiver"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Comptes de messagerie"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "_Adresse électronique :"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Vider les dossiers corbeille en qui_ttant"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Certificat de _chiffrement :"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Chiffrer les messages sortants (par défaut)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Police à largeur fi_xe :"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Largeur fi_xe :"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Propriétés de la police"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formater les messages en _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
-msgstr "Nom compl_et :"
+msgstr "Nom _complet :"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Courriel HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "En-têtes"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "I_nclure les tests distants :"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Dans le corps"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Langues"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "En-têtes des messages"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Emplacement de la boîte à lettres"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Éditeur de messages"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13605,19 +13347,19 @@ msgstr ""
 "Note : vous n'aurez pas à fournir de mot de passe avant votre première "
 "connexion."
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
-msgstr "Or_ganisation :"
+msgstr "_Organisation :"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
-msgstr "ID de la _clé PGP/GPG :"
+msgstr "_ID de la clé PGP/GPG :"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Jouer un fichier son lors de l'arrivée de nouveaux messages"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13625,7 +13367,7 @@ msgstr ""
 "Veuillez saisir 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:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13634,7 +13376,7 @@ msgstr ""
 "cas de doute, adressez-vous à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13645,45 +13387,40 @@ msgstr ""
 "que vous ne désiriez inclure ces informations dans les messages que vous "
 "envoyez."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
-msgstr "Veuillez effectuer une sélection parmi les options suivantes"
+msgstr "Veuillez effectuer une sélection parmi les options suivantes."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 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:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citer le message d'origine"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Cité"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
-msgstr "Ré_pondre à :"
+msgstr "_Répondre à :"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "S_électionner..."
 
-#: ../mail/mail-config.glade.h:120
-#, fuzzy
-msgid "S_end message receipts:"
-msgstr "Envoie des accusés de réception des messages :"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "Police par _défaut :"
@@ -13712,51 +13449,55 @@ msgstr "Sélection d'une police HTML à largeur variable pour l'impression"
 msgid "Select sound file"
 msgstr "Sélection d'un fichier sonore"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "Envoie des accusés de réception des messages :"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Envoi du courriel"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Dossier des _messages envoyés :"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
-msgstr "Le _serveur requiert une authentification."
+msgstr "Le serveur requiert une _authentification."
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
-msgstr "_Type de serveur : "
+msgstr "_Type du serveur : "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Certificat de _signature :"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
-msgstr "Signat_ure :"
+msgstr "_Signature :"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Indiquez le nom du _fichier :"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "T_ype : "
 
-#: ../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."
@@ -13764,7 +13505,7 @@ msgstr ""
 "La liste des langues ne contient que les langues pour lesquelles un "
 "dictionnaire a été installé."
 
-#: ../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"
@@ -13774,7 +13515,7 @@ msgstr ""
 "signature. Le nom spécifié ne sera utilisé\n"
 "que pour l'affichage. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13782,15 +13523,15 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par exemple : « Travail » ou « Personnel »"
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
-msgstr "_Nom d'utilisateur :"
+msgstr "_Identifiant :"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Largeur variable :"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13800,73 +13541,69 @@ msgstr ""
 "\n"
 "Cliquez sur « Suivant » pour commencer. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "A_jouter une signature"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Toujours charger les images à partir d'Internet"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ne pas prévenir lors _de l'arrivée de nouveaux messages"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne pas signer les de_mandes de réunion (compatibilité Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "Style de _transfert :"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Ouvrir les images dans les courriels des contacts"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
-msgstr "En faire _mon compte par défaut"
+msgstr "En faire mon compte par _défaut"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Marquer les messages comme lus après"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Ne jamais charger les images à partir d'Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages 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"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Demander l'autorisation lors de l'envoi de messages dépourvu de sujet"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Style de _réponse  :"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Script :"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "_Afficher les animations"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr ""
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Utiliser une connexion sécurisée :"
@@ -13876,21 +13613,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "_Utiliser les mêmes polices que dans les autres applications"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "adresses"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "couleur"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "description"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Sources de dossier de recherche</b>"
@@ -13904,63 +13633,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Chiffrement</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Tous les dossiers actifs distants"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Tous les dossiers locaux et actifs distants"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Tous les dossiers locaux"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "_Sensible à la casse"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Achevée"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "Re_chercher :"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Rechercher dans le message"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Marquer à donner suite"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Gérer les abonnements"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Accord de licence"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Aucun sélectionné"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "_Serveur :"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Informations de sécurité"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Dossiers spécifiques"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13968,42 +13681,67 @@ msgstr ""
 "Les messages sélectionnés pour suivi sont listés ci-après.\n"
 "Veuillez sélectionner une action de suivi dans le menu « Marqueur »."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Accepter la licence"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Date d'échéance :"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Marqueur :"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Subscribe"
+msgstr "_S'abonner"
+
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "Cochez ici pour accepter les _termes de la licence"
 
+#: ../mail/mail-dialogs.glade.h:24
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "Se _désabonner"
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "dossiers spécifiques seulement"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "avec tous les dossiers actifs distants"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "avec tous les dossiers actifs locaux et distants"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "avec tous les dossiers locaux"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Filtrage du dossier"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Récupération du courriel"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "L'application des filtres de sortie a échoué : %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14012,114 +13750,123 @@ msgstr ""
 "L'ajout à %s a échoué : %s\n"
 "Ajouté au dossier local « Sent » à la place."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "L'ajout au dossier local « Envoyés » a échoué : %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d sur %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 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:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Annulé."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Terminé."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Enregistrement du message dans le dossier"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Déplacement des messages vers %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Messages transférés"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Suppression du dossier %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Rafraîchissement du dossier"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans « %s »"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, 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:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Enregistrement de %d message"
 msgstr[1] "Enregistrement de %d messages"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Impossible de créer le fichier de sortie : %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14128,11 +13875,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14141,69 +13888,60 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Annulation..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Envoi et réception du courriel"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
-msgstr "Recherche de nouveau courriel"
-
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Saisissez la phrase de passe pour %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Saisissez la phrase de passe"
+msgstr "Recherche de nouveaux courriels"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
@@ -14216,7 +13954,7 @@ msgid "Enter a name for this signature."
 msgstr "Saisissez un nom pour cette signature."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nom :"
 
@@ -14259,11 +13997,11 @@ msgstr "Mise à jour des dossiers de recherche pour « %s:%s »"
 msgid "Updating Search Folders for '%s'"
 msgstr "Mise à jour des dossiers de recherche pour « %s »"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Éditer un dossier de recherche"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Nouveau dossier de recherche"
 
@@ -14588,37 +14326,32 @@ msgid "Mark all messages as read"
 msgstr "Marquer tous les messages comme lus"
 
 #: ../mail/mail.error.xml.h:68
-#, fuzzy
-msgid "Mark all messages in subfolders as read?"
-msgstr "Marquer tous les messages comme lus"
+msgid "Mark all messages as read in the selected folder"
+msgstr "Marquer tous les messages dans le dossier sélectionné comme lus"
 
 #: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "Marquer comme _lu"
-
-#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Dossier manquant."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Aucune source n'a été sélectionnée."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ouvrir trop de messages en une fois peut prendre un long moment."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
-msgstr "Veuillez vérifier les paramètres de votre compte et essayez à nouveau."
+msgstr "Veuillez vérifiez les paramètres de votre compte et essayez à nouveau."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Veuillez activer le compte ou bien effectuer l'envoi en utilisant un autre "
 "compte."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14627,7 +14360,7 @@ msgstr ""
 "pouvez rechercher des adresses électroniques en cliquant sur le bouton À : à "
 "côté de la boîte de saisie."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14639,57 +14372,57 @@ msgstr ""
 "{0}\n"
 "Envoyer quand même ?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Veuillez fournir un nom unique pour identifier cette signature."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Veuillez patienter."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problème lors de la migration de l'ancien dossier de courriel « {0} »."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Interrogation du serveur"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Questionne le serveur pour obtenir une liste des mécanismes "
 "d'authentification supportés."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Accusé de réception demandé."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Réellement supprimer le dossier « {0} » et tous ses sous-dossiers ?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Dossiers de recherche automatiquement mis à jour."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Envoyer un accusé de réception"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Signature déjà existante"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Les dossiers système sont nécessaires pour que Evolution fonctionne "
-"correctement, et ne peuvent pas être renommés, déplacés ou supprimés."
+"Les dossiers système sont nécessaires pour que Ximian Evolution fonctionne "
+"correctement, et ne peuvent être renommés, déplacés ou supprimés."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14706,7 +14439,7 @@ msgstr ""
 "champ, s'il est ajouté, listera tous les destinataires de votre message. "
 "Pour éviter cela, vous devriez ajouter au moins un destinataire À : ou Cc : "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14720,7 +14453,7 @@ msgstr ""
 "    « {1} »\n"
 "et ont été mis à jour."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14734,11 +14467,11 @@ msgstr ""
 "    « {1} »\n"
 "et ont été mises à jour."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Le fichier de script doit exister et être exécutable."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14747,7 +14480,7 @@ msgstr ""
 "si nécessaire, allez dans l'éditeur de dossiers de recherche\n"
 "pour l'ajouter explicitement."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14755,14 +14488,14 @@ msgstr ""
 "Ce message ne peut pas être envoyé car le compte que vous avez choisi pour "
 "l'envoi n'est pas actif."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Ce message ne peut pas être envoyé car vous n'avez spécifié aucun "
 "destinataire"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14770,11 +14503,11 @@ msgstr ""
 "Le serveur ne supporte pas ce type d'authentification et il se peut qu'il ne "
 "supporte aucune identification du tout."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Cette signature a été modifiée, mais n'a pas été enregistrée."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14782,11 +14515,11 @@ msgstr ""
 "Marque tous les messages dans le dossier sélectionné, et ses sous-dossiers, "
 "comme lus."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Impossible de se connecter au serveur GroupWise."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14794,41 +14527,41 @@ msgstr ""
 "Impossible d'ouvrir le dossier Brouillons pour ce compte. Voulez-vous "
 "utiliser le dossier Brouillons générique à la place ?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Impossible de lire le fichier de licence."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Utiliser le _défaut"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Utiliser le dossier Brouillons par défaut ?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Vous n'avez pas saisi toutes les informations requises."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Certains messages n'ont pas été envoyés. Êtes-vous sûr de vouloir quitter le "
 "programme ?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Vous devez nommer ce dossier de recherche."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Vous devez indiquer un dossier."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14838,99 +14571,95 @@ msgstr ""
 "Soit en sélectionnant les dossiers individuellement, et/ou en sélectionnant "
 "tous les dossiers locaux, tous les dossiers distants, ou les deux."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Votre identification sur le serveur « {0} » en temps que « {0} » a échoué."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "A_jouter"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "Aban_donner les modifications"
 
 #: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "_Ne pas marquer comme lu"
-
-#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "Ne_ttoyer"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Non vu"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Vu"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Répondu"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Plus bas"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Plus haut"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2064
 msgid "Messages"
 msgstr "Messages"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3446
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
@@ -14950,15 +14679,15 @@ msgstr "Marqué"
 msgid "Follow Up Flag"
 msgstr "Indicateur de suivi"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Emplacement d'origine :"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Reçu"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Messages envoyés"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Taille"
@@ -15112,9 +14841,8 @@ msgstr ""
 "réponse à un courriel"
 
 #: ../plugins/bbdb/bbdb.c:460
-#, fuzzy
 msgid "Select Address book for Automatic Contacts"
-msgstr "Contacts automatiques"
+msgstr "Sélectionnez le carnet d'adresses pour les contacts automatiques"
 
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
@@ -15129,9 +14857,8 @@ msgstr ""
 "depuis ma liste de contacts gaim"
 
 #: ../plugins/bbdb/bbdb.c:496
-#, fuzzy
 msgid "Select Address book for Gaim buddy list"
-msgstr "Sélection du carnet d'adresses"
+msgstr "Sélectionnez le carnet d'adresses pour la listes de copains Gaim"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
@@ -15241,6 +14968,10 @@ msgstr ""
 "Un greffon de test qui présente un menu temporaire vous permettant de copier "
 "des objets vers le presse-papiers."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Copier l'_adresse électronique"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Outil de copie"
@@ -15313,8 +15044,8 @@ msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
-"Cette option utilisera l'authentification par mot de passe sécurisé (NTLM) "
-"pour se connecter au serveur Exchange."
+"Cette option permet d'établir une connexion au serveur Exchange en utilisant "
+"l'authentification par mot de passe sécurisé (NTLM)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
@@ -15325,8 +15056,8 @@ msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
-"Cette option utilisera un mot de passe en texte brut standard pour se "
-"connecter au serveur Exchange."
+"Cette option permet d'établir une connexion au serveur Exchange en utilisant "
+"l'authentification par mot de passe en texte brut standard."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
@@ -15357,7 +15088,7 @@ msgid "Change the password for Exchange account"
 msgstr "Changer le mot de passe pour le compte Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -15391,7 +15122,7 @@ msgstr "Paramètres d'Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
-msgstr "URL _OWA :"
+msgstr "_URL OWA :"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
@@ -15403,7 +15134,7 @@ msgstr "Type d'authentification"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
-msgstr "_Vérifier les types supportés"
+msgstr "Vé_rifier les types supportés"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:191
 #: ../plugins/exchange-operations/exchange-contacts.c:166
@@ -15423,41 +15154,40 @@ 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"
+"Le mot de passe actuel ne correspond pas au mot de passe existant de votre "
+"compte. Veuillez saisir le bon mot de passe"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr ""
-"Les deux mots de passe sont différents. Veuillez ressaisir les mots de passe."
+"Les deux mots de passe ne correspondent pas. Veuillez ressaisir les mots de "
+"passe."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "Confirmez le mot de passe :"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "Mot de passe actuel :"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "Nouveau mot de passe :"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr ""
-"Le mot de passe actuel a expiré. Veuillez modifier votre mot de passe dès à "
-"présent."
+"Votre mot de passe actuel a expiré. Veuillez changer votre mot de passe "
+"maintenant."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Votre mot de passe expirera dans les %d prochains jours"
 
-#. 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
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -15514,7 +15244,7 @@ msgstr "Erreur lors de la lecture de la liste des délégués."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
-msgstr "Auteur (lire, créer)"
+msgstr "Auteur (lecture, création)"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
@@ -15532,7 +15262,7 @@ msgstr "Délégués"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
-msgstr "Éditeur (lire, créer, éditer)"
+msgstr "Éditeur (lecture, création, modification)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
@@ -15540,20 +15270,19 @@ msgstr "Permissions pour"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
-msgstr "Relecteur (lecture-seule)"
+msgstr "Relecteur (lecture seule)"
 
 #: ../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 ""
-"Ces utilisateurs seront capables d'envoyer des courriels\n"
-"en votre noms et d'accéder à vos dossiers avec les\n"
-"permissions que vous leur avez donné."
+"Ces utilisateurs pourront envoyer des courriels en votre nom\n"
+"et accéder à vos dossiers avec les permissions que vous leur accordez."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
-msgstr "Le _délégué peut voir des éléments privés"
+msgstr "_Le délégué peut voir les éléments privés"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:17
@@ -15578,7 +15307,7 @@ msgstr "Nom du dossier"
 msgid "Folder Size"
 msgstr "Taille du dossier"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Souscrire à la tâche d'un autre utilisateur"
@@ -15593,21 +15322,21 @@ msgstr "Arborescence des dossiers Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Se désabonner du dossier..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Voulez-vous vraiment vous désabonner du dossier « %s » ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Se désabonner du dossier « %s »"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
-msgstr "Avertissement d'expiration de mot de passe..."
+msgstr "Avertissement d'expiration du mot de passe..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
@@ -15633,66 +15362,62 @@ msgstr "Ajouter un utilisateur :"
 msgid "Add User"
 msgstr "Ajouter un utilisateur"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Permissions</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Impossible de supprimer"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
-msgstr "Impossible d'éditer"
+msgstr "Impossible de modifier"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Créer des éléments"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Créer des sous-dossiers"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
-msgstr "Supprimer n'importe quel élément"
+msgstr "Supprimer n'importe quels éléments"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Supprimer ses propres éléments"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
-msgstr "Éditer n'importe quel élément"
+msgstr "Modifier n'importe quels éléments"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
-msgstr "Éditer ses propres éléments"
+msgstr "Modifier ses propres éléments"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Contact du dossier"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Propriétaire du dossier"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Dossier visible"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
-msgstr "Lire les éléments"
+msgstr "Lire des éléments"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Rôle : "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Non, ne pas modifier l'état"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 msgid "Select User"
 msgstr "Sélectionner un utilisateur"
@@ -15732,26 +15457,22 @@ msgid "Cannot display folders."
 msgstr "Impossible d'afficher les dossiers."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Impossible d'exécuter l'opération."
-
-#: ../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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Les modifications de la configuration du compte Exchange « {0} » prendront "
-"effet après que vous ayez redémarré Evolution."
+"Les modifications à la configuration du compte Exchange prendront effet "
+"après que vous ayez quitté et redémarré Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "L'authentification sur le serveur a échoué."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Impossible de modifier le mot de passe."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15761,55 +15482,55 @@ msgstr ""
 "une erreur inconnue est survenue. Vérifiez l'URL, \n"
 "l'identifiant, le mot de passe et réessayez."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Impossible de se connecter au serveur Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Impossible de se connecter au serveur {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Impossible d'obtenir les permissions du dossier pour les délégués."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Impossible de trouver le système de stockage Web Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Impossible de localiser le serveur {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Impossible de faire de {0} un délégué"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Impossible de lire les permissions du dossier"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Impossible de lire les permissions du dossier."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Impossible de lire l'état « Absent du bureau »."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Impossible de mettre à jour les permissions du dossier."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Impossible de mettre à jour l'état « Absent du bureau »."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Le compte Exchange est hors ligne."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15838,33 +15559,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Impossible de mettre à jour les délégués :"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Le dossier existe déjà"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Le dossier n'existe pas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Dossier hors ligne"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "Erreur générique"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#, fuzzy
-msgid "Global Catalog Server is not reachable"
-msgstr "Aucun catalogue global configuré pour ce compte."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15872,73 +15588,68 @@ msgstr ""
 "Si OWA s'exécute dans un chemin différent, vous devez le spécifier dans la "
 "configuration du compte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "La boîte à lettres de {0} n'est pas sur ce serveur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Vérifiez que l'URL est correcte et essayer à nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Vérifiez que le nom du serveur est correctement orthographié et essayez à "
 "nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Vérifiez que l'identifiant et le mot de passe sont corrects et essayez à "
 "nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Aucun catalogue global configuré pour ce compte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Aucune boîtes à lettres pour l'utilisateur {0} on {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Aucun utilisateur {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Le mot de passe a bien été modifié."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Sever name is correct."
-msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
-msgid "Please restart Evolution for changes to take effect"
-msgstr ""
-"Veuillez redémarrer Evolution pour que les modifications prennent effet."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Veuillez redémarrer Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Veuillez sélectionner un utilisateur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Le serveur a refusé le mot de passe car celui-ci est trop faible."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Le compte Exchange sera désactivé lorsque vous quitterez Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Le compte Exchange sera supprimé quand vous quitterez Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 "Le serveur Exchange n'est pas compatible avec votre connecteur Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15946,7 +15657,7 @@ msgstr ""
 "Le serveur exécute Exchange 5.5. Le connecteur Exchange supporte uniquement "
 "Microsoft Exchange 2000 et 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15956,60 +15667,60 @@ msgid ""
 msgstr ""
 "Cela signifie peut être la nécessité que vous précisiez \n"
 "le nom de domaine Windows à votre serveur avec votre\n"
-"nom d'utilisateur (ex. &quot;DOMAINE\\\\utilisateur&quot;).\n"
+"identifiant (ex. &quot;DOMAINE\\\\utilisateur&quot;).\n"
 "\n"
 "Il est aussi possible que vous ayez saisi un mauvais\n"
 "mot de passe."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Essayer à nouveau avec un mot de passe différent."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Impossible d'ajouter l'utilisateur à la liste de contrôle d'accès :"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Impossible d'éditer les délégués."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 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:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Type inconnu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Opération non supportée"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "La capacité occupée par le stockage de vos courriels est proche de la limite "
 "qui vous est autorisée sur ce serveur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Vous ne pouvez pas faire de vous-même votre propre délégué"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Vous avez dépassé la capacité de stockage qui vous est autorisée sur ce "
 "serveur pour vos courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Vous ne pouvez configurer qu'un seul compte Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16017,7 +15728,7 @@ msgstr ""
 "Votre utilisation actuelle est {0} Kio. Essayez de libérer un peu d'espace "
 "en supprimant quelques courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16025,7 +15736,7 @@ msgstr ""
 "Votre utilisation actuelle est {0} Kio. Vous ne serez plus en mesure "
 "d'envoyer ou de recevoir des courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16034,19 +15745,19 @@ msgstr ""
 "d'envoyer ou de recevoir des courriels tant que vous n'aurez pas libérer de "
 "l'espace en supprimant quelques courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Votre mot de passe a expiré."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} ne peut pas être ajouté à une liste de contrôle d'accès"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} est déjà une délégation"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} est déjà dans la liste"
 
@@ -16074,17 +15785,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Se désabonner des dossiers"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "Se _désabonner"
-
-#: ../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
-msgid "Notes"
-msgstr "Notes"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Liste de contrôle"
 
@@ -16129,22 +15830,13 @@ msgstr "_Activer"
 msgid "_Junk List"
 msgstr "_Liste des pourriels"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
-msgid "Message retracted successfully"
-msgstr ""
-
-#: ../plugins/groupwise-features/mail-retract.c:60
-#, fuzzy
-msgid "Retract Mail"
-msgstr "Récupération du courriel"
-
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Ajouter les options d'envoi au messages GroupWise"
 
 #: ../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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Options d'envoi"
 
@@ -16160,40 +15852,40 @@ msgstr "Fonctionnalités de GroupWise"
 msgid "Accept Tentatively"
 msgstr "Accepter provisoirement"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>Utilisateurs :</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Message"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Notification de dossier partagé"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Les participants recevront la notification suivante.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Contacts..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_Personnaliser le message de notification"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Non partagé"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Partagé avec..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Partage"
 
@@ -16327,7 +16019,7 @@ msgid "Select Calendar"
 msgstr "Sélectionner un calendrier"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importer"
 
@@ -16391,103 +16083,103 @@ msgstr ""
 "exporter les données."
 
 #: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Impossible de charger le calendrier « %s »"
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, 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:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Rendez-vous trouvé dans le calendrier « %s »"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:494
 msgid "Unable to find any calendars"
 msgstr "Impossible de trouver un calendrier"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:501
 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:524
+#: ../plugins/itip-formatter/itip-formatter.c:505
 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:528
+#: ../plugins/itip-formatter/itip-formatter.c:509
 msgid "Unable to find this journal entry in any journal"
 msgstr "Impossible de trouver cette entrée de journal dans un journal."
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:582
 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:796
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Unable to parse item"
 msgstr "Impossible d'analyser le contenu de l'élément"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:833
 #, 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:864
+#: ../plugins/itip-formatter/itip-formatter.c:844
 #, 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:868
+#: ../plugins/itip-formatter/itip-formatter.c:848
 #, 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:873
+#: ../plugins/itip-formatter/itip-formatter.c:853
 #, 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:878
+#: ../plugins/itip-formatter/itip-formatter.c:858
 #, 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:971
+#: ../plugins/itip-formatter/itip-formatter.c:951
 #, 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:978
+#: ../plugins/itip-formatter/itip-formatter.c:958
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envoie un avis d'annulation à la délégation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:960
 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:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1045
 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:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossible de mettre à jour le participant. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1076
 msgid "Attendee status updated"
 msgstr "État du participant mis à jour"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1203
 msgid "The calendar attached is not valid"
 msgstr "Le calendrier attaché n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1204
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16495,15 +16187,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:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 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:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1239
+#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1330
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16511,11 +16203,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:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 msgid "The calendar attached contains multiple items"
 msgstr "Le calendrier attaché contient des éléments multiples."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1265
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16525,205 +16217,205 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "_Delete message after acting"
 msgstr "_Supprimer le message après avoir agi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:2061
 msgid "Conflict Search"
 msgstr "Recherche de conflit"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 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:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Aujourd'hui"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Aujourd'hui %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 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:204
+#: ../plugins/itip-formatter/itip-view.c:202
 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:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Demain"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Demain %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 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:228
+#: ../plugins/itip-formatter/itip-view.c:226
 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:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Demain %I:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 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:269
+#: ../plugins/itip-formatter/itip-view.c:267
 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:278
+#: ../plugins/itip-formatter/itip-view.c:276
 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:284
+#: ../plugins/itip-formatter/itip-view.c:282
 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:288
+#: ../plugins/itip-formatter/itip-view.c:286
 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:293
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 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:303
+#: ../plugins/itip-formatter/itip-view.c:301
 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:308
+#: ../plugins/itip-formatter/itip-view.c:306
 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:312
+#: ../plugins/itip-formatter/itip-view.c:310
 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:317
+#: ../plugins/itip-formatter/itip-view.c:315
 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:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a publié les informations de la réunion "
 "suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, 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:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, 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:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s demande votre présence à la réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite être intégré à une réunion "
 "existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, 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:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -16731,76 +16423,76 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les dernières informations pour la réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, 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:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, 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:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, 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:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a refusé les changements suivants à la "
 "réunion :"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, 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:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, 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:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, 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:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> demande l'assignation de %s à la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, 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 assigné une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> vous a assigné une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite être intégré à une tâche "
 "existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, 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:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -16809,157 +16501,117 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les dernières informations pour l'assignation de "
 "tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, 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 assignée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a annulé la tâche assignée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> a annulé la tâche assignée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> a proposé les changements suivants à l'assignation de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, 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 assignée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> a refusé la tâche assignée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, fuzzy, 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é les tâches suivantes :"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, fuzzy, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> a publié la tâche suivante :"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, fuzzy, 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é à une réunion "
-"existante :"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, fuzzy, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> souhaite être intégré à une réunion existante :"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, fuzzy, 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é la réunion suivante :"
-
-#: ../plugins/itip-formatter/itip-view.c:497
-#, fuzzy, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> a annulé la tâche assignée suivante :"
-
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "_Refuser"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "Tout _refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "_Refuser"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "Tout _provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "_Provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "Tout _accepter"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
-msgstr "Envoyer l'information"
+msgstr "_Envoyer l'information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "Mettre à jo_ur l'état du participant"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "_Mettre à jour"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:890
 msgid "Start time:"
 msgstr "Heure de début :"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:899
 msgid "End time:"
 msgstr "Heure de fin :"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:915
+#: ../plugins/itip-formatter/itip-view.c:965
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:979
 msgid "Send u_pdates to attendees"
 msgstr "Envoyer des _mises à jour aux participants"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:988
 msgid "A_pply to all instances"
 msgstr "A_ppliquer à toutes les occurrences"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "_Tâches :"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "Mémos :"
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "Afficher les parties text/calendar dans les messages."
@@ -16971,7 +16623,7 @@ msgstr "Formateur Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; a délégué un représentant à cette réunion. Voulez-vous "
 "ajouter le délégué &quot;{1}&quot; ?"
@@ -17064,14 +16716,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Convertir le message sélectionné en une nouvelle tâche"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "_Propriétaire de la liste de contacts"
 
 #: ../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 "Récupérer l'_archive de la 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
 msgid "Get list _usage information"
 msgstr "Récupérer la liste des informations d'_utilisation"
 
@@ -17093,14 +16748,17 @@ msgstr ""
 "désabonnement, etc)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Envoyer un message à la liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_S'abonner à la liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "Se _désabonner de la liste"
 
@@ -17185,10 +16843,6 @@ msgstr "É_diter le message"
 msgid "_Send message"
 msgstr "_Envoyer le message"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "_Propriétaire de la liste de contacts"
-
 #: ../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 ""
@@ -17196,18 +16850,10 @@ msgstr ""
 "appartient"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Récupérer l'_archive de la liste"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Récupérer les informations d'_utilisation de la liste"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Récupère une archive de la liste à laquelle ce message appartient"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Récupère des informations à propos de l'utilisation de la liste à laquelle "
@@ -17227,25 +16873,13 @@ msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr ""
 "Se désabonner de la liste de diffusion à laquelle le message appartient"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Envoyer un message à la liste"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "S'_abonner à la liste"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "Se _désabonner de la liste"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Tout marquer comme lu"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "Marquer les me_ssages comme lus"
+msgid "Mark me_ssages as read"
+msgstr "Marquer tous les me_ssages comme lus"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
@@ -17281,11 +16915,11 @@ msgstr "Génère un message D-BUS lorsqu'un nouveau courriel arrive."
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
 msgid "New Mail Notification"
-msgstr "Notification de nouveau courriel"
+msgstr "Notification de nouveaux courriels"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
 msgid "New mail notify"
-msgstr "Notifie de nouveau courriel"
+msgstr "Notifie les nouveaux courriels"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
@@ -17390,7 +17024,7 @@ msgstr "Autorise les calendriers a être publiés sur le Web"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
-msgstr "Publication de calendrier"
+msgstr "Publication du calendrier"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Locations"
@@ -17511,12 +17145,12 @@ msgstr "Enregistrer toutes les pièces jointes"
 msgid "Select save base name"
 msgstr "Sélectionnez le nom de la sauvegarde"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:360
 msgid "MIME Type"
 msgstr "Type MIME"
 
-#: ../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:368
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -17627,7 +17261,7 @@ msgid "RDF format (.rdf)"
 msgstr "Format RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Sélectionner un fichier de destination"
 
@@ -17676,19 +17310,19 @@ msgstr ""
 "\n"
 "Veuillez cliquer sur le bouton « Suivant » pour continuer. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Veuillez sélectionner les informations que vous désirez importer :"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importation des données."
 
@@ -17776,15 +17410,11 @@ msgstr "Le panneau latéral est visible"
 msgid "Skip development warning dialog"
 msgstr "Ignorer les dialogues d'avertissement de développement"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Démarrer en mode hors ligne"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "La barre d'état est visible"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17792,19 +17422,19 @@ msgstr ""
 "La configuration de la version d'Evolution, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Hauteur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Largeur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Largeur par défaut du panneau latéral, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17812,7 +17442,7 @@ msgstr ""
 "La dernière version d'Evolution mise à jour, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17823,48 +17453,44 @@ msgstr ""
 "« toolbar » est choisi, le style des boutons est fixé par le réglage GNOME "
 "de la barre d'outils."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Barre d'outils visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indique si Evolution doit démarrer en mode hors-ligne plutôt qu'en mode "
 "connecté."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Indique si la fenêtre doit être maximisée."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Indique si le panneau latéral doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Indique si la barre d'état doit être visible."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Indique si la barre d'outils doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indique si les dialogues d'avertissement de la version de développement "
 "d'Evolution sont ignorés."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Indique si la fenêtre de boutons doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Style des boutons de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Les boutons de la fenêtre sont visibles"
 
@@ -17885,11 +17511,11 @@ msgstr "Cliquez sur Valider pour fermer ces connexions et passer hors ligne"
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Choisissez l'assistant d'importation à lancer :"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17903,11 +17529,11 @@ msgstr ""
 "Si vous ignorez le type, sélectionnez « Automatique » et Evolution essaiera "
 "de l'utiliser."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Choisissez la destination de cette importation"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17919,23 +17545,23 @@ msgstr ""
 "être importé n'a été trouvé. Si vous voulez essayer de nouveau,\n"
 "veuillez cliquer le bouton « Retour ».\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nom du f_ichier :"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Sélectionnez un fichier"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Type de fichier :"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importer les données et paramètres d'_anciens programmes"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importer un _seul fichier"
 
@@ -18009,7 +17635,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "Travailler _en ligne"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "Travailler _hors ligne"
 
@@ -18057,21 +17683,16 @@ msgstr "Arguments non valides"
 
 #: ../shell/e-shell.c:1266
 msgid "Cannot register on OAF"
-msgstr "Impossible d'enregistrer dans OAF"
+msgstr "Impossible d'enregistrer dans OAF."
 
 #: ../shell/e-shell.c:1268
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Nouveau"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Nouveau "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Nouveau test"
@@ -18123,7 +17744,7 @@ msgstr ""
 "d'importation de fichiers externes dans Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18162,7 +17783,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:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18170,39 +17791,35 @@ msgstr ""
 "Merci,\n"
 "L'équipe d'Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Ne plus afficher le message"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant spécifié"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forcer l'arrêt de tous les composants d'Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcer la remigration depuis Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoyer la sortie de débogage de tous les composants vers un fichier."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Désactiver le chargement des greffons."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Le client de messagerie et l'agenda Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18395,7 +18012,7 @@ msgstr "Sélectionnez un certificat à importer..."
 #: ../smime/gui/certificate-manager.c:472
 #: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
-msgstr "Nom de certificat"
+msgstr "Nom du certificat"
 
 #: ../smime/gui/certificate-manager.c:276
 #: ../smime/gui/certificate-manager.c:490
@@ -18409,7 +18026,7 @@ msgstr "Numéro de série"
 
 #: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
-msgstr "Expire"
+msgstr "Expire le"
 
 #: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
@@ -18980,12 +18597,12 @@ msgstr "Enregistre les contacts sélectionnés comme VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Enregistre les contacts du dossier sélectionné comme VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Tout sélectionner"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Tout sélectionner"
@@ -19055,7 +18672,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:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Nouveau"
 
@@ -19116,7 +18733,6 @@ msgid "Month"
 msgstr "Mois"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Suivant"
 
@@ -19125,7 +18741,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Prévisualise le calendrier à imprimer"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Précédent"
 
@@ -19213,11 +18829,11 @@ msgstr "Coupe la sélection vers le presse-papiers"
 msgid "Paste from clipboard"
 msgstr "Colle depuis le presse-papiers"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Colle le texte depuis le presse-papiers"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Sélectionne tout le texte"
 
@@ -19252,31 +18868,30 @@ msgstr "Cliquez ici pour voir l'aide disponible"
 msgid "Close"
 msgstr "Fermer"
 
-#: ../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_nsérer"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Pièce jointe..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Aide"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Insertion"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Options"
@@ -19375,11 +18990,6 @@ msgstr "L'état indique si la période est affichée comme occupée"
 msgid "_Alarms"
 msgstr "_Alarmes"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Catégories"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19445,73 +19055,53 @@ msgid "F_older"
 msgstr "D_ossier"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "A_perçu du message"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Déplace le dossier sélectionné vers un autre dossier"
 
 #. 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 "Supprime définitivement les messages effacés de tous les dossiers"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Rechercher des _dossiers"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Afficher l'a_perçu du message"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Afficher l'aperçu du message sous la liste des messages"
-
-#: ../ui/evolution-mail-global.xml.h:15
-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"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Affiche la fenêtre de prévisualisation des messages"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "S'abonne ou se désabonne aux dossiers sur les serveurs distants"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "Affichage _classique"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Copier le dossier vers..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Filtres de _message"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Déplacer le dossier vers..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Nouveau..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Aperçu"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Abonnements"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "Affichage _vertical"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Modifie le nom de ce dossier"
@@ -19681,7 +19271,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"
@@ -20073,10 +19663,6 @@ msgid "_Unread"
 msgstr "Non l_u"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Zoom a_vant"
 
@@ -20084,7 +19670,7 @@ msgstr "Zoom a_vant"
 msgid "Close this window"
 msgstr "Ferme cette fenêtre"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barre d'outils principale"
 
@@ -20159,6 +19745,11 @@ msgstr "Obtenir un avertissement quand votre message est lu"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nsérer"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Ouvre un fichier"
@@ -20490,51 +20081,43 @@ msgstr "Icônes _et texte"
 msgid "Import data from other programs"
 msgstr "Importe les données d'autres programmes"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "_Agencement"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Nouvelle _fenêtre"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Préférences"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Envoyer / Recevoir"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Envoyer / _Recevoir"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Envoie les courriels en attente et récupère les nouveaux"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Configuration du Pilot"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Affiche les informations concernant Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Afficher la barre _latérale"
+msgid "Side _Bar"
+msgstr "Panneau _latéral"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Afficher la _barre d'état"
+msgid "Status _Bar"
+msgstr "_Barre d'état"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Afficher la barre d'ou_tils"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Affiche les informations concernant Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Soumettre un rapport d'anomalie"
 
@@ -20542,71 +20125,75 @@ msgstr "Soumettre un rapport d'anomalie"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Soumettre un _rapport d'anomalie"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumettre un rapport d'anomalie en utilisant Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "L'état indique si que le travail s'effectue hors ligne."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "_Barre d'outils"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Style de la _barre d'outils"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Afficher/cacher le panneau latéral"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Afficher/cacher la barre d'état"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "À _propos"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Fermer la fenêtre"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "_Oublier les mots de passe"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Masquer les boutons"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "_Icônes uniquement"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Référence rapide"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Modifier l'apparence"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Options de _synchronisation..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "_Texte uniquement"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Fenêtre"
 
@@ -20643,34 +20230,26 @@ msgid "_Work Week View"
 msgstr "Vue hebdomadaire de _travail"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Comme dossier _Envoyés pour l'affichage large"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Comme dossier _Envoyé"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Par _état"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Par e_xpéditeur"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Par _sujet"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Par indicateur de _suivi"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Pour l'affichage _large"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Messages"
 
@@ -20686,32 +20265,28 @@ msgstr "Avec _date d'échéance"
 msgid "With _Status"
 msgstr "Avec l'é_tat"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Fuseaux horaires</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Sélection :</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Sélectionner un fuseau Horaire"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "Menu déroulant du fuseau horaire"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20747,7 +20322,7 @@ msgid "_Edit..."
 msgstr "Édit_er..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20761,11 +20336,11 @@ msgstr "Instance"
 msgid "Save Current View"
 msgstr "Enregistrer la vue courante"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "_Créer une nouvelle vue"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Remplacer la vue existante"
 
@@ -20800,22 +20375,18 @@ msgstr "Fabrique"
 msgid "Define New View"
 msgstr "Définir une nouvelle vue"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "Nom de la nouvelle vue :"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "Type de la vue"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 msgstr "Type de la vue :"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Suggérer l'affichage automatique de la pièce jointe"
-
 #. 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
@@ -20824,7 +20395,6 @@ msgstr "LMMJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1093
-#: ../widgets/misc/e-calendar-item.c:1746
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20834,8 +20404,8 @@ msgstr "Calendrier mensuel"
 
 #: ../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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Couleur de remplissage"
 
@@ -20844,16 +20414,16 @@ msgstr "Couleur de remplissage"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "Couleur de remplissage 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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Remplir le stipple"
 
@@ -20892,11 +20462,11 @@ msgid "Minimum Width"
 msgstr "Largeur minimale"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Espacement"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Maintenant"
 
@@ -21024,14 +20594,6 @@ msgstr "Menu déroulant pour choisir la date"
 msgid "Time"
 msgstr "Heure"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "_Maintenant"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Aujourd'hui"
-
 #. 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"
@@ -21042,23 +20604,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Développé"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Expandeur développé ou non"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Taille de l'étiquette de l'expandeur"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Utiliser le soulignement"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -21066,82 +20628,66 @@ msgstr ""
 "Si activé, un soulignement dans le texte indique que le caractère suivant "
 "est utilisé comme touche de raccourcis"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Espace à mettre entre l'étiquette et le fils"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Composant graphique Étiquette"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Un composant graphique à afficher à la place de l'étiquette de l'expandeur "
 "usuel"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Taille de l'expandeur"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Taille de la flèche de l'expandeur"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indicateur d'espacement"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Espace autour de la flèche de l'expandeur"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Enregistrer la recherche"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Recherches"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Recherches"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Enregistrer la recherche"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "Enre_gistrer la recherche..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "É_diter les recherches enregistrées..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "Recherche _avancée..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Tous les comptes"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Compte actuel"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Dossier actuel"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Message actuel"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Choisissez une image"
@@ -21183,45 +20729,45 @@ msgstr "Modèle de replacement"
 msgid "Column width"
 msgstr "Largeur des colonnes"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Rechercher"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Type de recherche"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID de l'élément"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "ID du sous-élément"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "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:911
-msgid "Show: "
-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:927
-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:939
-msgid " i_n "
-msgstr " _dans "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Rechercher _maintenant"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -21270,8 +20816,8 @@ msgid "A_uto-delete sent item"
 msgstr "S_upprimer automatiquement l'élément envoyé"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classification"
+msgid "C_lassification"
+msgstr "C_lassification"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -21295,23 +20841,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
+"Public\n"
+"Privé\n"
+"Confidentiel\n"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "_Réponse requise"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "_Suivi de l'état"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -21323,51 +20869,51 @@ msgstr ""
 "Standard\n"
 "Basse"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Quand acce_pté :"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Quand t_erminé :"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Quand _refusé :"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "_Sous"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Après :"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Toutes les informations"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Retarder la délivrance du message"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Délivré"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "_Définir une date d'expiration"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Jusqu'au :"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "Quand cela vous _convient"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "_Quand ouvert :"
 
@@ -21385,19 +20931,19 @@ msgstr "%s (%d%% effectué)"
 msgid "Click here to go to URL"
 msgstr "Cliquez ici pour aller à l'URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "Éditer la liste maître des catégories..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "Éléments appartenant à ces _catégories :"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "_Catégories disponibles :"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "catégories"
 
@@ -21421,23 +20967,23 @@ msgstr "Colonne ayant le focus"
 msgid "Unselected Column"
 msgstr "Colonne non sélectionnée"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1786
 msgid "Strikeout Column"
 msgstr "Colonne barré"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1793
 msgid "Underline Column"
 msgstr "Colonne souligné"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1800
 msgid "Bold Column"
 msgstr "Colonne en gras"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Color Column"
 msgstr "Colonne en couleur"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1821
 msgid "BG Color Column"
 msgstr "Colonne de couleur d'arrière-plan"
 
@@ -21452,7 +20998,6 @@ msgstr "Champs _disponibles :"
 
 #: ../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
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -21463,7 +21008,6 @@ msgstr "Effacer tout"
 
 #: ../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 "Descending"
 msgstr "Décroissant"
 
@@ -21561,14 +21105,14 @@ msgstr "_Afficher ces champs dans l'ordre :"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Code Glisser/Déposer"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "En-tête complet"
 
@@ -21588,19 +21132,25 @@ 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:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d élément)"
-msgstr[1] "%s : %s (%d éléments)"
+msgstr "%s : %s (%d élément)"
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d éléments)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d élément)"
-msgstr[1] "%s (%d éléments)"
+msgstr "%s (%d élément)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d éléments)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21680,69 +21230,65 @@ msgstr "Hauteur de rangée uniforme"
 msgid "Frozen"
 msgstr "Gelé"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Personnaliser la vue en cours"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Tri croissant"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Tri décroissant"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Ne pas trier"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Grouper par ce champ"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Grouper par boîte"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Enlever cette colonne"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Ajouter une colonne..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Alignement"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Meilleur ajustement"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Format des colonnes..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Personnaliser la vue en cours..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Trier par"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Jeu de police"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Info de tri"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21794,7 +21340,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Ceci devrait tester l'élément de canevas des minicartes"
 
 #: ../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:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Processeur d'événements"
 
@@ -21807,57 +21353,57 @@ 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
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Justification"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Utiliser des points de suspension"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Points de suspension"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Coupure des lignes"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Caractères de coupure"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Lignes maximum"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Autoriser les nouvelles lignes"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Dessiner les bordures"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Dessiner l'arrière-plan"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Dessiner le bouton"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Position du curseur"
 
@@ -21865,58 +21411,58 @@ msgstr "Position du curseur"
 msgid "Emulate label resize"
 msgstr "Émuler le redimensionnement de l'étiquette"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Méthodes de saisie"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Gras"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Barré"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Ancre"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Largeur du masque"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Hauteur du masque"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Masque"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Remplir le masque rectangulaire"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "Décalage en X"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Décalage en Y"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Largeur du texte"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Hauteur du texte"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "Contexte des méthodes de saisie"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Poignée du menu contextuel"
diff --git a/po/gl.po b/po/gl.po
index 006cc06b3a..d041699757 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -40,8 +40,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-07 14:01+0200\n"
-"PO-Revision-Date: 2006-06-07 14:22+0200\n"
+"POT-Creation-Date: 2006-05-19 09:57+0200\n"
+"PO-Revision-Date: 2006-05-19 09:58+0200\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "libro de enderezos de evolution"
 
@@ -66,12 +66,12 @@ msgstr "Novo Contacto"
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "o cartafol de libretas de enderezos %s ten %d tarxeta"
-msgstr[1] "o cartafol de libretas de enderezos %s ten %d tarxetas"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "o cartafol de libretas de enderezos ten %d tarxeta"
+msgstr[1] "o cartafol de libretas de enderezos ten %d tarxetas"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -90,32 +90,32 @@ msgstr "Contactos: "
 msgid "evolution minicard"
 msgstr "minitarxeta de evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Ten alarmas."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Ten recorrencias."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "É unha xuntanza."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Evento de calendario: O resumo é %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Evento de calendario: Sen resumo."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "vista de eventos do calendario"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Obter o foco"
 
@@ -186,10 +186,8 @@ msgstr "%A, %d de %b de %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
@@ -220,10 +218,8 @@ msgstr "%d de %b de %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d de %b"
 
@@ -353,14 +349,6 @@ msgstr "Activar predeterminados"
 msgid "Popup Menu"
 msgstr "Menú emerxente"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Conmutar barra de adxuntos"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "activar"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -588,7 +576,7 @@ msgstr "Configurar autocompletado aquí"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
@@ -651,7 +639,7 @@ msgstr "Neste computador"
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Persoal"
 
@@ -711,11 +699,11 @@ msgstr "Copiar o contido do libro localmente para operación desconectada"
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:1990
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Xeral"
@@ -754,12 +742,12 @@ msgid "Address Book Properties"
 msgstr "Propiedades do libro de enderezos"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
@@ -835,35 +823,34 @@ msgstr "Os nomes de cartafoles non poden conter o carácter '/'"
 msgid "A Folder with this name already exists"
 msgstr "Un cartafol con este nome xa existe"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Novo Libro de Enderezos"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1279
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1121
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Gardar como VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Selector de orixe de contactos"
 
@@ -872,7 +859,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo ao servidor LDAP anonimamente"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Fallou ao autenticar.\n"
 
@@ -923,7 +910,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI para o cartafol usado por última vez no diálogo de selección de nomes."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Posición vertical do panel"
 
@@ -1247,10 +1234,12 @@ msgstr "minutos"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
@@ -1300,13 +1289,13 @@ msgstr "<b>Traballo</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1357,7 +1346,7 @@ msgstr "Teléfono"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Traballo"
@@ -1385,8 +1374,10 @@ msgid "_Calendar:"
 msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "_Categorías..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Categorías"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1473,8 +1464,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Código Postal: "
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Enderezo"
 
@@ -1482,7 +1473,7 @@ msgstr "Enderezo"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1490,7 +1481,7 @@ msgstr "Enderezo"
 #: ../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:1798 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2468,7 +2459,7 @@ msgstr "Cimbabue"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nome:"
@@ -2479,7 +2470,7 @@ msgstr "Mensaxería instantánea AOL"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2489,7 +2480,7 @@ msgstr "Mensaxería Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2519,17 +2510,17 @@ msgid "Other"
 msgstr "Outro"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2563,15 +2554,15 @@ msgstr "Modificado"
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2579,23 +2570,23 @@ msgstr ""
 "Os datos do contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3064
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ten un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2607,15 +2598,15 @@ msgstr "Engadir contacto rápido"
 msgid "_Edit Full"
 msgstr "_Editar Completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
 msgid "E-_mail"
 msgstr "Correo _electrónico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Seleccione o Libro de Enderezos"
 
@@ -2623,9 +2614,9 @@ msgstr "_Seleccione o Libro de Enderezos"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
-"Está seguro de que quere\n"
+"¿Está seguro de que quere\n"
 "borrar a lista de contactos (%s)?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
@@ -2640,9 +2631,9 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
-"Está seguro de que quere\n"
+"¿Está seguro de que quere\n"
 "borrar o contacto (%s)?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
@@ -2751,7 +2742,6 @@ msgid "_IM Service:"
 msgstr "Servizo M_I:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2767,7 +2757,7 @@ msgid "Add an email to the List"
 msgstr "Engadir un correo á lista"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:874
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Editor de Listas de Contactos"
 
@@ -2799,7 +2789,7 @@ msgstr "_Seleccionar"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Escriba un enderezo de correo ou arraste un contacto á lista de abaixo:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
 #: ../addressbook/gui/widgets/e-addressbook-view.c:223
@@ -2808,15 +2798,15 @@ msgstr "_Escriba un enderezo de correo ou arraste un contacto á lista de abaixo
 msgid "Book"
 msgstr "Libro"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "É unha nova lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:747
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Membros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:750
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
@@ -2937,9 +2927,9 @@ msgid "Save as VCard..."
 msgstr "Gardar como VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1259
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
@@ -2996,15 +2986,14 @@ msgstr "Cor_tar"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1267
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3125 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1107 ../mail/message-list.c:1863
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
@@ -3064,7 +3053,7 @@ msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Correo Electrónico"
@@ -3114,7 +3103,7 @@ msgid "Manager"
 msgstr "Xefe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
@@ -3123,7 +3112,7 @@ msgid "Nickname"
 msgstr "Alcume"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Nota"
 
@@ -3132,7 +3121,7 @@ msgid "Office"
 msgstr "Oficina"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organización"
 
@@ -3310,89 +3299,68 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Ten cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Abrir Ligazón no Navegador"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2492
-msgid "_Copy Link Location"
-msgstr "_Copiar Localización da Ligazón"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Enviar unha mensaxe nova a ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Copiar enderezo de _correo-e"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Listar Membros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Posición"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Vídeo conferencia"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Videoconferencia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "traballo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Páxina persoal"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
 msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "persoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Posto de traballo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Páxina persoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Diario web"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3448,7 +3416,7 @@ msgstr "Protocolo non soportado"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2372
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3581,7 +3549,7 @@ msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:700
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Erro ao engadi-lo contacto"
 
@@ -3598,7 +3566,7 @@ msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:655
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Erro ao elimina-lo contacto"
 
@@ -3633,57 +3601,57 @@ msgstr "Sobrescribir"
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:372
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "tarxeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Seleccione o Libro de Enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:601
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:763
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:994
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:997
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1038
-#: ../addressbook/gui/widgets/eab-gui-util.c:1056
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1058
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -3778,12 +3746,12 @@ msgstr "Importador de VCard de Evolution"
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Imprimi-los contactos"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3832,7 +3800,7 @@ msgstr "Formato"
 #: ../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:1896
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Cabeceira"
@@ -3936,7 +3904,7 @@ msgstr "Sombreado"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4157,17 +4125,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Seguro que quere borrar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Seguro que quere borrar esta entrada do diario?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Seguro que quere borrar esta xuntanza?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Seguro que quere borrar esta tarefa?"
 
@@ -4443,8 +4408,8 @@ msgstr "Dividir acontecementos de días múltiples:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Non se puido iniciar o servidor evolution-data-server"
 
@@ -4478,12 +4443,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Non se puido escribir o bloque de aplicación ToDo do Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1981
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Calendario e Tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4531,9 +4496,9 @@ msgid "Memos"
 msgstr "Notas"
 
 #: ../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/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
@@ -4556,13 +4521,13 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizo de notificación por alarma do Calendario de Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4574,7 +4539,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -4585,8 +4550,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1618
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4602,12 +4567,12 @@ msgstr "_Pospoñer o aviso:"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4619,31 +4584,32 @@ msgstr "_Pospoñer"
 msgid "location of appointment"
 msgstr "lugar da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1594
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Non hai resumo dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Non hai información do lugar dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Ten %d alarmas."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4655,7 +4621,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo-e. No seu lugar\n"
 "Evolution amosará un diálogo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1724
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4672,7 +4638,7 @@ msgstr ""
 "\n"
 "Está seguro de quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo sobre este programa."
 
@@ -4772,106 +4738,94 @@ msgid "Default reminder value"
 msgstr "Valor predeterminado do recordatorio"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Degradado de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Transparencia de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "URLs do servidor de dispoñibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "URL do modelo de dispoñibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Degradado dos eventos nas vistas de calendario."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Agocha-las tarefas completadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Agochar unidades da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Agochar o valor da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Posición horizontal do panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora na que remata a xornada laboral, en formato de vintecatro horas, de 0 a "
 "23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora á que comeza a xornada laboral, en formato de vintecatro horas, de 0 a "
 "23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Os intervalos de tempo amosados nas vistas diarias e semanais, en minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Hora da última alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URLs do servidor para publicación de dispoñibilidade."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Liña de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da liña de Marcus Bains - Vista de día"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Cor da liña de Marcus Bains - Barra de tempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto no que remata a xornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto no que comeza a xornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Posición do panel horizontal da vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Posición do panel vertical na vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Número de unidades para determinar un recordatorio predeterminado."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Número de unidades para determinar cándo agochar tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas fora de prazo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4879,7 +4833,7 @@ msgstr ""
 "Posición do panel horizontal, entre a vista e a datas do navegador do "
 "calendario e a lista de tarefas cando non está na vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4887,7 +4841,7 @@ msgstr ""
 "Posición do panel horizontal, entre a vista e o navegador de datas do "
 "calendario e a lista de tarefas na vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4895,7 +4849,7 @@ msgstr ""
 "Posición do panel vertical, entre a lista de tarefas e o panel de vista "
 "previa de tarefas, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4903,7 +4857,7 @@ msgstr ""
 "Posición do panel vertical, entre a vista e o navegador do calendario e a "
 "lista de tarefas na vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4911,65 +4865,65 @@ msgstr ""
 "Posición do panel vertical, entre a vista e o navegador de datas do "
 "calendario e a lista de tarefas cando non está na vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que se permite que sexan executados polas alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Amosar o campo RSVP no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Amosar o campo Rol no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Amosar os prazos finais das citas nas vistas semanal e mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Amosar o campo categorías no editor de eventos/xuntanzas/tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Amosar o visor da alarma nunha bandexa de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Amosar o campo estado no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Amosar o panel de \"Vista previa\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Amosar o panel de \"Vista previa\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Amosar o campo fuso horario no editor de eventos/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Amosar o campo tipo no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Amosa-los números das semanas no navegador de datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Posición do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4979,7 +4933,7 @@ msgstr ""
 "reemprázase pola parte de usuario do enderezo de correo e %d reemprázase "
 "polo dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4988,63 +4942,55 @@ msgstr ""
 "calendario, coma unha localización sen traslación da base de datos de "
 "franxas horarias Olsen, como en \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Divisións horarias"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "A hora na que a última alarma sonou, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Transparencia dos eventos nas vistas de calendario (Un valor entre 0 e 10, "
-"opaco por defecto)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Formato de hora en vintecatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para o recordatorio predeterminado, \"minutes\", \"hours\" ou \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cándo agochar tarefas, \"minutes\", \"hours\" or "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Comezo da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "O día no que comeza a semana, desde o Domingo (0) ata o Sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Indica se se debe usar ou non a bandexa de notificación para amosar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica se se debe pedir confirmación ao borrar unha cita ou tarefa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica se se debe pedir confirmación ao compactar citas ou tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5052,77 +4998,77 @@ msgstr ""
 "Indica se se deben comprimir os fins de semana, o cal pon ao Sábado e ao "
 "Domingo no mesmo espazo que un día laborabel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica se se debe amosar a hora de finalización dos acontecementos nas "
 "vistas semanais e mensuais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica se debe debuxar a liña Marcus Bains (liña á hora actual) no "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica se debe agochar as tarefas rematadas na vista de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Indica se debe establecer un recordatorio predeterminado para as citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Indica se debe amosar o campo RSVP no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Indica se debe amosar o campo categorías no editor de eventos/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Indica se debe amosar o campo rol no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Indica se debe amosar o campo estado no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica se debe amosar as horas en formato de vintecatro horas en vez de usar "
 "am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Indica se debe amosar o campo fuso horario no editor de eventos/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Indica se debe amosar o campo tipo no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Indica se debe amosar os números da semana no navegador de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Hora de finalización da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minuto de finalización da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Hora de comezo da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minuto de comezo da xornada laboral"
 
@@ -5155,7 +5101,7 @@ msgstr "Imprimir"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
@@ -5224,59 +5170,59 @@ msgstr "Fallou ao actualizar calendarios."
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Non se puido abrir o calendario '%s' para crear acontecementos e xuntanzas"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Non hai un calendario dispoñible para crear acontecementos e xuntanzas"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Nova xuntanza"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "X_untanza"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Crea unha solicitude de reunión nova"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Cita para todo o día nova"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "_Cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Crea unha cita nova para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
@@ -5434,18 +5380,47 @@ msgstr "Enga_dir"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Suxerir que se amose o anexo automaticamente"
+#: ../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 "Suxerir que se amose o anexo automaticamente"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro(s)"
 
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Propiedades de adxuntos"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Descrición:"
+
+#: ../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 "Nome do ficheiro:"
+
+#: ../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 "Tipo MIME:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar axenda para alarmas"
@@ -5505,7 +5480,7 @@ msgid "Display"
 msgstr "Amosar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
@@ -5603,7 +5578,7 @@ msgid "Thursday"
 msgstr "Xoves"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
@@ -5693,43 +5668,44 @@ msgid "before every appointment"
 msgstr "antes de cada cita"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Cop_iar o contido do calendario localmente para operación desconectada"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Copiar o contido do calendario localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Cop_iar o contido da lista de tarefas localmente para operación desconectada"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Copiar o contido da lista de tarefas localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Copia_r o contido da lista de notas localmente para operación desconectada"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Copiar o contido da lista de notas localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_or:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Nova Lista de Notas"
 
@@ -5836,29 +5812,29 @@ msgstr " (Pendente "
 msgid "Due "
 msgstr "Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2861
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaxe adxunta - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2866
-#: ../composer/e-msg-composer.c:3062
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaxe adxunta"
 msgstr[1] "%d mensaxes adxuntas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3126
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1003 ../mail/message-list.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3128
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1866
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
@@ -5866,7 +5842,7 @@ msgstr "Cancelar _arrastre"
 msgid "Could not update object"
 msgstr "Non se puido actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2490
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5878,98 +5854,99 @@ msgid "Hide Attachment _Bar"
 msgstr "Agochar _barra de adxuntos"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Amosar _barra de adxuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3624
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3625 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3627
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Amosar adxuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Prema a tecla de espazo para cambiar a barra de adxuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Xuntanza - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2675
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:363
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2764
-#: ../calendar/gui/dialogs/comp-editor.c:2818
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Os trocos efectuados a este elemento poden descartarse se chega unha "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Imposible usar a versión actual!"
 
@@ -5985,10 +5962,6 @@ msgstr "Non se puido abrir o destino"
 msgid "Destination is read only"
 msgstr "O destino é de só lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Borrar este elmentos de tódolos outros buzóns?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento non se puido borrar debido a un erro de corba"
@@ -6050,11 +6023,11 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Recorrencia"
@@ -6070,7 +6043,7 @@ msgid "Cale_ndar:"
 msgstr "Cale_ndario:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6110,21 +6083,25 @@ msgid "End time is wrong"
 msgstr "A hora de finalización está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
 #: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
 #: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "É necesario polo menos un participante."
 
 #: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Engadir "
@@ -6165,16 +6142,17 @@ msgstr "Personalizar"
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
 #: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2282
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1678
+#: ../plugins/itip-formatter/itip-formatter.c:1626
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
 #: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
@@ -6216,12 +6194,16 @@ msgstr "D_escrición:"
 msgid "Event Description"
 msgstr "Descrición do evento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Lugar:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Alarma"
 
@@ -6243,6 +6225,14 @@ msgstr "para"
 msgid "until"
 msgstr "ata"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "Dele_gados"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "De:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6289,7 +6279,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -6575,15 +6565,15 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Completada"
 
 #: ../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:1029
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Alta"
 
@@ -6592,20 +6582,20 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "En Progreso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1027
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
@@ -6613,7 +6603,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2363
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -6626,7 +6616,7 @@ msgid "Stat_us:"
 msgstr "Esta_do:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -6643,12 +6633,12 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Detalles de tarefas"
 
@@ -6801,7 +6791,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador descoñecido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2857
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -6847,26 +6837,18 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descrición:"
-
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -6886,13 +6868,13 @@ msgid "Summary"
 msgstr "Resumo"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Libre"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -6906,17 +6888,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
@@ -6927,21 +6909,21 @@ msgstr "Non"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1703
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:718
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Asignada"
 
@@ -6949,7 +6931,7 @@ msgstr "Asignada"
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1939
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione o cartafol onde gardar os adxuntos seleccionados..."
 
@@ -6958,9 +6940,9 @@ msgstr "Seleccione o cartafol onde gardar os adxuntos seleccionados..."
 msgid "untitled_image.%s"
 msgstr "imaxe_sen-título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1117 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
@@ -6978,79 +6960,74 @@ msgstr "_Gardar seleccionados"
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Borrando os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Nova _Tarefa"
-
-#: ../calendar/gui/e-calendar-table.c:1260 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
-#: ../calendar/gui/e-calendar-table.c:1262
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1118
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7058,44 +7035,44 @@ msgstr "Abrir páxina _web"
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../calendar/gui/e-calendar-table.c:1266
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1272 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1273 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Remitir como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1274
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: ../calendar/gui/e-calendar-table.c:1275
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas seleccionadas como Completas"
 
-#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1513
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -7130,101 +7107,105 @@ msgstr "Data de Inicio"
 msgid "Task sort"
 msgstr "Ordenamento das tarefas"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Movendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nova _xuntanza"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Nova _Tarefa"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Seleccionar _hoxe"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Seleccionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegar Xuntanza..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Concertar Xuntanza..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Remitir como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1112
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _Movible"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7254,7 +7235,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisións de minuto"
@@ -7265,21 +7246,19 @@ msgstr "%02i divisións de minuto"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -7390,22 +7369,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1691
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1694
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1697
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Rexeitado"
 
@@ -7627,7 +7606,7 @@ msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1081
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "O estado do participante non se puido actualizar porque xa non existe o "
@@ -7736,65 +7715,65 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Cuarto"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Presidencia"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Participantes Requiridos"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Non-Participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Precisa dunha Acción"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Tentativa"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1700
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -7803,14 +7782,14 @@ msgstr "Delegado"
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "En Progreso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -7818,86 +7797,86 @@ msgstr "%A, %d de %B de %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fóra da Oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Sen Información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Par_ticipantes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Amosar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Amozar sen _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Autoescoller"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Tódalas persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Tódalas _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Borra-las notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
@@ -7905,7 +7884,7 @@ msgstr "Prema para engadir unha nota"
 msgid "Memo sort"
 msgstr "Ordenar nota"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7924,7 +7903,7 @@ msgstr "Cargando notas"
 msgid "Opening memos at %s"
 msgstr "Abrindo notas en %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Borrando os obxectos seleccionados..."
 
@@ -7933,32 +7912,31 @@ msgstr "Borrando os obxectos seleccionados..."
 msgid "Enter the password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Rematando tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Compactando"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "Seleccionar Fuso Horario"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1509
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d de %b"
 
@@ -8107,9 +8085,22 @@ msgstr "Información de iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no evento."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "_Nova Lista de Notas"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Propiedades..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8509,7 +8500,7 @@ msgstr "L_ista de Tarefas"
 msgid "Create a new task list"
 msgstr "Crear unha nova lista de tarefas"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8521,11 +8512,11 @@ msgstr ""
 "\n"
 "Eliminar realmente estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
@@ -10120,7 +10111,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1022
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Barra de adxuntos"
 
@@ -10128,43 +10119,28 @@ msgstr "Barra de adxuntos"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Non se pode adxuntar o ficheiro %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Non se pode adxuntar o ficheiro %s: non é un ficheiro regular"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Propiedades de adxuntos"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Nome do ficheiro:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Destino onde publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
@@ -10175,45 +10151,45 @@ msgstr "Prema aquí para o libro de enderezos"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Responder-A:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_De:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirán unha copia da mensaxe"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10224,15 +10200,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Publicar en:"
 
@@ -10240,7 +10216,7 @@ msgstr "Publicar en:"
 msgid "A_ttach"
 msgstr "A_dxuntar"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Inserir adxunto"
 
@@ -10258,12 +10234,12 @@ msgstr ""
 "Non se pode cifrar a mensaxe saínte: non hai estabrecido un certificado de "
 "cifrado para esta conta"
 
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Agochar _barra de adxuntos"
 
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Amosar _barra de adxuntos"
 
@@ -10289,21 +10265,21 @@ msgstr "Mensaxe sen título"
 msgid "Open File"
 msgstr "Abrir ficheiro"
 
-#: ../composer/e-msg-composer.c:2162 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Auto-xenerado"
 
-#: ../composer/e-msg-composer.c:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-msg-composer.c:2533 ../composer/e-msg-composer.c:3752
-#: ../composer/e-msg-composer.c:3755
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Compoñer unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4979
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10449,7 +10425,7 @@ msgstr "_Gardar Mensaxe"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10573,7 +10549,7 @@ msgstr ""
 "Cando reciba un correo cunha solicitude de notificación de lectura. qué "
 "debería facer Evolution?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10581,28 +10557,28 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Sobrescribir ficheiro?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Erro de Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Advertencia de Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Información de Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Consulta de Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erro interno, solicitado un erro descoñecido '%s'"
@@ -10697,23 +10673,23 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Escolla un ficheiro"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Tarefas pendentes"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Máis tarde"
@@ -10763,11 +10739,11 @@ msgid "Include threads"
 msgstr "Incluír conversacións"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -10863,7 +10839,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "segundos"
 
@@ -10933,7 +10909,7 @@ msgstr "Control de configuración do redactor de correo de Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Control de preferencias de Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11057,7 +11033,7 @@ msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Sen Nome"
 
@@ -11133,12 +11109,6 @@ msgstr "Data de recepción"
 msgid "Date sent"
 msgstr "Data de envío"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Eliminar"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Eliminada"
@@ -11236,7 +11206,7 @@ msgstr "Spam"
 msgid "Junk Test"
 msgstr "Proba de spam"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11280,7 +11250,7 @@ msgstr "Reproducir son"
 msgid "Read"
 msgstr "Ler"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Destinatarios"
 
@@ -11308,11 +11278,11 @@ msgstr "devolve menor que"
 msgid "Run Program"
 msgstr "Executar o programa"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuación"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Autor"
 
@@ -11344,9 +11314,9 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11362,7 +11332,7 @@ msgstr "Quitar estado"
 msgid "<b>Then</b>"
 msgstr "<b>Entón</b>"
 
-#: ../mail/em-folder-browser.c:147
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca desde a busca..."
 
@@ -11430,77 +11400,77 @@ msgstr "Enviado"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Árbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1768
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1770
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non se pode deixar a(s) mensaxe(s) no almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar ó Cartafol"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover ó Cartafol"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Vista"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Abrir nunha _Nova Fiestra"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Mover..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Novo Cartafol..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Baleirar Lixo"
 
@@ -11509,14 +11479,13 @@ msgstr "_Baleirar Lixo"
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1003
-#: ../mail/em-folder-view.c:1018
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1018
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -11538,158 +11507,158 @@ msgstr "Crear cartafol"
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
-#: ../mail/em-folder-view.c:1111 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: ../mail/em-folder-view.c:1113 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marcar coma _non Lida"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "_Marcar coma Non Importante"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marcar coma _non spam"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguemento..."
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Ningún"
 
-#: ../mail/em-folder-view.c:1141
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "M_arcar como completado"
 
-#: ../mail/em-folder-view.c:1142
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/em-folder-view.c:1145
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Cartafol de busca según o a_sunto"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Cartafol de busca según o re_mitente"
 
-#: ../mail/em-folder-view.c:1148
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Cartafol de busca según os des_tinatarios"
 
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Cartafol de busca según a _lista de correo"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1997 ../mail/em-folder-view.c:2041
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2140
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: ../mail/em-folder-view.c:2296
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Non se puido obter a mensaxe"
 
-#: ../mail/em-folder-view.c:2494
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Copiar Localización da Ligazón"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Crear cartafol de _busca"
 
-#: ../mail/em-folder-view.c:2495
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/em-folder-view.c:2496
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_A este enderezo"
 
-#: ../mail/em-folder-view.c:2850
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:2855
-msgid "Click to hide/unhide addresses"
-msgstr "Prema para agochar/amosar os enderezos"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:781 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:781
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11697,11 +11666,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:782 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:782
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11709,11 +11678,11 @@ msgstr ""
 "Esta mensaxe está asinada e é válida, o que significa que é moi probable que "
 "a mensaxe sexa auténtica."
 
-#: ../mail/em-format-html-display.c:783 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Sinatura inválida"
 
-#: ../mail/em-format-html-display.c:783
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11721,11 +11690,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Sinatura válida, non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11733,11 +11702,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, pero o remitente da mensaxe "
 "non se puido verificar."
 
-#: ../mail/em-format-html-display.c:790 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:790
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11745,11 +11714,11 @@ msgstr ""
 "Esta mensaxe non está cifrada. O seu contido pode verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:791 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:791
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11759,11 +11728,11 @@ msgstr ""
 "difícil, pero non imposible para un espía ver o contido desta mensaxe "
 "empregando algo de tempo."
 
-#: ../mail/em-format-html-display.c:792 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:792
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11771,11 +11740,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un espía ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:793 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Cifrado, forte"
 
-#: ../mail/em-format-html-display.c:793
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11784,72 +11753,72 @@ msgstr ""
 "Esta mensaxe está cifrada cun algoritmo de cifrado forte. Sería moi difícil "
 "que un espía vira o contido desta mensaxe empregando un tempo razoable."
 
-#: ../mail/em-format-html-display.c:894 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:909
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1200
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Rematado o %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1208
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1211
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes do %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1271
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1272
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Agochar"
 
-#: ../mail/em-format-html-display.c:1273
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Axustar ao ancho"
 
-#: ../mail/em-format-html-display.c:1274
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Amosar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:1693 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adxunto"
 
-#: ../mail/em-format-html-display.c:1900
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Seleccione o cartafol onde gardar todos os adxuntos..."
 
-#: ../mail/em-format-html-display.c:1947
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Gardar seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2014
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d ad_xunto"
 msgstr[1] "%d ad_xuntos"
 
-#: ../mail/em-format-html-display.c:2021 ../mail/em-format-html-display.c:2097
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "G_ardar"
 
-#: ../mail/em-format-html-display.c:2032
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../mail/em-format-html-display.c:2093
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Sen adxunto"
 
@@ -11863,94 +11832,94 @@ msgstr "Páxina %d de %d"
 msgid "Retrieving `%s'"
 msgstr "Obtendo `%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Sinatura válida, pero non se pode verificar o remitente"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro a ficheiro local (%s) válido no sitio \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Transporte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
@@ -12000,7 +11969,7 @@ msgstr "Unha vez por semana"
 msgid "Once per month"
 msgstr "Unha vez por mes"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12012,47 +11981,47 @@ msgstr ""
 "\n"
 "Agarde mentras Evolution migra seus cartafoles..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Non se puido crear o cartafol novo: `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Non se puido copiar o cartafol `%s' a `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Non se puido buscar buzóns existentes en `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Non se puido abrir os datos antigos POP keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Non se puido crear o directorio de datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Non se puideron copiar os datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Fallou ao crear o almacén de correo local `%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Non se puideron crear os cartafoles de correo local en `%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12069,6 +12038,10 @@ msgstr "_Responder ao remitente"
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Abrir Ligazón no Navegador"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
@@ -12098,28 +12071,28 @@ msgstr "Seleccione un servidor."
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Non amosar esta mensaxe outra vez."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "mensaxe"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Gardar mensaxe..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Engadir enderezo"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -12161,108 +12134,82 @@ msgid "Composer Window default width"
 msgstr "Anchura predeterminada da fiestra de redacción de mensaxes"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Comprimir a visualización de enderezos en A/CC/CCO"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr "Comprime a visualización de enderezos en A/CC/CCO ao número especificado en address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predeterminado para redactar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predeterminado para redactar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predeterminado para amosar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predeterminado para amosar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Altura predeterminada da fiestra de redacción de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Altura predeterminada da fiestra da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Altura predeterminada do diálogo de subscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Estilo de resposta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Anchura predeterminada da fiestra de redacción de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Anchura predeterminada da fiestra de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Anchura predeterminada do diálogo de subscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Debuxar indicadores de erros tipográficos nas palabras mentras se escribe."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar o lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles de lixo ao saír de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que poida ver un cursor cando lea correo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Activa ou desactiva a característica de busca ao teclear"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Activa a característica de busca na barra para que poida iniciar unha busca "
-"interactiva tecleando o texto. O uso é para que poida atopar facilmente un "
-"cartafol nesa barra lateral tan só tecleando o nome do cartafol e a "
-"selección salta automaticamente a ese cartafol."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Habilitar/deshabilitar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Altura do panel de lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Altura do panel de lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12270,13 +12217,7 @@ msgstr ""
 "Se o usuario tenta abrir 10 ou máis mensaxes ao mesmo tempo, preguntar ao "
 "usuario se quere realmente facelo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "Se o panel de \"Vista previa\" está activado, entón amosao no lateral no lugar de verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12287,23 +12228,23 @@ msgstr ""
 "de compoñentes bonobo na base de datos de Gnome pode empregarse para amosar "
 "o contido."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Última vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e súas cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12312,11 +12253,11 @@ msgstr ""
 "contén cadeas nomeando subdirectorios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e se están activadas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12324,19 +12265,19 @@ msgstr ""
 "Lista de etiquetas coñecidas para o compoñente de correo de Evolution. A "
 "lista contén cadeas co nome:cor onde cor usa a codificación hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de compoñentes bonobo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa cal a licencia foi aceptada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imaxes para mensaxes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12346,197 +12287,183 @@ msgstr ""
 "Nunca cargar imaxes desde a rede 1 - Cargar imaxes se o remitente está no "
 "libro de enderezos 2 - Sempre cargar imaxes desde a rede"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Rexistrar accións de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar accións de filtrado no ficheiro de rexistro especificado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuais na \"Vista preliminar\" da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuais na \"Vista preliminar\" da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Altura predeterminada da fiestra de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Anchura predeterminada da fiestra de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización mensaxe (\"normal\", \"cabeceiras completas\", "
 "\"fonte\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre o baleirado do lixo á saída"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mínimo entre o baleira do lixo á saída, en días."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Ficheiro de son novo para notificar correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Tipo novo de notificación de correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Número de enderezos a amosar en A/CC/CCO"
-
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Preguntar se o asunto está en branco"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar ao usuario cando tente compactar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar ao usuario cando tente enviar unha mensaxe sen un asunto."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario compacta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario só enche o campo Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cando o usuario tente abrir dez ou máis mensaxes á vez"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar ao enviar mensaxes en HTML a contactos que non os queiran."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cando o usuario tente enviar unha mensaxe sen destinatarios Para "
 "ou CC."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cando o usuario tente enviar HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Recoñecer ligazóns no texto e reemprazalas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Recoñecer emoticóns no texto e reemprazalos con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Executar a proba de spam no correo entrante"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisión."
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Amosar animacións"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Amosar imaxes animadas como animacións."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Amosar mensaxes borradas (riscadas) na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Amosar mensaxes borradas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "Amosa o correo-e do remitente a columna de composición de mensaxes na lista de mensaxes"
-
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Amosa o correo-e do remitente na columna de mensaxes na lista de mensaxes"
-
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproducir un ficheiro de son cando chegue correo novo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Especificar o tipo de notificación de correo novo que o usuario desexa "
 "empregar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en liña"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada do diálogo de subscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada do diálogo de subscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Fonte da terminal"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "A última vez que se baleirou o lixo, en días desde a época."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "A fonte de terminal para amosar correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "A letra de anchura variable para amosar correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12548,109 +12475,99 @@ msgstr ""
 "estructura XML é &lt;header enabled&gt; - establece activado se a cabeceira "
 "débese amosar na vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr "Esto establece o número de enderezos a amosar na vista de lista de mensaxes predeterminadas, máis alá dos cales amósase un '...'"
-
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Lista de mensaxes por fíos."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Lista de Mensaxes por Fíos"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de Mensaxes por Fíos basadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Temporización para marcar unha mensaxe como vista"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Temporización para marcar unha mensaxe como vista."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Cadena UID para a conta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Usar o demonio e cliente de Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Usar o demonio e cliente de Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Usar fontes personalizadas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Usar fontes personalizadas para amosar o correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Usar só as probas de spam local."
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa só as probas de spam local (sen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "Use side-by-side or wide layout"
-msgstr "Usar distribución lado a lado ou ancha"
-
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Fonte de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "O elemento do menú Ver/Cco está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "O elemento do menú Ver/Cco está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "O elemento do menú Ver/Cc está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "O elemento do menú Ver/Cc está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "O elemento do menú Ver/Desde está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "O elemento do menú Ver/Desde está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "O elemento do menú Ver/Publicar está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "O elemento do menú Ver/Publicar está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "O elemento do menú Ver/Responder está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "O elemento do menú Ver/Responder está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12658,14 +12575,6 @@ msgstr ""
 "Indica se se debe ou non voltar ao fiado de conversacións por asuntos cando "
 "as mensaxes non conteñen cabeceiras In-Reply-To ou References."
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
-msgid "Width of the message-list pane"
-msgstr "Anchura do panel de lista de mensaxes"
-
-#: ../mail/evolution-mail.schemas.in.in.h:120
-msgid "Width of the message-list pane."
-msgstr "Anchura do panel de lista de mensaxes."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
@@ -12697,7 +12606,7 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles en formato buzón de Berkeley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
@@ -12705,7 +12614,7 @@ msgstr "Importando `%s'"
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
@@ -13541,26 +13450,18 @@ msgid "_Show image animations"
 msgstr "_Amosar animacións de imaxes"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Reducir as cabeceiras Para/ Cc / Cco"
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "_Usar conexión segura:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que noutras aplicacións"
 
-#: ../mail/mail-config.glade.h:177
-msgid "addresses"
-msgstr "enderezos"
-
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "descrición"
 
@@ -13671,21 +13572,21 @@ msgstr "con todos os cartafoles locais"
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fallou ao aplicar os filtros ao correo saínte: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13694,114 +13595,123 @@ msgstr ""
 "Fallou ao adxuntar a %s: %s\n"
 "Adxuntando ao cartafol local `Enviado' no seu lugar."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Fallou ao adxuntar ao cartafol local `Enviado': %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Fallou ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando cartafol '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando e almacenando conta '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando conta '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando lixo en '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Recibindo %d mensaxe"
 msgstr[1] "Recibindo %d mensaxes"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Non foi posible crear o ficheiro de saída: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13810,11 +13720,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13823,22 +13733,22 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Comprobando Servizo"
 
@@ -13866,26 +13776,17 @@ msgstr "Agardando..."
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Introduza o contrasinal para %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Introduza o contrasinal"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Introduza o seu contrasinal"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
@@ -14529,74 +14430,74 @@ msgstr "_Compactar"
 msgid "_Open Messages"
 msgstr "_Abrir Mensaxes"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Máis alta"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1423 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1430 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1439 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: ../mail/message-list.c:1459 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: ../mail/message-list.c:1461 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:2202 ../mail/message-list.etspec.h:8
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../mail/message-list.c:3584
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -14616,19 +14517,15 @@ msgstr "Marcada"
 msgid "Follow Up Flag"
 msgstr "Marca de seguemento"
 
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Ubicación orixinal"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Recibido"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Mensaxes enviadas"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Tamaño"
@@ -14899,6 +14796,10 @@ msgstr ""
 "Un complemento de proba que demostra un menú emerxente que lle permite "
 "copiar cousas ao portapapeis."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Copiar enderezo de _correo-e"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Ferramenta de copia"
@@ -15106,10 +15007,8 @@ msgstr "Seu contrasinal actual expirou. Por favor cambie o seu contrasinal agora
 msgid "Your password will expire in the next %d days"
 msgstr "O seu contrasinal expirará nos seguintes %d días"
 
-#. Custom
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1566
 msgid "Custom"
 msgstr "Personalizar"
 
@@ -15229,7 +15128,7 @@ msgstr "Nome do cartafol"
 msgid "Folder Size"
 msgstr "Tamaño do cartafol"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Subscribirse ao cartafol doutro usuario"
@@ -15378,11 +15277,11 @@ msgstr "Non se poden amosar os cartafoles."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Os cambios ás opcións da conta Exchange \"{0}\" só terán lugar despois de "
-"saír e reiniciar Evolution."
+"Os cambios da configuración da conta Exchange terán lugar despois de saír e "
+"reiniciar Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15541,8 +15440,8 @@ msgid "Password successfully changed."
 msgstr "Contrasinal cambiado correctamente."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Por favor, reinicie Evolution para que poidan ter efecto os trocos"
+msgid "Please restart Evolution"
+msgstr "Por favor, reinicie Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
@@ -15921,12 +15820,12 @@ msgid "Select Calendar"
 msgstr "Seleccionar calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importar"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
@@ -15980,7 +15879,7 @@ msgstr ""
 "Non se puido abrir a lista de calendario/tarefas de Evolution para exportar "
 "datos."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
+#: ../plugins/itip-formatter/itip-formatter.c:275
 #: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
@@ -15996,88 +15895,88 @@ msgstr "Unha cita no calendario '%s' entra en conflito con esta xuntanza"
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Atopouse a cita no calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:495
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Non se puido atopar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:502
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non se puido atopar esta xuntanza en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:506
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Non se puido atopar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:510
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Non se puido atopar esta entrada do diario en ningún diario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:583
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Procurando unha versión existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:778
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Imposible analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:834
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Imposible enviar o elemento ao calendario '%s': %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario '%s' como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:849
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario '%s' como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:854
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario '%s' como declinado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario '%s' coma cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:952
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador quitou ao delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:959
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:961
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non se puido enviar unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1046
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "O estado de participación non se puido actualizar debido a que o estado é "
 "inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Imposible actualizar a participación. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1077
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Estado de participación actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1204
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "O calendario adxunto non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1205
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16085,15 +15984,15 @@ msgstr ""
 "A mensaxe di conter un calendario, pero o calendario non é un iCalendar "
 "válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1239
-#: ../plugins/itip-formatter/itip-formatter.c:1254
-#: ../plugins/itip-formatter/itip-formatter.c:1330
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
-#: ../plugins/itip-formatter/itip-formatter.c:1255
-#: ../plugins/itip-formatter/itip-formatter.c:1331
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16101,11 +16000,11 @@ msgstr ""
 "A mensaxe contén un calendario, pero o calendario non contén ningún "
 "acontecemento, tarefa ou información de dispoñibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1265
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario adxunto contén elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16115,17 +16014,17 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2006
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Borrar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../plugins/itip-formatter/itip-formatter.c:2048
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Procurar conflicto"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2031
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflictos entre xuntanzas"
 
@@ -16503,7 +16402,7 @@ msgstr "Formatador iTip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; delegou a xuntanza. Quere engadir ao delegado &quot;{1}"
 "&quot; ?"
@@ -17019,12 +16918,12 @@ msgstr "Gardar todos os adxuntos"
 msgid "Select save base name"
 msgstr "Seleccionar un nome base para gardar"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Gardar"
 
@@ -17134,7 +17033,7 @@ msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Seleccione ficheiro de destino"
 
@@ -17184,18 +17083,18 @@ msgstr ""
 "Por favor prema o botón \"Adiante\" para continuar."
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a información que quere importar:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importando Datos."
 
@@ -17250,7 +17149,7 @@ msgstr "Altura predeterminada da fiestra"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window state"
-msgstr "Estado predeterminado da fiestra"
+msgstr "Estado predeterminada da fiestra"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
@@ -17282,15 +17181,11 @@ msgstr "A barra lateral é visible"
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de advertencia de desenrolo"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "A barra de estado é visible"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17298,19 +17193,19 @@ msgstr ""
 "A versión de configuración de Evolution, co nivel de configuración maior/"
 "menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada da fiestra principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "A anchura predeterminada da fiestra principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "A anchura predeterminada para a barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17318,7 +17213,7 @@ msgstr ""
 "A última versión actualizada da configuración de Evolution, con nivel de "
 "configuración maior/menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17328,47 +17223,43 @@ msgstr ""
 "\"toolbar\".Se se selecciona \"toolbar\", o estilo dos botóns determinarase "
 "pola configuración da barra de ferramentas de Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica se Evolution iniciarase en modo desconectado en vez de en modo "
 "conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Indica ou non se a fiestra debería estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Indica se a barra lateral debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Indica se a barra de estado debería ser visible."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Indica se a barra de ferramentas debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica se se salta o diálogo de advertencia nas versión de desenvolvemento "
 "de Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Indica se os botóns da fiestra deberían ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Estilo dos botóns de fiestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Os botóns da fiestra son visibles"
 
@@ -17389,11 +17280,11 @@ msgstr "Prema en Aceptar para pechar estas conexións e desconectar"
 msgid "(Untitled)"
 msgstr "(Sen título)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Escolla o tipo de importador a executar:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17407,11 +17298,11 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe, e Evolution tentará "
 "averigualo."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importación"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17423,23 +17314,23 @@ msgstr ""
 "configuración que se poida importar. Se quere intentalo de novo, prema\n"
 "o botón \"Atrás\".\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nome do _ficheiro:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuración de programas _antigos"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
@@ -17495,7 +17386,7 @@ msgstr "Ignacio Casal Quinteiro <nacho.resa@gmail.com>"
 msgid "_Work Online"
 msgstr "_Traballar Conectado"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
@@ -17600,7 +17491,7 @@ msgstr ""
 "ficheiros externos a Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17637,7 +17528,7 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas súas colaboracións.\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17645,39 +17536,35 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando o compoñente especificado"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar o peche de todos os compoñentes de Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza a reemigración desde Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Desactiva a carga de calquer complemento."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- O cliente de correo e PIM de Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18346,12 +18233,6 @@ msgstr "C_opiar todos os contactos a..."
 msgid "Contact _Preview"
 msgstr "_Previsualización de contactos"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copiar"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Copia os contactos seleccionados a outro cartafol..."
@@ -18453,7 +18334,7 @@ msgid "Select All"
 msgstr "Seleccionar Todo"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
@@ -18523,7 +18404,7 @@ msgstr "_Mover contacto a..."
 msgid "_Move Folder Contacts To"
 msgstr "_Mover cartafol de contactos a"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Novo"
 
@@ -18584,7 +18465,6 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Seguinte"
 
@@ -18593,7 +18473,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Anterior"
 
@@ -18681,11 +18561,11 @@ msgstr "Cortar a selección ao portarretallos"
 msgid "Paste from clipboard"
 msgstr "Pega do portarretallos"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Pegar texto desde o portarretallos"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
@@ -18720,31 +18600,30 @@ msgstr "Prema aquí para ver a axuda dispoñible"
 msgid "Close"
 msgstr "Pechar"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nserir"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "A_xuda"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Inserir"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Opcións"
@@ -18842,11 +18721,6 @@ msgstr "Conmuta cando se deben amosar as horas como ocupadas"
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorías"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18912,73 +18786,53 @@ msgid "F_older"
 msgstr "_Cartafol"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "_Previsualizar mensaxe"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
 #. 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 "Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "_Cartafoles de busca"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Amosar vista _previa da mensaxe"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Amosar a vista previa da mensaxe baixo a lista de mensaxes"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Amosar a vista previa de mensaxes ao lado da lista de mensaxes"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Amosar a fiestra de previsualización da mensaxe"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subcribirse ou desuscribirse dos cartafoles en servidores remotos"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "Vista _clásica"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Copiar cartafol a..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Mover a cartafol a.."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Previsualización"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Subscripcións"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "Vista _vertical"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Cambiar o nome deste cartafol"
@@ -19535,10 +19389,6 @@ msgid "_Unread"
 msgstr "_Non lida"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Ampliación"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
@@ -19546,7 +19396,7 @@ msgstr "_Ampliar"
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
@@ -19621,6 +19471,11 @@ msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nserir"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Abrir un ficheiro"
@@ -19951,51 +19806,43 @@ msgstr "Iconas _e texto"
 msgid "Import data from other programs"
 msgstr "Importar datos doutros programas"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "_Distribución"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Nova _fiestra"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "Prefere_ncias"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Enviar / _Recibir"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Envía o correo na cola e obtén o novo"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Configuración do Pilot"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Amosar información acerca de Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Amosar _barra lateral"
+msgid "Side _Bar"
+msgstr "_Barra lateral"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Amosar _barra de estado"
+msgid "Status _Bar"
+msgstr "_Barra de estado"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Amosar _barra de ferramentas"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Amosar información acerca de Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
@@ -20003,71 +19850,75 @@ msgstr "Enviar un Informe de Erro"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "_Barra de ferramentas"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Ver/Agochar a barra lateral"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Ver/Agochar a barra de estado"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Pechar fiestra"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Es_quecer Contrasinais"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Agochar botóns"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Só _iconas"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _conmutador"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Opcións de _sincronización..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Só _texto"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Fiestra"
 
@@ -20104,34 +19955,26 @@ msgid "_Work Week View"
 msgstr "Vista de Semana _Laboral"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Coma _cartafol de enviados para a vista ancha"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Coma _cartafol de enviados"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Por Es_tado"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Por _remitente"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Por A_sunto"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Por marca de _seguemento"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Para a vista _ancha"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Mensaxes"
 
@@ -20204,7 +20047,7 @@ msgid "_Edit..."
 msgstr "_Editar..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1910
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20269,19 +20112,14 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Suxerir que se amose o anexo automaticamente"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -20349,7 +20187,7 @@ msgid "Minimum Width"
 msgstr "Ancho mínimo"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Espaciado"
 
@@ -20491,23 +20329,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expandido"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Indica se o expansor está ou non expandido"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Texto da etiqueta do expansor"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Usar subraiado"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20515,31 +20353,31 @@ msgstr ""
 "Se se establece, un subraiado no texto indica que o seguinte carácter "
 "debería usarse para a combinación de teclas mnemotécnica"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Espazo para poñer entre a etiqueta e o descendente"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Etiqueta do widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para amosar en lugar da etiqueta usual do expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Tamaño do expansor"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Tamaño da frecha do expansor"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indicador de espazo"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Espaciado arredor da frecha do expansor"
 
@@ -20616,43 +20454,43 @@ msgstr "Anchura de columna"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:372
+#: ../widgets/misc/e-search-bar.c:371
 msgid "Search"
 msgstr "Procurar"
 
-#: ../widgets/misc/e-search-bar.c:592
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:598
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Buscar Agora"
 
-#: ../widgets/misc/e-search-bar.c:599 ../widgets/misc/e-search-bar.c:1002
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:690
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Tipo de busca"
 
-#: ../widgets/misc/e-search-bar.c:909
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:916
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ID de subelemento"
 
-#: ../widgets/misc/e-search-bar.c:923 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Texto"
 
-#: ../widgets/misc/e-search-bar.c:1004
-msgid "Find No_w"
-msgstr "Buscar a_gora"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Buscar _Agora"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20852,23 +20690,23 @@ msgstr "Columna enfocada"
 msgid "Unselected Column"
 msgstr "Columna deseleccionada"
 
-#: ../widgets/table/e-cell-text.c:1770
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Riscar columna"
 
-#: ../widgets/table/e-cell-text.c:1777
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Subraiar columna"
 
-#: ../widgets/table/e-cell-text.c:1784
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Columna en grosa"
 
-#: ../widgets/table/e-cell-text.c:1791
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Cor da columna"
 
-#: ../widgets/table/e-cell-text.c:1805
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Cor de fondo da columna"
 
@@ -20990,14 +20828,14 @@ msgstr "_Amosar estos campos en orde:"
 #: ../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:1875
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Código 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:1889
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Encabezamento completo"
 
@@ -21115,69 +20953,65 @@ msgstr "Altura uniforme da ringleira"
 msgid "Frozen"
 msgstr "Conxelado"
 
-#: ../widgets/table/e-table-header-item.c:1467
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Ordenar ascendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1488
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Ordenar descendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1489
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Agrupar por este campo"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Agrupar por caixa"
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Eliminar esta columna"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Engadir unha columna..."
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Aliñamento"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Ancho óptima"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Formatar columnas..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Personalizar a vista actual..."
 
-#: ../widgets/table/e-table-header-item.c:1549
-msgid "Sort By"
-msgstr "Arranxar por"
-
-#: ../widgets/table/e-table-header-item.c:1882 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Fonte"
 
-#: ../widgets/table/e-table-header-item.c:1903
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Ordenar información"
 
-#: ../widgets/table/e-table-header-item.c:1917
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
diff --git a/po/gu.po b/po/gu.po
index aad198c617..b52d6a010d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,12 +1,12 @@
+# translation of evolution.gnome-2-14.gu.po to Gujarati
 # translation of evolution.HEAD.gu.po to Gujarati
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.gu\n"
+"Project-Id-Version: evolution.gnome-2-14.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-27 07:35+0200\n"
-"PO-Revision-Date: 2006-07-27 11:26+0530\n"
+"POT-Creation-Date: 2006-04-25 04:28+0200\n"
+"PO-Revision-Date: 2006-04-25 09:22+0530\n"
 "Last-Translator: Ankit Patel <ankit644@yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -44,32 +44,10 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા"
 
@@ -83,12 +61,12 @@ msgstr "નવો સંપર્ક"
 msgid "New Contact List"
 msgstr "નવી સંપર્ક યાદી"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડર %s ને %d કાર્ડ છે"
-msgstr[1] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડર %s ને %d કાર્ડો છે"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડરને %d કાર્ડ છે"
+msgstr[1] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડરને %d કાર્ડો છે"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -107,32 +85,32 @@ msgstr "સંપર્ક: "
 msgid "evolution minicard"
 msgstr "ઈવોલ્યુશન નાનો પત્ર"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr "તેની પાસે એલાર્મો છે."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "તેને ખૂબ વારાઓ છે."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "તે મંત્રણા છે."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "કેલેન્ડર ઘટના: %s સાર છે."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "કેલેન્ડર ઘટના: તેને કોઈ સાર નથી."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr "કેલેન્ડર ઘટના જુઓ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr "ફોકસ મેળવો"
 
@@ -161,47 +139,37 @@ msgstr "તારીખે જાઓ"
 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:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "તેની પાસે %d ઘટના છે."
 msgstr[1] "તેની પાસે %d ઘટનાઓ છે."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:153
 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "દિવસનો દેખાવ: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "કામના અઠવાડિયા માટેનો કેલેન્ડર દેખાવ"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "એક અથવા વધુ દિવસો માટે કેલેન્ડર દેખાવ"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -212,20 +180,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:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -233,10 +199,10 @@ msgstr "%a %d %b %Y"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -246,11 +212,9 @@ 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:220
-#: ../calendar/gui/calendar-component.c:732
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -276,21 +240,21 @@ msgstr "કૂદો બટન"
 msgid "Click here, you can find more events."
 msgstr "અંહિ ક્લિક કરો, તમે વધુ ઘટનાઓ શોધી શકો છો."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "મહિનાનો દેખાવ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "અઠવાડિયાનો દેખાવ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "મહિના માટે કેલેન્ડર દેખાવ"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "એક અથવા વધુ અઠવાડિયાઓ માટે કેલેન્ડર દેખાવ"
 
@@ -380,14 +344,6 @@ msgstr "મૂળભુત સક્રિય કરો"
 msgid "Popup Menu"
 msgstr "પોપઅપ મેનુ"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "જોડાણ પટ્ટી બદલો"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "સક્રિય કરો"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -552,9 +508,9 @@ msgstr "તમે આ સંપર્ક સાથે સુધારાઓ ક�
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "તમારા {0} માટેના સંપર્કો જ્યાં સુધી ઈવોલ્યુશન ફરીથી ચાલુ ન થાય ત્યાં સુધી ઉપલબ્ધ થશે નહિ."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "ઉમેરો (_A)"
@@ -564,7 +520,7 @@ msgid "_Discard"
 msgstr "છોડી દો(_D)"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -604,9 +560,9 @@ 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:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "સંપર્કો"
 
@@ -646,8 +602,8 @@ msgstr "તમારા S/MIME પ્રમાણપત્રોની અંહ
 #. 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:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -662,13 +618,12 @@ msgstr "આ કમ્પ્યુટરમાં"
 #. 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:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "ખાનગી"
 
@@ -695,7 +650,7 @@ 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-config.c:1202
 msgid "New Address Book"
 msgstr "નવી સરનામા પોથી"
 
@@ -711,73 +666,72 @@ msgstr "નવી સરનામાપોથી બનાવો"
 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:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "પ્રકાર (_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../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/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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "સામાન્ય"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "સરનામા પોથી"
 
-#: ../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/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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "વિગતો"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 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:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "સરનામાપોથીના ગુણધર્મો"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "રુપાંતરિત કરી રહ્યા છીએ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' ને રુપાંતરિત કરી રહ્યા છીએ:"
@@ -852,35 +806,34 @@ msgstr "ફોલ્ડર નામો '/' સમાવી શકતા નથ�
 msgid "A Folder with this name already exists"
 msgstr "આ નામ સાથેનું ફોલ્ડર પહેલાથી જ હાજર છે"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "નવી સરનામા પુસ્તિકા (_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "કાઢી નાંખો (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Vcard તરીકે સંગ્રહો..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "ગુણધર્મો (_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "સંપર્ક સ્રોત પસંદ કરનાર"
 
@@ -889,12 +842,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "અજાણી રીતે LDAP સર્વર વાપરી રહ્યા છીએ"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "સત્તાધિકરણ કરવામાં નિષ્ફળ.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (વપરાશકર્તા %s) માટે પાસવર્ડ દાખલ કરો"
@@ -936,7 +889,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "નામ પસંદ કરો સંવાદમાં છેલ્લે વપરાયેલ ફોલ્ડર માટેની URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "ઊભી તકતીની સ્થિતિ"
 
@@ -965,7 +918,7 @@ msgid "636"
 msgstr "૬૩૬"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>સત્તાધિકરણ</b>"
 
@@ -1208,9 +1161,9 @@ 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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "નામ (_N):"
 
@@ -1223,7 +1176,7 @@ msgid "_Search scope:"
 msgstr "શોધની હદ (_S):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "સર્વર (_S):"
@@ -1243,249 +1196,269 @@ 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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "મિનિટો"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>ઈ-મેઈલ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>ઘર</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>તુરંત સંદેશાવ્યવહાર</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>કામ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>મિશ્રિત</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>બીજા</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>ટેલિફોન</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>વેબ સરનામાઓ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>કાર્ય</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../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-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 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:2417
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "સંપર્ક સંપાદક"
 
-#: ../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:67
 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
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "લાડકુ નામ (_c):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../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/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
-#: ../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/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "કાર્ય"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 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:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1707
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1652
 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
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "વર્ગો (_C)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "શહેર (_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "કંપની (_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "દેશ (_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "વિભાગ (_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "ની નીચે ફાઈલ (_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "મુક્ત/વ્યસ્ત (_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "ઘર પાનુ (_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "વ્યવસ્થાપક (_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "નોંધો (_N):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "ઓફિસ (_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_PO બોક્સ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "ધંધો (_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "પત્ની (_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "રાજ્ય/પ્રોવિન્સ (_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "શીર્ષક (_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "વિડીયો સંવાદ (_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "HTML મેઈલ મેળવવાની જરુર છે (_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 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-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "ક્યાં (_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 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/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 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-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../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:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "ફેરફાર કરી શકાય તેવું"
 
@@ -2461,7 +2434,7 @@ msgstr "ઝિમ્બાબ્વે"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "નામ"
@@ -2472,7 +2445,7 @@ msgstr "AOL તુરંત સંદેશાવાહક"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "જેબર"
 
@@ -2480,102 +2453,91 @@ msgstr "જેબર"
 msgid "Yahoo Messenger"
 msgstr "યાહુ મેસેન્જર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-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:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "જગ્યા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "વપરાશકર્તાનું નામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "ઘર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "બીજા"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "યાહુ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../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:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "જૂથ પ્રમાણે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "સ્રોત ચોપડી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "લક્ષ્ય ચોપડી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "નવો સંપર્ક છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "લખી શકાય તેવા ક્ષેત્રો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "જરૂરી ક્ષેત્રો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, 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:2773
 msgid "Please select an image for this contact"
 msgstr "મહેરબાની કરીને આ સંપર્ક માટે ચિત્ર પસંદ કરો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
-msgid "_No image"
-msgstr "કોઈ ચિત્ર નથી (_N)"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "કોઈ ચિત્ર નથી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2583,31 +2545,15 @@ msgstr ""
 "સંપર્ક માહિતી અયોગ્ય છે:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
-#, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' નું બંધારણ અયોગ્ય છે"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
-#, 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
-#, 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:3110
 msgid "Invalid contact."
 msgstr "અયોગ્ય સંપર્ક."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "સંપર્ક ઝડપી-ઉમેરો"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "સંપૂર્ણ ફેરફાર કરો (_E)"
 
@@ -2615,11 +2561,11 @@ msgstr "સંપૂર્ણ ફેરફાર કરો (_E)"
 msgid "_Full name"
 msgstr "પુરૂં નામ (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
-msgstr "ઈમેઈલ (_m)"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "ઈ-મેઈલ (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "સરનામા પુસ્તિકા પસંદ કરો (_S)"
 
@@ -2627,10 +2573,10 @@ msgstr "સરનામા પુસ્તિકા પસંદ કરો (_S)"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "શું તમે ખરેખર સંપર્ક યાદી (%s)\n"
-"કાઢી નાંખવા માંગો છો?"
+"કાઢી નાંખવા માંગો છો ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
@@ -2644,10 +2590,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "શું તમે ખરેખર સંપર્ક (%s)\n"
-"કાઢી નાંખવા માંગો છો?"
+"કાઢી નાંખવા માંગો છો ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
@@ -2657,105 +2603,104 @@ msgstr ""
 "શું તમે ખરેખર આ સંપર્કો\n"
 "દૂર કરવા માંગો છો?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "સરનામુ _૨:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "શહેર (_t):"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "દેશ (_y):"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "પૂરુ સરનામુ"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP કોડ:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "પૂરું નામ"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "કુમારી"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "શ્રીમાન"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "શ્રીમતિ"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Ms."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "પહેલુ (_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "છેલ્લુ (_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "વચ્ચેનું (_M):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "પ્રત્યય (_S):"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "IM ખાતુ ઉમેરો"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "ખાતાનું નામ (_A):"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_IM સેવા:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2766,61 +2711,61 @@ msgstr "જગ્યા (_L):"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 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:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "સંપર્ક યાદી સંપાદક"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "સરનામા પુસ્તિકામાંથી ઈમેઈલ સરનામાઓ દાખલ કરો"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "સભ્યો"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "યાદીમાંથી ઈ-મેઈલ સરનામું દૂર કરો"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 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:10
 msgid "_List name:"
 msgstr "યાદીનું નામ (_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 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:12
 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:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "ચોપડી"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "એ નવી યાદી છે"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "સભ્યો (_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "સંપર્ક સભ્યોની યાદી"
 
@@ -2861,18 +2806,25 @@ msgstr ""
 "આ સંપર્કનું નામ અથવા ઈ-મેઈલ સરનામું પહેલાથી જ આ\n"
 "ફોલ્ડરમાં હાજર છે. શું તમે એને કોઈપણ રીતે ઉમેરવા માંગો છો?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "કોઈ ક્ષેત્ર સમાવે છેે"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "વર્ગ છે"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "ઈ-મેઈલ આની સાથે શરુ થાય છે"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "નામ આની સાથે શરુ થાય છે"
@@ -2890,9 +2842,9 @@ 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:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "પ્રશ્ન"
 
@@ -2906,7 +2858,7 @@ msgstr "પુસ્તક દેખાવ મેળવવામાં ભૂલ
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "મોડેલ"
 
@@ -2914,104 +2866,103 @@ msgstr "મોડેલ"
 msgid "Error modifying card"
 msgstr "કાર્ડ સુધારતી વખતે ભૂલ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "સ્રોત"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "પ્રકાર"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "VCard તરીકે સંગ્રહો..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ખોલો (_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "નવો સંપર્ક (_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "નવી સંપર્ક યાદી (_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "VCard તરીકે સંગ્રહો (_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "સંપર્ક આગળ ધપાવો (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "સંપર્કો આગળ ધપાવો (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "સંપર્કને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "યાદીને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "સંપર્કોને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "છાપો (_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "સરનામા પુસ્તિકામાં નકલ કરો (_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "સરનામા પુસ્તિકામાં ખસેડો (_v)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "કાપો (_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "નકલ કરો (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "ચોંટાડો (_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "કોઈપણ વર્ગ"
 
@@ -3021,7 +2972,6 @@ msgid "Print cards"
 msgstr "કાર્ડો છાપો"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "મદદનીશ"
 
@@ -3050,7 +3000,7 @@ msgid "Car Phone"
 msgstr "ગાડીનો ફોન"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3062,7 +3012,7 @@ msgid "Company Phone"
 msgstr "સંસ્થાનો ફોન"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "ઈ-મેઈલ"
@@ -3108,22 +3058,20 @@ msgid "Journal"
 msgstr "જર્નલ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "વ્યવસ્થાપક"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "મોબાઈલ ફોન"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "ખોટું નામ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "નોંધ"
 
@@ -3132,7 +3080,7 @@ msgid "Office"
 msgstr "ઓફિસ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "સંસ્થા"
 
@@ -3165,7 +3113,6 @@ msgid "Role"
 msgstr "ભૂમિકા"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "પત્ની"
 
@@ -3196,7 +3143,7 @@ msgid "Web Site"
 msgstr "વેબ સાઈટ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3207,12 +3154,12 @@ msgstr "વેબ સાઈટ"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "પહોળાઈ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3222,12 +3169,12 @@ msgstr "પહોળાઈ"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "ઊંચાઈ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "નો ફોકસ"
 
@@ -3251,7 +3198,7 @@ msgstr "ક્ષેત્રના નામની મહત્તમ લંબ
 msgid "Column Width"
 msgstr "સ્તંભની પહોળાઈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3265,7 +3212,7 @@ msgstr ""
 "\n"
 "અથવા નવો સંપર્ક બનાવવા માટે બવડું-ક્લિક કરો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3279,7 +3226,7 @@ msgstr ""
 "\n"
 "નવો સંપર્ક બનાવવા માટે અંહિ બે વાર ક્લિક કરો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3289,7 +3236,7 @@ msgstr ""
 "\n"
 "સંપર્ક માટે શોધો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3299,143 +3246,80 @@ msgstr ""
 "\n"
 "આ દેખાવમાં જોવા માટે કોઈ વસ્તુઓ નથી."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "એડેપ્ટર"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "કામનો ઈ-મેઈલ"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "ઘરનો ઈમેઈલ"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "અન્ય ઈમેઈલ"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "પસંદ કરેલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "ને કર્સર"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "કડીને બ્રાઉઝરમાં ખોલો (_O)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "કડીની જગ્યાની નકલ કરો (_C)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "નવો સંદેશો આના પ્રતિ મોકલો (_S) ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-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:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 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:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 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:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "સભ્યોની યાદી"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "ઈ-મેઈલ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Department"
-msgstr "વિભાગ"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-msgid "Profession"
-msgstr "વ્યવસાય"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "જગ્યા"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-msgid "Video Chat"
-msgstr "વિડીયો સંવાદ"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "કેલેન્ડર"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "મુક્ત/વ્યસ્ત"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "વિડિયો મંત્રણા"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "ફોન"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "ફેક્સ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Home Page"
-msgstr "ઘર પાનું"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "કામ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Web Log"
-msgstr "વેબ લોગ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "જન્મદિવસ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "બ્લોગ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "વર્ષગાંઠ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "ખાનગી"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "કામનું શીર્ષક"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "ઘર પાનું"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
-msgid "Blog"
-msgstr "બ્લોગ"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3466,7 +3350,7 @@ msgstr "કોઈ પોતાનો સંપર્ક વ્યાખ્યા
 #. 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "પરવાનગી નથી"
 
@@ -3491,7 +3375,7 @@ msgstr "પ્રોટોકોલને આધાર નથી"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "નકારાઈ ગયું"
 
@@ -3622,7 +3506,7 @@ 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:695
 msgid "Error adding contact"
 msgstr "સંપર્ક ઉમેરવામાં ભૂલ"
 
@@ -3639,7 +3523,7 @@ 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:650
 msgid "Error removing contact"
 msgstr "સંપર્ક કાઢી નાંખવામાં ભૂલ"
 
@@ -3658,7 +3542,7 @@ msgstr[1] ""
 "%d સંપર્કો ખોલવાનું %d નવી વિન્ડો ખોલવા જેવું જ છે.\n"
 "શું તમે ખરેખર આમાંના બધા સંપર્કો જોવા માંગો છો?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3667,69 +3551,69 @@ msgstr ""
 "%s પહેલાથી જ હાજર છે\n"
 "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "સંપર્ક"
 msgstr[1] "સંપર્કો"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 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:756
 msgid "Move contact to"
 msgstr "ને સંપર્ક ખસેડો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "સંપર્કની નકલ અંહિ કરો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "સંપર્કોને અંહિ ખસેડો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "સંપર્કોની નકલ અંહિ કરો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "ઘણાબધા VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "%s માટે VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "સંપર્ક જાણકારી"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s માટે સંપર્ક જાણકારી"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "સરનામાપોથીને પ્રશ્ન પૂછી રહ્યા છીએ..."
 
@@ -3819,12 +3703,12 @@ msgstr "ઈવોલ્યુશન VCard આયાત કરનાર"
 msgid "Print envelope"
 msgstr "કવર છાપો"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "સંપર્કો છાપો"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "સંપર્ક છાપો"
 
@@ -3873,7 +3757,7 @@ msgstr "બંધારણ"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "હેડર"
@@ -3977,7 +3861,7 @@ msgstr "છાયા"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4190,17 +4074,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "શું તમે ખરેખર આ મુલાકાત કાઢી નાંખવા માંગો છો?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "શું તમે ખરેખર આ જર્નલ પ્રવેશ કાઢી નાંખવા માંગો છો?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "શું તમે ખરેખર આ મંત્રણા કાઢી નાંખવા માંગો છો?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "શું તમે ખરેખર આ બાબત કાઢી નાંખવા માંગો છો?"
 
@@ -4317,17 +4198,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ઈવોલ્યુશન કેલેન્ડરમાંથી અનિચ્છનિય રીતે બહાર નીકળી ગયા."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "ઈવોલ્યુશન મેમો અનિચ્છનીય રીતે બંધ થઈ ગયું."
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ઈવોલ્યુશન બાબતો અનિચ્છનિય રીતે બહાર નીકળી ગઈ."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "કેલેન્ડર એ ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી."
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "તમે પસંદ કરેલ કેલેન્ડર માત્ર વાંચી શકાય તેવું જ છે"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "મેમો યાદી ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી"
@@ -4394,61 +4275,49 @@ 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
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "તમે આ મુલાકાત બદલી નાંખી છે, પરંતુ હજુ સંગ્રહી નથી."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr "તમે આ બાબતમાં ફેરફારો કર્યા છે, પરંતુ હજુ સંગ્રહ્યા નથી."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "તમે આ મેમોમાં ફેરફારો કર્યા છે, પરંતુ તેમને હજુ સુધી સંગ્રહ્યા નથી."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "તમારા કેલેન્ડરો જ્યાં સુધી ઈવોલ્યુશન ફરીથી ચાલુ નહિં થાય ત્યાં સુધી ઉપલબ્ધ નહિં હોય."
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "તમારા મેમો ઈવોલ્યુશન પુનઃશરૂ થાય નહિં ત્યાં સુધી ઉપલબ્ધ રહેશે નહિં."
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "જ્યાં સુધી ઈવોલ્યુશન ફરીથી ચાલુ નહિં થાય ત્યાં સુધી તમારી બાબતો ઉપલબ્ધ નહિં હોય."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "ફેરફારો અવગણો (_D)"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "સંગ્રહો (_S)"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 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:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "મોકલો (_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "સૂચન મોકલો (_S)"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
@@ -4465,8 +4334,8 @@ msgstr "ઘણા બધા દિવસોની બાબતો છુટી �
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "ઈવોલ્યુશન-માહિતી-સર્વર ચાલુ કરી શકાયુ નહિં"
 
@@ -4500,12 +4369,12 @@ 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:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "કેલેન્ડર અને બાબતો"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "કેલેન્ડરો"
 
@@ -4546,21 +4415,21 @@ 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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "મેમો"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "બાબતો"
@@ -4578,16 +4447,16 @@ msgstr "બાબતો (_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ઈવોલ્યુશન કેલેન્ડર એલાર્મ સૂચન સેવા"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "મિનિટ"
 msgstr[1] "મિનિટો"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4596,7 +4465,7 @@ msgid_plural "hours"
 msgstr[0] "કલાકો"
 msgstr[1] "કલાકો"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "શરૂઆતનો સમય"
 
@@ -4607,10 +4476,10 @@ msgstr "મુલાકાતો"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "સ્થળ:"
 
@@ -4620,16 +4489,16 @@ 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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "ફેરફાર કરો (_E)"
 
@@ -4641,31 +4510,32 @@ msgstr "પુનરાવર્તન (_S)"
 msgid "location of appointment"
 msgstr "મુલાકાતનું સ્થાન"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "કોઈ સાર ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "કોઈ વર્ણન ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "કોઈ જગ્યા જાણકારી ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "તમારી પાસે %d એલાર્મો છે"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "ચેતવણી"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4677,7 +4547,7 @@ msgstr ""
 "ઈ-મેઈલ મોકલવા સાથે રુપરેખાંકિત થયો નથી. ઈવોલ્યુશન\n"
 "સામાન્ય રીમાઈન્ડર સાથે સંવાદ બોક્સ પ્રદર્શિત થશે."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4694,7 +4564,7 @@ msgstr ""
 "\n"
 "શું તમે ખરેખર આ કાર્યક્રમ ચલાવવા માંગો છો?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "મને આ કાર્યક્રમ વિશે ફરીથી પૂછશો નહિં."
 
@@ -4794,102 +4664,90 @@ msgid "Default reminder value"
 msgstr "મૂળભુત યાદ અપાવનાર કિંમતો"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "ઘટના ઢાળ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "ઘટના પારદર્શકતા"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "મુક્ત/વ્યસ્ત સર્વર URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "મુક્ત/વ્યસ્ત ટેમ્પલેટ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "કેલેન્ડર દૃશ્યમાં ઘટનાઓનો ઢાળ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "પછી પૂર્ણ થયેલ બાબતો છુપાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "બાબત એકમો છુપાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "બાબત કિંમત છુપાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "આડી તકતીની સ્થિતિ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "કામ કરવાના દિવસનો અંત થાય તે કલાક, ચોવીસ કલાકના બંધારણમાં, ૦ થી ૨૩."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્યારનો કલાક, ચોવીસ કલાકના બંધારણમાં, ૦ થી ૨૩."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "દિવસ અને કામના અઠવાડિયા દેખાવોમાં બતાવાયેલ અંતરાલો, મિનિટોમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "છેલ્લો એલાર્મ સમય"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "મુક્ત/વ્યસ્ત પ્રકાશનો માટેની સર્વર URL ની યાદી"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "માર્કસ બેઈન્સ લીટી"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "માર્કસ બેઈન્સ લીટી રંગ - દિવસ દેખાવ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "માર્કસ બેઈન્સ લીટી રંગ - ટાઈમ બાર"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "કામ કરવાનો દિવસ અંત થાય ત્યારની મિનિટ, ૦ થી ૫૯."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્યારની મિનિટ, ૦ થી ૫૯"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "આડી તકતીની સ્થિતિમાં મહિનાનો દેખાવ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "ઊભી તકતીની સ્થિતિમાં મહિનાનો દેખાવ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "મૂળભૂત યાદ અપાવનાર માટે નક્કી કરવાના એકમોની સંખ્યા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "ક્યારે બાબતો છુપાવવી તે નક્કી કરવા માટેના એકમોની સંખ્યા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "પછીની બાબતોનો રંગ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4897,7 +4755,7 @@ msgstr ""
 "આડી તકતીની સ્થિતિ, તારીખ શોધક કેલેન્ડર અને બાબત યાદીની વચ્ચે જ્યારે મહિના દેખાવમાં ના "
 "હોય ત્યારે, પિક્સેલમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4905,19 +4763,13 @@ msgstr ""
 "આડી તકતીની સ્થિતિ, દેખાવ અને તારીખ શોધક કેલેન્ડર અને બાબત યાદીની વચ્ચે મહિના દેખાવમાં, "
 "પિક્સેલમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-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.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "ઊભી તકતીની સ્થિતિ, બાબત યાદી અને બાબત પૂર્વદર્શન તકતીની વચ્ચે, પિક્સેલોમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4925,7 +4777,7 @@ msgstr ""
 "ઊભી તકતીની સ્થિતિ, દેખાવ અને તારીખ શોધક કેલેન્ડર અને બાબત યાદીના વચ્ચે મહિના દેખાવમાં, "
 "પિક્સેલમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4933,65 +4785,65 @@ msgstr ""
 "ઊભી તકતીનું સ્થાન, દેખાવ અને તારીખ શોધક કેલેન્ડર અને બાબત યાદીની વચ્ચે જ્યારે મહિના "
 "દેખાવમાં નહિં હોય, પિક્સેલમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "કાર્યક્રમો કે જે એલાર્મો દ્વારા ચલાવવા માટે પરવાનગી અપાયેલ છે."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં RSVP ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં ભૂમિકા ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "અઠવાડિયા અને મહિના દેખાવોમાં મુલાકાત અંત સમયો બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં વર્ગો ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "સૂચન ટ્રેમાં ડિસ્પ્લે એલાર્મો બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં પરિસ્થિતિ ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"પૂર્વદર્શન\" તકતી બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"પૂર્વદર્શન\" તકતી બતાવો."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં ટાઈમઝોન ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં લખો ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "તારીખ શોધકમાં અઠવાડિયા નંબરો બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "આજ સુધીની બાબતો રંગ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "બાબતો ઊભી તકતીની સ્થિતિ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5000,7 +4852,7 @@ msgstr ""
 "મુક્ત/વ્યસ્ત માહિતી ફોલબેક તરીકે વાપરવાની URL ટેમ્પલેટ, %u એ મેઈલ સરનામાના વપરાશકર્તા "
 "ભાગથી બદલાઈ જશે અને %d એ ડોમેઈન દ્વારા બદલાઈ જશે."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5008,57 +4860,51 @@ msgstr ""
 "કેલેન્ડરમાં તારીખો અને સમયો માટે વાપરવાનો મૂળભુત ટાઈમઝોન, \"અમેરિકા/ન્યુ યોર્ક\" જેવી "
 "જગ્યા જેવી બિનભાષાંતરિક ઓલ્સન ટાઈમઝોન ડેટાબેઝની જેમ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "સમયની વહેંચણી"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "છેલ્લે એલાર્મ ચાલ્યું ત્યારનો સમય, time_t માં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "ટાઈમઝોન"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-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:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "ચોવીસ કલાક સમય બંધારણ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "મૂળભુત યાદ અપાવનાર માટેના એકમો, \"મિનિટો\", \"કલાકો\" અથવા \"દિવસો\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "ક્યારે બાબતો છુપાવવી તે નક્કી કરવાનો એકમ, \"મિનિટો\", \"કલાકો\" અથવા \"દિવસો\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "અઠવાડિયાની શરૂઆત"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "અઠવાડિયું શરૂ થાય તે દિવસ, રવિવાર (૦) થી શનિવાર (૬)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "પ્રદર્શિત એલાર્મો માટે શું સૂચક ટ્રે વાપરવી કે નહિં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "જ્યારે મુલાકાત અથવા બાબત કાઢી રહ્યા હોય ત્યારે શું ખાતરી માટે પૂછવું."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "જ્યારે મુલાકાતો અને બાબતો સંપૂર્ણપણે દૂર કરી રહ્યા હોય ત્યારે શું ખાતરી માટે પૂછવું."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5066,82 +4912,74 @@ msgstr ""
 "શું મહિના દેખાવમાં અઠવાડિયાના અંતિમ દિવસો સંકોચવા, કે જે શનિવાર અને રવિવારને એક દિવસની "
 "જગ્યામાં મૂકે."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "શું અઠવાડિયા અને મહિના દેખાવોમાં ઘટનાઓના સમય પ્રદર્શિત કરવા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "શું માર્કસ બેઈન્સ લીટી (વર્તમાન સમયમાં લીટી) કેલેન્ડરમાં દોરવી."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "બાબતોના દેખાવમાં શું પૂર્ણ થયેલ બાબતો છુપાવવી."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "શું મુલાકાતો માટે મૂળભુત યાદ અપાવનાર સુયોજિત કરવું."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં RSVP ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "શું ઘટના/મંત્રણા સંપાદકમાં વર્ગો ક્ષેત્ર બતાવવું"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં ભૂમિકા ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં પરિસ્થિતિ ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "શું સમયને am/pm ની જગ્યાએ ચોવીસ કલાકના બંધારણમાં બતાવવા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં ટાઈમઝોન ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં પ્રકાર ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "શું તારીખ શોધકમાં અઠવાડિયા નંબરો બતાવવા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "કામ કરવાના દિવસો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "કામ કરવાનો દિવસ અંત થાય ત્યારનો કલાક"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "કામ કરવાનો દિવસ અંત થાય ત્યારની મિનિટ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્યારનો કલાક"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્યારની મિનિટ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "દિવસીય બચાવ સમય"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "સાર સમાવે છે"
@@ -5150,25 +4988,39 @@ msgstr "સાર સમાવે છે"
 msgid "Description contains"
 msgstr "વર્ણન સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "ટિપ્પળી સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "સ્થાન સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "બંધબેસતા નથી"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "છાપો"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "કેલેન્ડર"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5184,10 +5036,10 @@ msgstr "ના કરતાં જૂની ઘટનાઓ કાઢો"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "દિવસો"
 
@@ -5195,89 +5047,89 @@ msgstr "દિવસો"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "વેબ પર"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "જન્મદિવસો અને સાલગીરીઓ"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "હવામાન"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "નવું કેલેન્ડર (_N)"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "કેલેન્ડરો સુધારવામાં નિષ્ફળ."
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે કેલેન્ડર '%s' ખોલવા માટે અસમર્થ"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ત્યાં ઘટનાઓ અને મંત્રણાઓ બનાવવા ામટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "કેલેન્ડર સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "નવી મુલાકાત"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "મુલાકાત (_A)"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "નવી મુલાકાત બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "નવી મંત્રણા"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "મંત્રણા (_e)"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "નવી મંત્રણા મંજૂરી બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "નવી બધા દિવસની મુલાકાત"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "બધા દિવસની મુલાકાત (_p)"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "નવી બધા દિવસની મુલાકાત બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "નવું કેલેન્ડર"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "કેલેન્ડર (_n)"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "નવું કેલેન્ડર બનાવો"
 
@@ -5309,11 +5161,11 @@ msgstr "કેલેન્ડર ખોલતી વખતે પદ્ધતિ
 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:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "અજ્ઞાત ભૂલ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "એલાર્મમાં ફેરફાર કરો"
 
@@ -5429,25 +5281,54 @@ msgid "A_dd"
 msgstr "ઉમેરો (_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "એલાર્મ"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "જોડાણનું આપોઆપ પ્રદર્શન સૂચવો (_S)"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "જોડાણનું આપોઆપ પ્રદર્શન સૂચવો"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "ફાઈલો જોડો"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "જોડાણના ગુણધર્મો"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "વર્ણન:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "File name:"
+msgstr "ફાઈલનું નામ:"
+
+#: ../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 પ્રકાર:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "એલાર્મ માટે પસંદ કરેલ કેલેન્ડરો"
 
@@ -5470,7 +5351,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:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">ચેતવણીઓ</span>"
 
@@ -5479,7 +5360,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:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">સામાન્ય</span>"
@@ -5496,25 +5377,27 @@ msgstr "<span weight=\"bold\">સમય</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">કામનું અઠવાડિયું</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "દિવસીય બચાવ સમય માટે સંતુલન (_v)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "દિવસ અંત થાય છે (_e):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "ડિસ્પ્લે"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "મુક્ત/વ્યસ્ત"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "શુક્રવાર"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5524,13 +5407,13 @@ msgstr ""
 "કલાકો\n"
 "દિવસો"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "સોમવાર"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5548,225 +5431,219 @@ msgstr ""
 "શનિવાર\n"
 "રવિવાર"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "રંગ પસંદ કરો"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "સુર્ય (_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "શનિવાર"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "એલાર્મ સૂચનો માટે કેલેન્ડરો પસંદ કરો"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "રીમાઈન્ડર બતાવો (_o)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "તારીખ બતાવનારમાં અઠવાડિયાનો ક્રમાંક બતાવો (_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "રવિવાર"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "આજ સુધીની બાબતો (_a):"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "ગુરુ (_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "ટેમ્પલેટ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "ગુરુવાર"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "ટાઈમ ઝોન (_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "સમયનું બંધારણ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "મંગળવાર"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "બુધવાર"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "અઠવાડિયું આ દિવસે શરૂ થાય છે (_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "કામ કરવાના દિવસો:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 કલાક (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 કલાક"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "વસ્તુઓ કાઢી નાખતી વખતે ખાતરી માટે પૂછો (_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "મહિનાના દેખાવમાં અઠવાડિયાના અંતે સંકોચો (_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "દિવસ શરુ થાય છે (_D):"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "શુક્ર (_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "પછી પૂર્ણ થયેલ બાબતો છુપાવો (_H)"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "સોમ (_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "પછીની બાબતો (_O):"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "શનિ (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "અઠવાડિયા અને મહિના દેખાવમાં મુલાકાતના અંત સમયો બતાવો (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "સમયની વહેંચણી (_T):"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "મંગળ (_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "બુધ (_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "દરેક મુલાકાત પહેલા"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "ઓફલાઈન પ્રક્રિયા માટે કેલેન્ડરના સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "ઓફલાઈન ક્રિયા માટે કેલેન્ડરના સમાવિષ્ટોની નકલ કરો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "ઓફલાઈન પ્રક્રિયા માટે બાબત યાદી સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "ઓફલાઈન પ્રક્રિયાઓ માટે યાદીના સમાવિષ્ટો સ્થાનીકપણે નકલ કરો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "ઓફલાઈન પ્રક્રિયા માટે મેમો યાદી સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "ઓફલાઈન પ્રક્રિયા માટે મેમો યાદી સમાવિષ્ટોની સ્થાનિકપણે નકલ કરો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "રંગ (_o):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
-msgstr "બાબત યાદી"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
+msgstr "બાબતોની યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memo List"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
 msgstr "મેમો યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "કેલેન્ડર ગુણધર્મો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "નવું કેલેન્ડર"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "બાબત યાદી ગુણધર્મો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "નવી મેમો યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "કેલેન્ડર ઉમેરો"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "બાબત યાદી ઉમેરો"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "કેલેન્ડર ઉમેરો (_A)"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "બાબત યાદી ઉમેરો (_A)"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "ફરીથી તાજુ કરો (_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5821,49 +5698,49 @@ msgstr "%s  તમે કોઈ ફેરફારો કર્યા નથી,
 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:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " પ્રતિ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (પૂર્ણ થયું "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "પૂર્ણ થયું "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (કારણે "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "કારણે "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "જોડાણ સંદેશો - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "જોડાયેલ સંદેશો"
 msgstr[1] "%d જોડાયેલ સંદેશાઓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "ખસેડો (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "ખેંચવાનું રદ કરો (_D)"
 
@@ -5871,7 +5748,7 @@ msgstr "ખેંચવાનું રદ કરો (_D)"
 msgid "Could not update object"
 msgstr "ઓબ્જેક્ટ સુધારી શક્યા નથી"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5883,96 +5760,97 @@ msgid "Hide Attachment _Bar"
 msgstr "જોડાણ પટ્ટી છુપાવો (_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "જોડાણ પટ્ટી બતાવો (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "દૂર કરો (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "ગુણધર્મો (_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "જોડાણ ઉમેરો (_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "જોડાણો બતાવો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "જોડાણ પટ્ટી બદલવા માટે સ્પેસ કી દબાવો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "મુલાકાતમાં ફેરફાર કરો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "મંત્રણા - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "મુલાકાત - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "સોંપાયેલ બાબત - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "બાબત - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "જર્નલ પ્રવેશ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "કોઈ સાર નથી"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "જોડાણ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "આ વસ્તુમાં કરેલા ફેરફારો રદ કરાશે જો સુધારો થાય તો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "વર્તમાન આવૃત્તિ વાપરવા માટે અસમર્થ!"
 
@@ -5988,10 +5866,6 @@ msgstr "અંતિમ મુકામ ખોલી શક્યા નથી"
 msgid "Destination is read only"
 msgstr "અંતિમ મુકામ માત્ર વાંચી શકાય તેવું છે"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "શું બાકીના બધા મેળવનારાઓના મેઈલબોક્સમાંથી આ વસ્તુને કાઢી નાંખવી છે (_D)?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે ઘટના કાઢી શકાય નહિં"
@@ -6053,128 +5927,139 @@ msgstr "ને ડિલિગેટ:"
 msgid "Enter Delegate"
 msgstr "ડિલિગેટ દાખલ કરો"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "મુલાકાત (_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "વળતર"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "આ ઘટનાને એલાર્મો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "કેલેન્ડર (_n):"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../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:916
 msgid "_Delegatees"
 msgstr "પ્રતિનિધિઓ (_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "સભાજનો (_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "શરુઆતની તારીખ વગરની ઘટના"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "અંતિમ તારીખ વગરની ઘટના"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "શરુઆતની તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "અંતિમ તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "શરુઆતનો સમય ખોટો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "અંતિમ સમય ખોટો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "પસંદ થયેલ આયોજકને લાંબા સમય સુધી ખાતુ મળશે નહિં."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "આયોજક જરુરી છે."
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "ઓછામાં ઓછો એક સભા ભરનાર તો હોવો જ જોઈએ."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "ઉમેરો (_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "કેલેન્ડર '%s' ખોલી શકાય એમ નથી."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "મુલાકાત પહેલાનો %d દિવસ"
 msgstr[1] "મુલાકાત પહેલાના %d દિવસો "
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "મુલાકાત પહેલાનો %d કલાક"
 msgstr[1] "મુલાકાત પહેલાના %d કલાકો"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "મુલાકાત પહેલાની %d મિનિટ"
 msgstr[1] "મુલાકાત પહેલાની %d મિનિટો"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "વૈવિધ્યપૂર્ણ"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "કંઈ નહિં"
 
@@ -6191,33 +6076,38 @@ msgid "15 minutes before appointment"
 msgstr "મુલાકાત પહેલાની ૧૫ મીનિટો"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "સભાજનો (_s)..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "સભાજનો (_n)..."
 
 #: ../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
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "કસ્ટમ એલાર્મ:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "વર્ણન (_e):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "ઘટના વર્ણન"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "સ્થળ (_i):"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "સાર (_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "એલાર્મ (_A)"
 
@@ -6239,6 +6129,14 @@ msgstr "ના માટે"
 msgid "until"
 msgstr "ત્યાં સુધી નહિં"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "પ્રતિનિધિઓ (_g)"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "તરફથી:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6285,7 +6183,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "સ્થિતિ"
 
@@ -6306,81 +6204,62 @@ msgid "Organizer"
 msgstr "આયોજક"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "આયોજક:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "મેમો"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' માં મેમો ખોલવામાં અસમર્થ."
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-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/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "જૂથ (_G):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "મેમો સમાવિષ્ટ (_M):"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>કેલેન્ડર વિકલ્પો</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "નવું કેલેન્ડર ઉમેરો"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "કેલેન્ડર જૂથ"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "કેલેન્ડરની જગ્યા"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "કેલેન્ડરનું નામ"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>બાબતોની યાદી વિકલ્પો</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "નવી બાબતોની યાદી ઉમેરો"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "બાબતોની યાદીનું જૂથ"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "બાબતોની યાદીનું નામ"
 
@@ -6525,7 +6404,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>"
 
@@ -6590,15 +6469,15 @@ msgstr "<span weight=\"bold\">સ્થિતિ</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "સમાપ્ત"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "ઊંચુ"
 
@@ -6607,20 +6486,20 @@ msgstr "ઊંચુ"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "પ્રગતિમાં છે"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "નીચું"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "સામાન્ય"
 
@@ -6628,7 +6507,7 @@ msgstr "સામાન્ય"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "શરુ થયું નથી"
 
@@ -6641,7 +6520,7 @@ 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:389
 msgid "Undefined"
 msgstr "વ્યાખ્યાયિત નથી"
 
@@ -6650,7 +6529,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:31
 msgid "_Priority:"
 msgstr "પ્રાધાન્ય (_P):"
 
@@ -6658,12 +6537,12 @@ msgstr "પ્રાધાન્ય (_P):"
 msgid "_Web Page:"
 msgstr "વેબ પાનું (_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "બાબત (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "ક્રિયા વિગતો"
 
@@ -6676,10 +6555,6 @@ msgstr "નક્કી થયેલ તારીખ ખોટી છે"
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' માં બાબતો ખોલવા સમર્થ નથી."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "સભાજનો (_n)..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "વર્ગો (_i)..."
@@ -6688,6 +6563,10 @@ msgstr "વર્ગો (_i)..."
 msgid "Or_ganiser:"
 msgstr "આયોજક (_g):"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "શરુઆતની તારીખ (_r):"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "ટાઈમ ઝોન:"
@@ -6696,46 +6575,46 @@ msgstr "ટાઈમ ઝોન:"
 msgid "_Due date:"
 msgstr "પહેલાની તારીખ (_D):"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>મુક્ત/વ્યસ્ત કેલેન્ડરો (_a)</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>પ્રકાશન આવૃત્તિ</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>પ્રકાશન જગ્યા (_L)</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "મુક્ત/વ્યસ્ત પ્રકાશન સુયોજનો"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "દરરોજ (_D)"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "મદદપત્રિકા (_M)"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "પાસવર્ડ (_P):"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "પાસવર્ડ યાદ રાખો (_R)"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "વપરાશકર્તા નામ (_U):"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "અઠવાડિયે (_W)"
 
@@ -6816,42 +6695,35 @@ 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:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, 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
-msgid "Untitled"
-msgstr "શીર્ષક વગરનું"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+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
-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
-msgid "Description:"
-msgstr "વર્ણન:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "વેબ પાનું:"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "શીર્ષક વગરનું"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "સાર:"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "શરુઆતની તારીખ:"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "પહેલાની તારીખ:"
@@ -6861,7 +6733,7 @@ msgstr "પહેલાની તારીખ:"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "સ્થિતિ:"
 
@@ -6870,17 +6742,17 @@ 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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "જાહેર"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "ખાનગી"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "વિશ્વાસજનક"
 
@@ -6889,25 +6761,24 @@ msgid "End Date"
 msgstr "અંતિમ તારીખ"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "શરુઆતની તારીખ"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "સાર"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "વ્યસ્ત"
 
@@ -6921,17 +6792,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "હા"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ના"
@@ -6942,21 +6813,21 @@ msgstr "ના"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "વળતર"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "સોંપેલ"
 
@@ -6964,7 +6835,7 @@ msgstr "સોંપેલ"
 msgid "Save As..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "પસંદિત જોડાણો સંગ્રહવા માટે ફોલ્ડર પસંદ કરો..."
 
@@ -6973,9 +6844,9 @@ msgstr "પસંદિત જોડાણો સંગ્રહવા માટ
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "આ રીતે સંગ્રહો (_S)..."
 
@@ -6993,79 +6864,74 @@ msgstr "પસંદ કરેલ સંગ્રહો (_S)"
 msgid "Open in %s..."
 msgstr "%s માં ખોલો..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "૦%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "૧૦%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "૨૦%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "૩૦%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "૪૦%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "૫૦%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "૬૦%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "૭૦%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "૮૦%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "૯૦%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "૧૦૦%"
 
-#: ../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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "પસંદ કરેલા ઓબ્જેક્ટો કાઢી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "ઓબ્જેક્ટો સુધારી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-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:1175 ../calendar/gui/e-memo-table.c:853
 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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7073,52 +6939,44 @@ msgstr "વેબ પાનું ખોલો (_W)"
 msgid "_Print..."
 msgstr "છાપો (_P)..."
 
-#: ../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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "કાપો (_u)"
 
-#: ../calendar/gui/e-calendar-table.c: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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ચોંટાડો (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "બાબત સોંપો (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar તરીકે આગળ ધપાવો (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "પૂર્ણ થયેલ હોય એમ ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "પસંદ કરેલ બાબતોને પૂર્ણ થયેલ હોય એમ ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "અપૂર્ણ તરીકે ચિહ્નિત કરો (_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "પસંદ કરેલ ક્રિયાઓને અપૂર્ણ તરીકે ચિહ્નિત કરો (_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "પસંદ કરેલ બાબતોને કાઢી નાંખો (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "બાબત ઉમેરવા માટે ક્લિક કરો"
@@ -7128,7 +6986,7 @@ msgstr "બાબત ઉમેરવા માટે ક્લિક કરો"
 msgid "% Complete"
 msgstr "% પૂરુ થયું"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "પૂર્ણ"
 
@@ -7153,101 +7011,105 @@ msgstr "શરુઆતની તારીખ"
 msgid "Task sort"
 msgstr "બાબતો ક્રમમાં ગોઠવો"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "વસ્તુઓ ખસેડી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "વસ્તુઓની નકલ કરી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "નવી મુલાકાત (_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "નવી બધા દિવસની ઘટના (_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "નવી મંત્રણા (_M)"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "નવી બાબત (_T)"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "વર્તમાન દેખાવ (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "આજનો દિવસ પસંદ કરો (_d)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "તારીખ પસંદ કરો (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "કેલેન્ડરમાં નકલ કરો (_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "કેલેન્ડરમાં ખસેડો (_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "પ્રતિનિધી મંત્રણા (_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "સમયક્રમ મંત્રણા (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar તરીકે આગળ ધપાવો (_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "પ્રત્યુત્તર (_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "બધાને વળતો જવાબ આપો (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "આ વારાને ખસેડાય તેવો બનાવો (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "આ વારો કાઢી નાંખો (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "બધા વારાઓ કાઢી નાંખો (_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "આયોજક: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "આયોજક: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "સ્થળ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "સમય: %s %s"
@@ -7277,7 +7139,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i મિનિટ ભાગલાઓ"
@@ -7288,22 +7150,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:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "સવાર"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "સાંજ"
 
@@ -7395,12 +7255,10 @@ msgstr "iCalendar ભૂલ"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "અજ્ઞાત વ્યક્તિ"
 
@@ -7413,22 +7271,22 @@ msgstr "<br> મહેરબાની કરીને નીચેની જા�
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "સ્વીકારાયેલ"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "ભાર મૂકીને સ્વીકારાયેલ છે"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "નકારાયેલ છે"
 
@@ -7644,7 +7502,7 @@ msgid "Attendee status updated\n"
 msgstr "સભાસદની સ્થિતિ સુધારાઈ ગઈ\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "સભાસદની સ્થિતિ સુધારી શકાશે નહિં કારણકે વસ્તુ લાંબો સમય સુધી અસ્તિત્વમાં રહેવાની નથી"
 
@@ -7691,35 +7549,48 @@ msgid "Send Latest Information"
 msgstr "તાજી જાણકારી મોકલો"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "રદ કરો"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--પ્રતિ--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "કેલેન્ડર સંદેશો"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "તારીખ:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "કેલેન્ડર લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "કેલેન્ડર લાવી રહ્યા છીએ..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "સર્વર સંદેશો:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "તારીખ-અંત"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "તારીખ-ેશરુ"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "સભામંત્રી"
@@ -7738,65 +7609,65 @@ msgid "Resources"
 msgstr "સ્રોતો"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "અંગત"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "જૂથ"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "સ્રોત"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "ખંડ"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "ખુરશી"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "જરુરી સ્પર્ધક"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "વૈકલ્પિક સ્પર્ધક"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "સ્પર્ધક નથી"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "ક્રિયા જરુરી છે"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "જરુરી"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "ડિલિગેટ થયેલ"
 
@@ -7805,14 +7676,14 @@ msgstr "ડિલિગેટ થયેલ"
 msgid "Attendee                          "
 msgstr "સભાજન                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "પ્રગતિમાં"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7820,86 +7691,86 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "ઓફિસની બહાર"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "કોઈ જાણકારી નથી"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "સભાજનો (_t)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "વિકલ્પો (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "માત્ર કામ કરવાના કલાકો બતાવો (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "નાનું કરેલ બતાવો (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "સુધારો મુક્ત/વ્યસ્ત (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "આપોઆપ લઈ લો (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "બધા લોકો અને સ્રોતો (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "બધા લોકો અને એક સ્રોત (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "જરુરી લોકો (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "જરુરી લોકો અને એક સ્રોત (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "શરુઆતનો સમય (_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "અંતિમ સમય (_E):"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 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:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "મેમો ઉમેરવા માટે ક્લિક કરો"
 
@@ -7907,8 +7778,8 @@ msgstr "મેમો ઉમેરવા માટે ક્લિક કરો"
 msgid "Memo sort"
 msgstr "મેમો ક્રમમાં ગોઠવો"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7926,7 +7797,7 @@ msgstr "મેમો લાવી રહ્યા છીએ"
 msgid "Opening memos at %s"
 msgstr "%s આગળ મેમો ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "પસંદ કરેલ ઓબ્જેક્ટો કાઢી રહ્યા છીએ..."
 
@@ -7935,72 +7806,66 @@ msgstr "પસંદ કરેલ ઓબ્જેક્ટો કાઢી ર�
 msgid "Enter the password for %s"
 msgstr "%s માટે પાસવર્ડ દાખલ કરો"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "બાબતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s તરફ બાબતો ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "બાબતો પૂર્ણ કરી રહ્યા છીએ..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "અર્થ કાઢી રહ્યા છીએ"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "ટાઈમઝોન પસંદ કરો"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "પ્રશ્ન સુધારી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "વૈવિધ્યપૂર્ણ દેખાવ (_C)"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "વૈવિધ્યપૂર્ણ દેખાવ સંગ્રહો (_S)"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "દેખાવો વ્યાખ્યાયિત કરો (_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s તરફ મુલાકાતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s તરફ બાબતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, c-format
-msgid "Loading memos at %s"
-msgstr "%s આગળ મેમો લાવી રહ્યા છીએ"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "%s ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "ભેગું કરી રહ્યા છીએ"
 
@@ -8114,18 +7979,31 @@ msgstr "iCalendar જાણકારી"
 msgid "You must be an attendee of the event."
 msgstr "તમે ઘટનાના સભાસદ હોવા જ જોઈએ."
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "નવી મેમો યાદી (_N)"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "નકલ કરો"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "કાઢી નાખો"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "ગુણધર્મો..."
+
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d મેમો"
 msgstr[1] "%d મેમો"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8133,56 +8011,44 @@ msgid_plural ", %d selected"
 msgstr[0] ", %d પસંદ થયેલ"
 msgstr[1] ", %d પસંદ થયેલ"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "મેમો સુધારવામાં નિષ્ફળ."
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે મેમો યાદી '%s' ખોલવામાં અસમર્થ"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "મેમો બનાવવા માટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "મેમો સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "નવી મેમો"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
-msgstr "મેમો (_o)"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr "મેમો (_M)"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "નવી મેમો બનાવો"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "નવો વહેંચાયેલ મેમો"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "વહેંચાયેલ મેમો (_S)"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "વહેંચાયેલ નવો મેમો બનાવો"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "નવી મેમો યાદી"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
-msgstr "મેમો યાદી (_s)"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
+msgstr "મેમો યાદી (_i)"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "નવી મેમો યાદી બનાવો"
 
@@ -8229,240 +8095,240 @@ msgstr "કેલેન્ડર `%s' ને ફેરવવામાં અસ�
 msgid "Unable to migrate tasks `%s'"
 msgstr "બાબતો `%s' ફેરવવામાં અસમર્થ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "પહેલુ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "બીજુ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "ત્રીજુ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "ચોથુ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "પાંચમુ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "છઠ્ઠુ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "સાતમુ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "આઠમુ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "નવમુ"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "દસમુ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "અગિયારમુ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "બારમુ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "તેરમુ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "ચૌદમુ"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "પંદરમુ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "સોળમુ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "સત્તરમુ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "અઢારમુ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "ઓગણીસમુ"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "વીસમુ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "એકવીસમુ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "બાવીસમુ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "ત્રેવીસમુ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "ચોવીસમુ"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "પચ્ચીસમુ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "છવ્વીસમુ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "સત્તાવીસમુ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "અટ્ઠાવીસમુ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "ઓગણત્રીસમુ"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "ત્રીસમુ"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "એકત્રીસમુ"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "રવિ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "સોમ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "મંગળ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "બુધ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "ગુરુ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "શુક્ર"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "શનિ"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "પસંદ કરેલ દિવસ (%a %b %d %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "પસંદ કરેલ અઠવાડિયુ (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "પસંદ કરેલ મહિનો (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "પસંદ કરેલ વર્ષ (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "મુલાકાત"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "બાબત"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "સાર: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "સ્થિતિ: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "પ્રાધાન્ય: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "પૂર્ણ થયેલ ટકા: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "વર્ગો: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 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
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "છાપનનું પૂર્વદર્શન"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "વસ્તુ છાપો"
 
@@ -8519,14 +8385,14 @@ msgid "New task list"
 msgstr "નવી બાબત યાદી"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
-msgstr "બાબત યાદી (_k)"
+msgid "Task l_ist"
+msgstr "બાબત યાદી (_i)"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "નવી બાબત યાદી બનાવો"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8538,11 +8404,11 @@ msgstr ""
 "\n"
 "શું ખરેખર આ બાબતો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "મને ફરી વાર પૂછશો નહિં."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "બાબતો છાપો"
 
@@ -9118,7 +8984,7 @@ msgid "America/Nassau"
 msgstr "અમેરિકા/નાસાઉ"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "અમેરિકા/ન્યુ યોર્ક (_Y)"
 
@@ -10137,7 +10003,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "જોડાણ પટ્ટી"
 
@@ -10145,43 +10011,28 @@ msgstr "જોડાણ પટ્ટી"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ફાઈલ %s જોડી શકતા નથી: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ફાઈલ %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 "MIME પ્રકાર:"
-
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "અંતિમ મુકામ મોકલી રહ્યા છીએ"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "સંદેશાઓ મોકલવા માટે ફોલ્ડર પસંદ કરો."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "સરનામાપોથી માટે અંહિ ક્લિક કરો"
 
@@ -10192,45 +10043,45 @@ msgstr "સરનામાપોથી માટે અંહિ ક્લિક
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "પ્રતિ-પ્રત્યુત્તર આપો (_R):"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "તરફથી (_o):"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "વિષય (_u):"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "પ્રતિ (_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "સંદેશાના મેળવનારાઓ દાખલ કરો"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "આને પણ (_C):"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "સરનામાઓ દાખલ કરો કે જેઓ પણ સંદેશાની કાર્બન નકલ મેળવે"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "આને પણ ખબર વિના (_B):"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10239,15 +10090,15 @@ msgstr "સરનામાઓ દાખલ કરો કે જેઓ પણ સ
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "ને પોસ્ટ કરો (_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "અંહિ પોસ્ટ કરવા માટે ફોલ્ડરો પસંદ કરો"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "ને પોસ્ટ કરો:"
 
@@ -10255,66 +10106,66 @@ msgstr "ને પોસ્ટ કરો:"
 msgid "A_ttach"
 msgstr "જોડો (_t)"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "જોડાણ ઉમેરો"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:828
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "જતા સંદેશાઓની સહી કરી શકતા નથી: આ ખાતા માટે સહી કરવાનું કોઈ પ્રમાણપત્ર નથી"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "જતા સંદેશાઓને એનક્રિપ્ટ કરી શકતા નથી: આ ખાતા માટે કોઈ એનક્રિપ્શન પ્રમાણપત્ર નથી"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "જોડાણપટ્ટી છુપાવો (_A)"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "જોડાણ પટ્ટી બતાવો (_A)"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "અજ્ઞાત કારણ"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "ફાઈલ ખોલી શક્યા નથી"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "સંપાદકમાંથી સંદેશો મેળવવા સમર્થ નથી"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "શીર્ષક વગરનો સંદેશો"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "ફાઈલ ખોલો"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "આપોઆપ બનતુ"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 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:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "સંદેશો બનાવો"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10458,7 +10309,7 @@ msgstr "સંદેશો સંગ્રહો (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "ઈવોલ્યુશન"
 
@@ -10479,7 +10330,6 @@ 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"
@@ -10490,17 +10340,14 @@ 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>"
 
 #: ../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"
@@ -10510,12 +10357,10 @@ msgstr ""
 "જ્યારે તમે ઓફિસની બહાર હોય ત્યારે મેઈલ મોકલો છો.</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 "હું હાલમાં ઓફિસની બહાર છું"
 
@@ -10524,24 +10369,26 @@ 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 "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>ઈ-મેઈલ મેળવી રહ્યા છીએ</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>મેઈલ મોકલી રહ્યા છીએ:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10552,37 +10399,37 @@ msgstr ""
 "વાંચવા માટે હોય તેની પરવાનગી આપે છે, અને જ્યારે કોઈ તમારા તરફથી રસીદની માંગણી કરે ત્યારે "
 "ઈવોલ્યુશન શું કરે તે સ્પષ્ટ કરે છે.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "વંચાયેલ રસીદ હંમેશા પાછી મોકલો"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "મને પુછો કે શું હું વાંચવાની રસીદ પાછી મોકલવા માંગું છું"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "વાંચવાની રસીદ પાછી ક્યારેય મોકલો નહિં"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "વાંચવાની રસીદો"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "મેં મોકલેલા બધા સંદેશાઓ માટે વાંચવાની રસીદની માંગણી મોકલો"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "જ્યાં સુધી સંદેશો મેઈલીંગ લીસ્ટમાં મોકલાય નહિ, અને મને પોતાને અંગત રીતે મોકલાય નહિં"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr "ક્યારે તમે વાંચવાની રસીદની માંગણી સાથે ઈ-મેઈલ મેળવવા માંગો છો, ઈવોલ્યુશન શું કરશે?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10590,28 +10437,28 @@ msgstr ""
 "એ નામની ફાઈલ પહેલાથી જ હાજર છે.\n"
 "શું તેના ઉપર ફરીથી લખવું છે?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "શું તેના ઉપર ફરીથી લખવું છે?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "ઈવોલ્યુશન ચેતવણી"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "ઈવોલ્યુશન જાણકારી"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "ઈવોલ્યુશન પ્રશ્ન"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "આંતરિક ભૂલ, અજ્ઞાત ભૂલ '%s' ની અરજી થઈ"
@@ -10632,7 +10479,7 @@ msgstr "શું તમે તેના પર ફરીથી લખવા મ
 msgid "File exists &quot;{0}&quot;."
 msgstr "ફાઈલ હાજર છે &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "ની ઉપર ફરીથી લખવું (_O)"
 
@@ -10706,24 +10553,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "ની સાથે સરખાવવા માટે સમય પસંદ કરો"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "ફાઈલ પસંદ કરો"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "મહત્વનું"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "કરવાનું"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "પછી"
 
@@ -10772,11 +10619,11 @@ msgid "Include threads"
 msgstr "થ્રેડો સમાવે છે"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "આવતા"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "જતા"
 
@@ -10800,7 +10647,7 @@ msgstr "ખોવાયેલ તારીખ."
 msgid "Missing file name."
 msgstr "ફાઈલ નામ ખોવાયેલ છે."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "નામ ખોવાયું છે."
 
@@ -10872,7 +10719,7 @@ msgstr "પહેલાં"
 msgid "months"
 msgstr "મહિનાઓ"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "સેકન્ડો"
 
@@ -10940,22 +10787,22 @@ msgstr "ઈવોલ્યુશન મેઈલ કમ્પોઝર રુપ
 msgid "Evolution Mail preferences control"
 msgstr "ઈવોલ્યુશન મેઈલ પસંદગીઓ નિયંત્રણ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../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:531
 msgid "Mail Accounts"
 msgstr "મેઈલ ખાતાઓ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "મેઈલ પસંદગીઓ"
 
@@ -10982,7 +10829,7 @@ msgstr ""
 "અને તેને સ્વીકારવા માટે ચકાસણી બોક્સ ચિહ્નિત કરો\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "ફોલ્ડર પસંદ કરો"
 
@@ -10990,46 +10837,46 @@ msgstr "ફોલ્ડર પસંદ કરો"
 msgid "Ask for each message"
 msgstr "દરેક સંદેશા માટે પૂછો"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "ઓળખ"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "ઈ-મેઈલ મેળવી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2014
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "દરેક નવા મેઈલ માટે આપોઆપ ચકાસો (_n)"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "ઈ-મેઈલ મોકલી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "મૂળભુતો"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "સુરક્ષા"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "વિકલ્પો મેળવી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "નવા મેઈલો માટે ચકાસી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ખાતા સંપાદક"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "ઈવોલ્યુશન ખાતા મદદનીશ"
 
@@ -11049,22 +10896,22 @@ msgid "[Default]"
 msgstr "[મૂળભુત]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "સક્રિય કરેલ છે"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "ખાતા નામ"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "પ્રોટોકોલ"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "નામ વિનાનું"
 
@@ -11140,12 +10987,6 @@ msgstr "મેળવેલ તારીખ"
 msgid "Date sent"
 msgstr "મોકલ્યાની તારીખ"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "કાઢી નાખો"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "કાઢી નંખાયેલ છે"
@@ -11234,7 +11075,7 @@ msgstr "એ નથી"
 msgid "is not Flagged"
 msgstr "એ નિશાનિત નથી"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "નકામુ"
@@ -11243,7 +11084,7 @@ msgstr "નકામુ"
 msgid "Junk Test"
 msgstr "બગડેલ ચકાસણી"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "લેબલ"
 
@@ -11287,7 +11128,7 @@ msgstr "ધ્વનિ વગાડો"
 msgid "Read"
 msgstr "વાંચો"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "મેળવનારાઓ"
 
@@ -11315,11 +11156,11 @@ msgstr "ના કરતાં નાનું આપે છે"
 msgid "Run Program"
 msgstr "કાર્યક્રમ ચલાવો"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "સ્કોર"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "મોકલનાર"
 
@@ -11351,11 +11192,11 @@ msgstr "ની સાથે શરુ થાય છે"
 msgid "Stop Processing"
 msgstr "પ્રક્રિયા કરવાનું બંધ કરો"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "વિષય"
@@ -11369,59 +11210,27 @@ msgstr "સ્થિતિ અસુયોજિત કરો"
 msgid "<b>Then</b>"
 msgstr "<b>ત્યારે</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "શોધમાંથી શોધ ફોલ્ડર બનાવો (_r)..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "બધા સંદેશાઓ"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "નહિં વાંચેલ સંદેશાઓ"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "કોઈ લેબલ નથી"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "વંચાયેલા સંદેશાઓ"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "છેલ્લા સંદેશાઓ"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days' Messages"
-msgstr "છેલ્લા ૫ દિવસના સંદેશાઓ"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "જોડાણો સાથેના સંદેશાઓ"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "સંદેશાઓ બગડેલ નથી"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
 msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "કુલ સંદેશાઓ:"
+msgstr[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[0] "નહિં વાંચેલ સંદેશો:"
 msgstr[1] "નહિં વાંચેલ સંદેશાઓ:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "ફોલ્ડરના ગુણધર્મો"
 
@@ -11438,7 +11247,7 @@ 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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "શોધ ફોલ્ડરો"
 
@@ -11453,7 +11262,7 @@ msgstr "ડ્રાફ્ટો"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "ઈનબોક્સ"
 
@@ -11469,77 +11278,77 @@ msgstr "મોકલાયેલ"
 msgid "Loading..."
 msgstr "લાવી રહ્યા છીએ..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "મેઈલ ફોલ્ડર વૃક્ષ"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "ફોલ્ડર %s ખસેડી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "ફોલ્ડર %s નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "સંદેશાઓ ફોલ્ડર %s માં ખસેડી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "સંદેશાઓ ફોલ્ડર %s માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ઉચ્ચ સ્તરના સંગ્રહસ્થાનમાં સંદેશાઓ મૂકી શકતા નથી"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "આ ફોલ્ડરમાં નકલ કરો (_C)"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "આ ફોલ્ડરમાં ખસેડો (_M)"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" માં ફોલ્ડરો ચકાસી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "દેખાવ (_V)"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "નવી વિન્ડોમાં ખોલો (_N)"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "નકલ કરો (_C)..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "ખસેડો (_M)..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "નવું ફોલ્ડર (_N)..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "નામ બદલો (_R)..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "કચરાપેટી ખાલી કરો (_E)"
 
@@ -11548,14 +11357,13 @@ msgstr "કચરાપેટી ખાલી કરો (_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ને `%s' માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "ફોલ્ડર પસંદ કરો"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "નકલ કરો (_o)"
 
@@ -11577,218 +11385,208 @@ msgstr "ફોલ્ડર બનાવો"
 msgid "Specify where to create the folder:"
 msgstr "સ્પષ્ટ કરો કે ક્યાં ફોલ્ડર બનાવવું છે:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "મોકલનારને વળતો જવાબ આપો (_R)"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "આગળ ધપાવો (_F)"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "નવા સંદેશાઓમાં ફેરફાર કરો (_E)..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "કાઢી નંહિ (_n)"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "ફોલ્ડરમાં ખસેડો (_M)..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "આ ફોલ્ડરમાં નકલ કરો (_C)..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "વાંચ્યુ હોય એમ નિશાનિત કરો (_k)"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "નહિં વાંચેલ છે એમ ચિહ્નિત કરો (_U)"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "મહત્વનું એમ નિશાનિત કરો (_I)"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
-msgstr "મહત્વનું નથી એમ નિશાનિત કરો (_i)"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr "મહત્વનું નથી એમ નિશાનિત કરો (_M)"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "બગડેલ છે એમ નિશાનિત કરો (_J)"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "બગડેલ નથી એમ નિશાનિત કરો (_N)"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "અનુસરણ માટેનું ચિહ્ન (_w)..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "કંઈ નહિં (_N)"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "નિશાની પૂર્ણ થયેલ છે (_g)"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "નિશાની સાફ કરો (_e)"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "સંદેશામાંથી નિયમ બનાવો (_t)"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "વિષયમાંથી ફોલ્ડર શોધો (_S)"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "મોકલનારમાંથી ફોલ્ડર શોધો (_n)"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "મેળવનારમાંથી ફોલ્ડર શોધો (_R)"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "મેઈલિંગ યાદીમાંથી ફોલ્ડર શોધો (_L)"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "વિષય પર ગાળો (_j)"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "મોકલનાર પર ગાળો (_d)"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "મેળવનારા પર ગાળો (_c)"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "મેઈલીંગ યાદી પર ગાળો (_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "મૂળભુત"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "સંદેશો છાપો"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "સંદેશો પાછો મેળવવા સમર્થ નથી"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2460
+msgid "_Copy Link Location"
+msgstr "કડીની જગ્યાની નકલ કરો (_C)"
+
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "શોધ ફોલ્ડર બનાવો (_S)"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "આ સરનામા તરફથી (_F)"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "આ સરનામા પ્રતિ (_T)"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "મેઈલ %s કરવા માટે ક્લિક કરો"
 
-#: ../mail/em-folder-view.c:2860
-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:496
 #, c-format
 msgid "Matches: %d"
 msgstr "બંધબેસતા: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "શોધો:"
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "જોડણી સરખાવો (_a)"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "સહી કરેલ નથી"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "સંદેશો સહી કરેલ નથી. સંદેશો યોગ્ય હોય એની કોઈ ગેરંટી નથી."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "માન્ય સહી"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "આ સંદેશો સહી થયેલ છે અને એ માન્ય છે એટલે કે એ ખૂબ જરુરી છે કે આ સંદેશો વ્યવસ્થિત છે."
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "અયોગ્ય સહી"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "આ સંદેશાની આ સહી ચકાસાયેલ નથી, તે પરિવહન દરમ્યાન બદલી દેવાયેલ છે."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "માન્ય સહી, મોકલનારને ચકાસી શકતા નથી"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "આ સંદેશો માન્ય સહી સાથે સહી કરાયેલ છે, પરંતુ સંદેશાનો મોકલનાર ચકાસી શકાતો નથી."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "એનક્રિપ્ટ થયેલ નથી"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "સંદેશો એનક્રિપ્ટ થયેલ નથી. તેના સમાવિષ્ટો ઈન્ટરનેટ પર પરિવહન દરમ્યાન દેખાઈ શકે છે."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "એનક્રિપ્ટ થયેલ, નબળુ"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11797,21 +11595,21 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, પરંતુ નબળા એનક્રિપ્શન અલગોરિધમ સાથે. તે મુશ્કેલ હશે, પરંતુ એ "
 "બહારના વ્યક્તિ માટે પ્રાયોગિક સમય દરમ્યાન સંદેશાના સમાવિષ્ટો જોવાનું અશક્ય નથી."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "એનક્રિપ્ટ થયેલ"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "સંદેશો એનક્રિપ્ટ થયેલ છે. બહારની વ્યક્તિ માટે આ સંદેશાના સમાવિષ્ટોને જોવાનું મુશ્કેલ થઈ જશે."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "એનક્રિપ્ટ થયેલ, મજબૂત"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11820,72 +11618,72 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, મજબૂત એનક્રિપ્શન અલગોરિધમ સાથે. બહારની વ્યક્તિ માટે પ્રાયોગિક "
 "સમય દરમ્યાન આ સંદેશાના સમાવિષ્ટોને જોવાનું મુશ્કેલ થઈ જશે."
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "પ્રમાણપત્ર જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "આ પ્રમાણપત્ર જોઈ શકાય એમ નથી"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p પૂર્ણ થઈ જશે"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "ઈચ્છિત સમયે નહિં થયેલ કાર્ય:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p દ્વારા"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "લીટીમાં જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "છુપાવો (_H)"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "પહોળાઈમાં બંધબેસાડો (_F)"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "મૂળ માપ બતાવો (_O)"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "જોડાણ"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "બધા જોડાણ સંગ્રહવા માટે ફોલ્ડર પસંદ કરો..."
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "પસંદિત સંગ્રહો (_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d જોડાણ (_t)"
-msgstr[1] "%d જોડાણો (_t)"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] "%d જોડાણ (_n)"
+msgstr[1] "%d જોડાણો (_n)"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "બધું સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "કોઈ જોડાણ નથી"
 
@@ -11899,88 +11697,94 @@ msgstr "પાનુ %d %d નું"
 msgid "Retrieving `%s'"
 msgstr "`%s' મેળવી રહ્યા છીએ"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "માન્ય સહી પરંતુ મોકલનારને ચકાસી શકતા નથી"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "બાહ્ય ભાગનો કદરુપો ભાગ."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP સાઈટ (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "સ્થાનિક ફાઈલ (%s) નો નિર્દેશક સાઈટ \"%s\" માન્ય છે"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "સ્થાનિક ફાઈલ (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "દૂરસ્થા માહિતી (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "અજ્ઞાત બાહ્ય માહિતી (\"%s\" પ્રકારની) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "સંદેસાનું બંધારણ ઘડી રહ્યા છીએ"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "તરફથી"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "ને જવાબ આપો"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "પ્રતિ"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "ને પણ"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "આને પણ ખબર વિના"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "મેઈલ મોકલનાર"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "તારીખ"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "સમાચાર જૂથો"
@@ -12030,7 +11834,7 @@ msgstr "અઠવાડિયામાં એક વાર"
 msgid "Once per month"
 msgstr "મહિનામાં એક વાર"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12041,47 +11845,47 @@ msgstr ""
 "\n"
 "મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ફેરવે ત્યાં સુધી શાંતિ દાખવો..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "નવું ફોલ્ડર `%s' બનાવવામાં સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ફોલ્ડર `%s' ને `%s' માં નકલ કરવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "વર્તમાન મેઈલબોક્સને `%s' આગળ ચકાસવા માટે સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "જૂની POP keep-on-server માહિતી `%s' ખોલવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 keep-on-server માહિતી ડિરેક્ટરી `%s' બનાવવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server માહિતી `%s' નકલ કરવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "સ્થાનિક મેઈલ સંગ્રહસ્થાન `%s' બનાવવામાં નિષ્ફળ: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s' જગ્યાએ સ્થાનિક મેઈલ ફોલ્ડરો બનાવવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12098,6 +11902,10 @@ msgstr "મોકલનારને જવાબ આપો (_R)"
 msgid "Reply to _List"
 msgstr "યાદીને જવાબ આપો (_L)"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "કડીને બ્રાઉઝરમાં ખોલો (_O)"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "ના પ્રતિ નવો સંદેશો મોકલો (_S)..."
@@ -12106,49 +11914,49 @@ msgstr "ના પ્રતિ નવો સંદેશો મોકલો (_S)
 msgid "_Add to Address Book"
 msgstr "સરનામા પુસ્તિકામાં ઉમેરો (_A)"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "આ સ્ટોર ઉમેદવારીને આધાર આપતી નથી, અથવા તેઓ સક્રિય નથી."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "ઉમેદવારી"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:648
 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:869
 msgid "Please select a server."
 msgstr "મહેરબાની કરીને સર્વર પસંદ કરો."
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "કોઈ સર્વર પસંદ થયેલ નથી"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "આ સંદેશો ફરીથી બતાવો નહિં."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "સંદેશા ગાળકો"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "સંદેશો"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "સંદેશો સંગ્રહો..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "સરનામુ ઉમેરો"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "%s માંથી સંદેશાઓ"
@@ -12157,7 +11965,7 @@ msgstr "%s માંથી સંદેશાઓ"
 msgid "Search _Folders"
 msgstr "શોધ ફોલ્ડરો (_F)"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "ફોલ્ડર સ્રોત શોધો"
 
@@ -12190,107 +11998,82 @@ msgid "Composer Window default width"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત પહોળાઈ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "સરનામાઓનું દૃશ્ય TO/CC/BCC માં સંકુચિત કરે છે"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr "સરનામાઓનું દૃશ્ય TO/CC/BCC માં address_count માં સ્પષ્ટ થયેલ નંબર પ્રમાણે સંકુચિત કરે છે."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બનાવવાના છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બનાવવાના છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બતાવવાના છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બતાવવાના છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "મૂળભુત આગળ ધપાવવાની શૈલી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "સંદેશા વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "ઉમેદવારી સંવાદની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "વળતા જવાબની મૂળભુત શૈલી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "સંદેશા વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "ઉમેદવારી સંવાદની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "તમે ટાઈપ કરો તે શબ્દ પર જોડણઈ ભૂલ સૂચવનારાઓ દોરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "ખાલી કચરાપેટી ફોલ્ડરો અસ્તિત્વમાં નથી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ઈવોલ્યુશનમાંથી બહાર નીકળો ત્યારે બધા કચરાપેટી ફોલ્ડરો ખાલી કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "કેરેટ સ્થિતિ સક્રિય કરો, કે જેથી તમે મેઈલ વાંચતી વખતે કર્સર જોઈ શકો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "શોધ લક્ષણ આગળ સક્રિય કરો અથવા નિષ્ક્રિય કરો પ્રકાર"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"બાજુ પટ્ટીનું શોધ લક્ષણ સક્રિય કરો કે જેથી તમે લખાણ લખતી વેળાનું શોધ શરૂ કરી શકો છો. "
-"વપરાશ એ છે કે તમે સરળતાથી ફોલ્ડર શોધી શકો છો તે બાજુ પટ્ટીમાં ખાલી ફોલ્ડરનું નામ લખીને "
-"અને પસંદગી આપોઆપ તે ફોલ્ડરમાં કૂદી પડે."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "કેરેટ સ્થિતિ સક્રિય/નિષ્ક્રિય કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "સંદેશા યાદી તકતીની ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "સંદેશા-યાદી તકતીની ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12298,13 +12081,7 @@ msgstr ""
 "જો વપરાશકર્તા ૧૦ અથવા વધુ સંદેશાઓ એક જ સમયે ખોલવાનો પ્રયત્ન કરે, તો જો વપરાશકર્તા "
 "ખરેખર ઈચ્છા ધરાવતો હોય તો તેને પૂછો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-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.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12313,27 +12090,23 @@ msgstr ""
 "જો ત્યાં કોઈ આંતરિક દર્શક કોઈ ચોક્કસ પ્રકારના mime કે જે ઈવોલ્યુશનની અંદર હોય, અને કોઈ "
 "પ્રકારના mime."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "તે ઘણા સંદેશાઓને ચિહ્નિત કરતી વખતે પ્રોમ્પ્ટ સક્રિય/નિષ્ક્રિય કરે છે."
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "છેલ્લી વખતે ખાલી કચરાપેટી ચાલી હતી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "લેબલો અને તેની સાથે સંકળાયેલ રંગોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "સ્વીકાર્ય લાઈસન્સોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "ખાતાઓની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12341,11 +12114,11 @@ msgstr ""
 "ઈવોલ્યુશનના મેઈલ કમ્પોનન્ટ માટે જાણીતા ખાતાઓની યાદી. યાદી શબ્દમાળા ધરાવે છે જે /apps/"
 "evolution/mail/accounts ની ઉપડિરેક્ટરીને અનુલક્ષે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "કસ્ટમ હેડરોની યાદી અને શું તેઓ સક્રિય છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12353,19 +12126,19 @@ msgstr ""
 "ઈવોલ્યુશનના મેઈલ ભાગને જાણતા લેબલોની યાદી. યાદી શબ્દમાળાઓ ધરાવે છે જે નામ:રંગ ધરાવે છે કે "
 "જ્યાં રંગો HTML હેક્ઝ સંગ્રહપદ્ધતિ વાપરે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "બોનોબો કમ્પોનન્ટ દર્શકોની ચકાસણી માટે mime પ્રકારોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "પ્રોટોકોલ નામોની યાદી કે જેઓનું લાઈસન્સ સ્વીકારાયેલ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "HTML સંદેશાઓ માટે http ની ઉપર ચિત્રો લાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12374,95 +12147,91 @@ msgstr ""
 "HTML સંદેશાઓ માટે http ની ઉપર ચિત્રો લાવો. શક્ય કિંમતો છે: ૦ - ક્યારેય નેટ પરથી ચિત્રો "
 "લાવો નહિં ૧ - સંપર્કોમાંથી મેઈલમાં ચિત્રો લાવો ૨ - હંમેશા નેટ પરથી ચિત્રો લાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "ગાળકની ક્રિયાઓનો લોગ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "ગાળકની ક્રિયાઓનો લોગ કોઈ સ્પષ્ટ કરેલ લોગ ફાઈલમાં કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "ગાળકની ક્રિયાઓનો લોગ માટેની લોગ ફાઈલ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "ગાળકની ક્રિયાઓનો લોગ માટેની લોગ ફાઈલ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "સ્પષ્ટ કરેલ સમય સમાપ્ત થાય પછી જોયું છે એમ ચિહ્નિત કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "સ્પષ્ટ કરેલ સમય પછી જોયું હોય એમ ચિહ્નિત કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "સંદેશા \"પૂર્વદર્શન\" માં સાઈટ બનાવવાનું ચિહ્નિત કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "સંદેશા \"પૂર્વદર્શન\" માં સાઈટ બનાવવાનું ચિહ્નિત કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "સંદેશા વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "સંદેશા વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "સંદેશા-પ્રદર્શન શૈલી (\"સામાન્ય\", \"આખી હેડરો\", \"સ્રોત\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "બહાર નીકળવા પર કચરાપેટીને ખાલી કરતી વખતે લાગતા ન્યુનતમ દિવસો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "બહાર નીકળવા પર કચરાપેટીને ખાલી કરતી વખતે લાગતા ન્યુનતમ દિવસો, દિવસોમાં."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "નવો મેઈલ ધ્વનિ ફાઈલ સૂચવે છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "નવા મેઈલનો સૂચક પ્રકાર"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "TO/CC/BCC માં દર્શાવવા માટેના સરનામાઓની સંખ્યા"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "ખાલી વિષય પર પ્રોમ્પ્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "જ્યારે તે અથવા તેણી ફોલ્ડરને સંપૂર્ણ રીતે દૂર કરવા માંગો ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "જ્યારે તે અથવા તેણી વિષય વગર સંદેશો મોકલવાનો પ્રયત્ન કરે છે ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "જ્યારે વપરાશકર્તા સંપૂર્ણપણે દૂર કરે છે ત્યારે પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "જ્યારે વપરાશકર્તા માત્ર આને પણ ખબર વિના મોકલો ભરે છે ત્યારે પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "જ્યારે વપરાશકર્તા એક જ સમયે ૧૦ અથવા વધુ સંદેશાઓ ખોલવાનો પ્રયત્ન કરે ત્યારે પૂછો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12470,103 +12239,89 @@ msgstr ""
 "જ્યારે વપરાશકર્તા HTML મેઈલ મેળવનારાઓને મોકલે છે કે જેઓ HTML મેઈલ મેળવવા માંગતા ના હોય "
 "ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "જ્યારે વપરાશકર્તા સંદેશો પ્રતિ અને આને પણ ભર્યા વગર મોકલવાનો પ્રયત્ન કરે છે ત્યારે "
 "વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "જ્યારે વપરાશકર્તા બિનજરુરી HTML મોકલવાનો પ્રયત્ન કરે છે ત્યારે તે વપરાશકર્તાને પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "વિવિધ સંદેશાઓને ચિહ્નતિ કરતી વખતે પ્રોમ્પ્ટ કરો."
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "લખાણમાં કડીઓ ઓળખે છે અને તેઓને બદલે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "લખાણમાં હસતા મોં ઓળખે છે અને તેમને ચિત્રો સાથે બદલે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "આવતા મેઈલ પર સામાન્ય ચકાસણી ચલાવ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "મૂળભુત રીતે HTML મેઈલ મોકલો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "મૂળભુત રીતે HTML મેઈલ મોકલો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "એનિમેશન બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "હાલતાં ચાલતાં ચિત્રો એનિમેશન તરીકે બતાવો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "કાઢી નંખાયેલ સંદેશાઓ સંદેશા યાદીમાં બતાવો (ચેકી નંખાયેલ રીતે)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 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.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "જ્યારે નવા મેઈલ આવે ત્યારે વગાડવાની ધ્વનિ ફાઈલ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "નવા મેઈલનું સૂચનનો પ્રકાર સ્પષ્ટ કરે છે જ્યારે વપરાશકર્તા તેને વાપરવાની ઈચ્છા ધરાવે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "લીટીમાં જોડણી ચકાસો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "સંવાદની મૂળભુત ઊંચાઈ નોંધાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "સંવાદની મૂળભુત પહોળાઈ નોંધાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "ટર્મિનલ ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "છેલ્લે વખતે ખાલી કચરાપેટી ચાલી હતી, દિવસોમાં ઈપોકથી."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "મેઈલ પ્રદર્શિત કરવા માટેના ટર્મિનલ ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "મેઈલ પ્રદર્શિત કરવા માટે ચલિત પહોળાઈના ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12577,111 +12332,99 @@ msgstr ""
 "થશે. XML સંરચનાનું બંધારણ &lt;હેડર સક્રિય&gt; હોય છે - સક્રિય સુયોજિત કરો જો હેડર એ મેઈલ "
 "દેખાવમાં પ્રદર્શિત થાય."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-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:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "સંદેશાની યાદીને થ્રેડ કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "સંદેશા-યાદીને થ્રેડ કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "વિષયને આધારિત સંદેશા-યાદીને થ્રેડ કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "સંદેશાને જોયેલો છે એમ ચિહ્નિત કરવા માટેનો સમયસમાપ્તિ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "સંદેશાને જોયેલો છે એમ ચિહ્નિત કરવા માટેનો સમયસમાપ્તિ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "મૂળભુત ખાતાની UID શબ્દમાળા."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Spamassassin ડિમન અને ક્લાઈન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin ડિમન અને ક્લાઈન્ટ વાપરો (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "કસ્ટમ ફોન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "મેઈલ પ્રદર્શિત કરવા માટે કસ્ટમ ફોન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "માત્ર સ્થાનિક ચકાસણીઓ વાપરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "માત્ર સ્થાનિક ચકાસણીઓ વાપરો (DNS નહિં)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "બાજુ-પછી-બાજુ અથવા પહોળો દેખાવ વાપરો"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "ચલિત પહોળાઈના ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "દેખાવ/આને પણ ખબર વિના મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "દેખાવ/આને પણ ખબર વિના મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "દેખાવ/આને પણ મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "દેખાવ/આને પણ મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "દેખાવ/તરફથી મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "દેખાવ/તરફથી મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "દેખાવ/ને મોકલો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "દેખાવ/ને મોકલો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "દેખાવ/ને જવાબ આપો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "દેખાવ/ને જવાબ આપો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12689,14 +12432,6 @@ msgstr ""
 "શું થ્રેડિંગને વિષયો દ્વારા પાછા જોવું કે નહિં જ્યારે સંદેશાઓ ના વળતા જવાબમાં અથવા સંદર્ભો "
 "નામની હેડરો સમાવે નહિં ત્યારે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "સંદેશા-યાદી તકતીની પહોળાઈ"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "સંદેશા-યાદી તકતીની પહોળાઈ."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Elm માહિતી આયાત કરી રહ્યા છીએ"
@@ -12728,15 +12463,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "બર્કલી મેઈલબોક્સ બંધારણના ફોલ્ડરો આયાત કરનાર"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' આયાત કરી રહ્યા છીએ"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "મહેરબાની કરીને રાહ જુઓ"
 
@@ -12916,31 +12651,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d વાંચેલ નથી"
 msgstr[1] ", %d વાંચેલ નથી"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "નવો મેઈલ સંદેશો"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "મેઈલ સંદેશો (_M)"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "નવો મેઈલ સંદેશો કમ્પોઝ કરો"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "નવું મેઈલ ફોલ્ડર"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "મેઈલ ફોલ્ડર (_F)"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "નવું મેઈલ ફોલ્ડર બનાવો"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "મેઈલ સુયોજનો અથવા ફોલ્ડરો સુધારવામાં નિષ્ફળ."
 
@@ -12968,220 +12703,226 @@ msgstr "કરવાનું (_T)"
 msgid "_Later"
 msgstr "પછી (_L)"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " આધારભૂત સેવાઓ માટે ચકાસો (_e) "
 
-#: ../mail/mail-config.glade.h:3
+#: ../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
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>સહીઓ (_n)</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>ભાષાઓ (_L)</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 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:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">ખાતાની જાણકારી</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 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
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">પ્રદર્શિત મેઈલ હેડરો (_H)</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">ગાળક વિકલ્પો</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">લેબલો અને રંગો</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">ચિત્રો લાવી રહ્યા છીએ</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">સંદેશા ડિસ્પ્લે</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">સંદેશા ફોન્ટ</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">સંદેશા રસીદો</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">નવા મેઈલના સૂચનો</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../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:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">વિકલ્પો</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">છપાયેલ ફોન્ટ</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">જરુરી જાણકારી</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">સુરક્ષિત MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">સુરક્ષા</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">મોકલાયેલ અને ડ્રાફ્ટ સંદેશાઓ</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</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 "નવી સહી ઉમેરો (_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 mail"
 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 "હંમેશા અંધ કાર્બન કોપી મોકલો (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
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "જ્યારે એનક્રિપ્ટેડ મેઈલ મોકલી રહ્યા હોય ત્યારે હંમેશા પોતાને એનક્રિપ્ટ કરો (_m)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "મૂળ સંદેશો જોડો"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "આપોઆપ હસતા મોંના ચિત્રો દાખલ કરો (_s)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../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 "Beep w_hen new mail arrives"
 msgstr "જ્યારે નવા મેઈલ આવે ત્યારે બીપ વગાડો (_h)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "અક્ષરોનો સમૂહ (_h):"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "આધારભૂત પ્રકારો માટે ચકાસો (_e)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "બગાડ માટે આવતા મેઈલો ચકાસો (_c)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "જ્યારે I પ્રકાર હોય ત્યારે જોડણી ચકાસો (_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 "સાફ કરો (_r)"
 
-#: ../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
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "રંગો"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "ફોલ્ડરને સંપૂર્ણપણે દૂર કરતી વખતે ખાતરી કરો (_w)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13197,134 +12938,134 @@ msgstr ""
 "\n"
 "તમારા સુયોજનો સંગ્રહવા માટે \"અમલમાં મૂકો\" પર ક્લિક કરો."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "મૂળભુત (_f)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "અક્ષરોની મૂળભુત સંગ્રહપદ્ધતિ (_n):"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "જતા સંદેશાઓને ડિજીટલ રીતે સહી કરો (મૂળભુત રીતે) (_s)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "મૂળ સંદેશાને અવતરિત કરો નહિં"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "થઈ ગયું"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "ડ્રાફ્ટનું ફોલ્ડર (_F):"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "સક્રિય કરો (_n)"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "ઈમેઈલ ખાતાઓ"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "ઈમેઈલ સરનામુ (_A):"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "બહાર નીકળવા પર કચરાપેટી ફોલ્ડરો ખાલી કરો (_x)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "એનક્રિપ્શન પ્રમાણપત્ર (_p):"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "જતા સંદેશાઓ એનક્રિપ્ટ કરો (મૂળભુત રીતે) (_g)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "ચોક્કસ પહોળાઈના ફોન્ટ (_x):"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "ચોક્કસ-પહોળાઈ (_x):"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "ફોન્ટના ગુણધર્મો"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "સંદેશાઓને _HTML બંધારણમાં ઘડો"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "પૂરું નામ (_e):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML મેઈલ"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "હેડરો"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "અવતરણોને આની સાથે પ્રકાશિત કરો (_q)"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "દૂરસ્થ ચકાસણીઓ સમાવો (_n)"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "લીટીની અંદર"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "ભાષાઓનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "મેઈલ રુપરેખાંકન"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "મેઈલ હેડરોનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "મેઈલબોક્સ જગ્યા"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "સંદેશા કમ્પોઝર"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "નોંધ: જ્યાં સુધી તમે પહેલી વખત જોડાવો નહિં ત્યાં સુધી તે તમને પાસવર્ડ માટે પૂછશે નહિં"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "સંસ્થા (_g):"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "જ્યારે નવા મેઈલ આવે ત્યારે ધ્વનિ ફાઈલ વગાડો (_v)"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13332,7 +13073,7 @@ msgstr ""
 "મહેરબાની કરીને આ ખાતા માટે નીચેની જગ્યામાં વર્ણનાત્મક નામ દાખલ કરો.\n"
 "આ નામ માત્ર પ્રદર્શનના હેતુ માટે જ વપરાશે."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13340,7 +13081,7 @@ msgstr ""
 "મહેરબાની કરીને તમે કઈ રીતે મેઈલ મોકલો તે વિશે જાણકારી દાખલ કરો. જો તમે ચોક્કસ નહિં "
 "હોય, તો તમારા સિસ્ટમ સંચાલક અથવા ઈન્ટરનેટ સેવા પૂરી પાડનારને પૂછો."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13349,42 +13090,38 @@ msgstr ""
 "મહેરબાની કરીને નીચે તમારું નામ અને ઈ-મેઈલ સરનામું દાખલ કરો. નીચેના \"વૈકલ્પિક\" ક્ષેત્રો "
 "ભરવાની જરુર નથી, જ્યાં સુધી તમે આ જાણકારી તમે મોકલેલા ઈ-મેઈલમાં સમાવવા માંગો નહિં."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "મહેરબાની કરીને નીચેના વિકલ્પોમાંથી પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "જ્યારે સંદેશાઓ આને પણ ખબર વિના દ્વારા મોકલો ત્યારે પૂછો"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "મૂળ સંદેશાને અવતરિત કરો"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "અવતરિત"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "પાસવર્ડ યાદ રાખો (_m)"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "ને જવાબ આપો (_p):"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "પાસવર્ડ યાદ રાખો (_p)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "પસંદ કરો (_e)..."
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_end message receipts:"
-msgstr "સંદેશા રસીદો મોકલો (_e):"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "પ્રમાણભૂત ફોન્ટ (_t):"
@@ -13413,51 +13150,55 @@ msgstr "છાપન માટે HTML ચલિત પહોળાઈ ફોન
 msgid "Select sound file"
 msgstr "ધ્વનિ ફાઈલ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "સંદેશા રસીદો મોકલો:"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "મેઈલ મોકલી રહ્યા છીએ"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "મોકલાયેલ સંદેશાઓનું ફોલ્ડર (_M):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "સર્વરને સત્તાધિકરણ જરુરી છે (_v)"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "સર્વરનો પ્રકાર (_T): "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "સહી કરવાનું પ્રમાણપત્ર (_n):"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "સહી (_u):"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "સહીઓ"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "સહીઓનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 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."
@@ -13465,7 +13206,7 @@ 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"
@@ -13475,7 +13216,7 @@ msgstr ""
 "તમે સ્પષ્ટ કરેલ નામ માત્ર ડિસ્પ્લેના હેતુ માટે\n"
 "વપરાશે. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13483,15 +13224,15 @@ msgstr ""
 "નામ છાપો કે જેના દ્વારા તમે આ ખાતાને વાપરવા માંગો છો.\n"
 "ઉદાહરણ તરીકે: \"કામ\" અથવા \"ખાનગી\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 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"
@@ -13501,71 +13242,67 @@ msgstr ""
 "\n"
 "શરુઆત કરવા માટે \"આગળ ધપાવો\" પર ક્લિક કરો. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "સહી ઉમેરો (_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "હંમેશા ઈન્ટરનેટમાંથી ચિત્રો લાવો (_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "જ્યારે નવા મેઈલ આવે ત્યારે મને સૂચવો નહિં (_D)"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "મંત્રણાની માંગણીઓની સહી કરો નહિં (આઉટલુકની સાથે સુસંગતતા માટે) (_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "આગળ ધપાવવાની શૈલી (_F):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "સંપર્કોમાંથી મેઈલમાં ઈમેજો લાવો (_L)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "આને મારુ મૂળભુત ખાતું બનાવો (_M)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "પછી વંચાયેલ સંદેશાઓને ચિહ્નિત કરો (_M)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "ઈન્ટરનેટમાંથી ક્યારેય ચિત્રો લાવો નહિં (_N)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "પથ (_P):"
 
-#: ../mail/mail-config.glade.h:166
+#: ../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:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "જ્યારે સંદેશો ખાલી વાક્ય સાથે મોકલી રહ્યા હોય ત્યારે પૂછો (_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "જવાબની શૈલી (_R):"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "લિપી (_S):"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "ચિત્ર એનીમેશનો બતાવો (_S)"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "પ્રતિ / આને પણ / આને પણ ખબર વિના હેડરો આમાં સંકોચો (_S) "
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "સુરક્ષિત જોડાણ વાપરો (_U):"
@@ -13575,21 +13312,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "બીજા કાર્યક્રમોનની જેમ સરખા ફોન્ટ વાપરો (_U)"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "સરનામાઓ"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "રંગ"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "વર્ણન"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>ફોલ્ડર સ્રોત શોધો</b>"
@@ -13603,63 +13332,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">એનક્રિપ્શન</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "બધા સક્રિય દૂરસ્થ ફોલ્ડરો"
-
-#: ../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
 msgid "Case _sensitive"
 msgstr "કેસ પ્રત્યે સંવેદનશીલ (_s)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "સમાપ્ત (_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "શોધો (_n):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 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:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "અનુસરવા માટેની નિશાની"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "ફોલ્ડરની ઉમેદવારી"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "લાઈસન્સ મંજૂરીપત્ર"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "કંઈ પસંદ થયેલ નથી"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "સર્વર (_e):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "સુરક્ષા જાણકારી"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "ચોક્કસ ફોલ્ડરો"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13667,42 +13380,67 @@ msgstr ""
 "તમે અનુસરવા માટે પસંદ કરેલ દરેક સંદેશાઓ નીચે યાદીત કરેલ છે.\n"
 "મહેરબાની કરીને નીચેની ક્રિયા માટે \"નિશાની\" મેનુ પસંદ કરો."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "લાઈસન્સ સ્વીકારો (_A)"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "દ્વારા છેલ્લે (_D):"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "ઝંડો (_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Subscribe"
+msgstr "ઉમેદવારી કરો (_S)"
+
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "લાઈસન્સની મંજૂરી સ્વીકારવા માટે આને ચિહ્નિત કરો (_T)"
 
+#: ../mail/mail-dialogs.glade.h:24
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "ઉમેદવારી દૂર કરો (_U)"
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "માત્ર અમુક ચોક્કસ ફોલ્ડરોમાં જ"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "બીજા બધા ક્રિયાશીલ દૂરસ્થ ફોલ્ડરો સાથે"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "બીજા બધા સ્થાનિક અને ક્રિયાશીલ દૂરસ્થ ફોલ્ડરો સાથે"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "બધા સ્થાનિક ફોલ્ડરો સાથે"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "%s ને ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "ફોલ્ડરો ગાળી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "મેઈલ મેળવી રહ્યા છીએ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "જતા ગાળકો અમલમાં મૂકવામાં નિષ્ફળ: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13711,114 +13449,123 @@ msgstr ""
 "%s માં ઉમેરવામાં નિષ્ફળ: %s\n"
 "એની જગ્યાએ `મોકલો' ફોલ્ડરમાં ઉમેરી રહ્યા છીએ."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "સ્થાનિક `મોકલો' ફોલ્ડરમાં ઉમેરવામાં નિષ્ફળ: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d માંના %d સંદેશાને મોકલી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d માંના %d સંદેશાઓને મોકલવામાં નિષ્ફળ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "રદ થઈ ગયેલ."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "પૂર્ણ."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "સંદેશાને ફોલ્ડરમાં સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "સંદેશાઓને %s માં ખસેડી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "સંદેશાઓને %s માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "આગળ ધપાવાયેલ સંદેશાઓ"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "ફોલ્ડર %s ખોલી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "સ્ટોર %s ખોલી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "ફોલ્ડર %s દૂર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ફોલ્ડર '%s' સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ખાતું '%s' સંપૂર્ણપણે દૂર કરી રહ્યા છીએ અને સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ખાતુ '%s' સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "ફોલ્ડર ફરીથી તાજું કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "ફોલ્ડર સંપૂર્ણપણે દૂર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "કચરાપેટીને '%s' માં ખાલી કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "સ્થાનિક ફોલ્ડરો"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "સંદેશો %s મેળવી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d સંદેશો મેળવી રહ્યા છીએ"
 msgstr[1] "%d સંદેશાઓ મેળવી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d સંદેશાનો સંગ્રહ કરી રહ્યા છીએ"
 msgstr[1] "%d સંદેશાઓ સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"આઉટપુટ ફાઈલ બનાવવા સમર્થ નથી: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13827,11 +13574,11 @@ msgstr ""
 "માં સંદેશાઓ સંગ્રહતી વખતે ભૂલ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "જોડાણ સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13840,69 +13587,60 @@ msgstr ""
 "આઉટપુટ ફાઈલ બનાવી શકતા નથી: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "માહિતી લખી શક્યા નહિં: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%sમાંથી સંપર્ક તોડી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s સાથે ફરીથી જોડાઈ રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "સેવા ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "રદ કરી રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "મેઈલ મોકલો અને મેળવો"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "બધું નકારો (_A)"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "સુધારી રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "રાહ જોઈ રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "નવા મેઈલ માટે ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%s માટે પાસફ્રેઝ દાખલ કરો"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "પાસફ્રેઝ દાખલ કરો"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s માટે પાસવર્ડ દાખલ કરો"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "પાસવર્ડ દાખલ કરો"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "વપરાશકર્તાએ પ્રક્રિયા નકારી કાઢી."
 
@@ -13915,7 +13653,7 @@ msgid "Enter a name for this signature."
 msgstr "આ સહી માટે નામ દાખલ કરો."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "નામ:"
 
@@ -13958,11 +13696,11 @@ msgstr "'%s:%s' માટે શોધ ફોલ્ડરો સુધારી
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' માટે શોધ ફોલ્ડરો સુધારી રહ્યા છીએ"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "શોધ ફોલ્ડરમાં ફેરફાર"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "નવું શોધ ફોલ્ડર"
 
@@ -14267,34 +14005,30 @@ msgid "Mark all messages as read"
 msgstr "બધા સંદેશાઓને વંચાયેલ એમ ચિહ્નિત કરો"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Mark all messages in subfolders as read?"
-msgstr "શું ઉપફોલ્ડરમાંના બધા સંદેશાઓને વાંચ્યા એમ ચિહ્નિત કરવા છે?"
+msgid "Mark all messages as read in the selected folder"
+msgstr "બધા સંદેશાઓને પસંદિત ફોલ્ડરમાં વંચાયેલ એમ ચિહ્નિત કરો"
 
 #: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "વાંચ્યા એમ ચિહ્નિત કરો (_R)"
-
-#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "ખોવાયેલ ફોલ્ડર."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "કોઈ સ્રોતો પસંદ થયેલ નથી."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "એક જ સમયે ઘણા સંદેશાઓ ખોલવાનું ખૂબ લાંબો સમય લે છે."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "મહેરબાની કરીને તમારા ખાતા સુયોજનો ચકાસો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "મહેરબાની કરીને ખાતું સક્રિય કરો અથવા અન્ય ખાતા મારફતે મોકલો."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14302,7 +14036,7 @@ msgstr ""
 "મહેરબાની કરીને માન્ય ઈ-મેઈલ સરનામું પ્રતિ ક્ષેત્રમાં દાખલ કરો. તમે પ્રતિ પર ક્લિક કરીને ઈ-"
 "મેઈલ સરનામું શોધી શકો છો કે જે પ્રવેશ બોક્સ પછી તરતનું બટન છે."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14313,55 +14047,55 @@ msgstr ""
 "{0}\n"
 "કોઈ પણ રીતે મોકલવું છે?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "આ સહી ઓળખવા માટે મહેરબાની કરીને અનન્ય નામ પૂરું પાડો."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "મહેરબાની કરીને રાહ જુઓ."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "જૂના મેઈલ ફોલ્ડર &quot;{0}&quot; ને ખસેડવામાં સમસ્યા છે."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "સર્વરને પૂછી રહ્યા છીએ"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "આધારભૂત સત્તાધિકરણ પદ્ધતિઓની યાદી માટે સર્વરને પૂછી રહ્યા છીએ."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "વાંચન રસીદની અરજી થઈ."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "શું ખરેખર ફોલ્ડર &quot;{0}&quot; અને તેની બધી ઉપડિરેક્ટરીઓ કાઢી નાંખવી છે?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "શોધ ફોલ્ડરો આપોઆપ સુધારાઈ ગયા."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "મોકલાયેલની રસીદ"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "સહી પહેલાથી જ હાજર છે"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"ઈવોલ્યુશનને યોગ્ય રીતે કામ કરવા માટે સિસ્ટમ ફોલ્ડરો જરૂરી છે અને તેમનું નામ બદલી શકાતું નથી, "
-"તેમને ખસાડી શકાતા નથી, અથવા કાઢી શકાતા નથી."
+"સિસ્ટમ ફોલ્ડરોને Ximian ઈવોલ્યુશન ને યોગ્ય રીતે કામ કરવાની જરુર છે અને તેનું નામ બદલી શકાતું "
+"નથી, ખસેડી શકાતી નથી, અથવા કાઢી શકાતું નથી."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14376,7 +14110,7 @@ msgstr ""
 "હેડર હોય. જો આ હેડર ઉમેરાશે, તો તે તમારા સંદેશા મેળવનરા બધાનેે યાદીત કરે છે. આની અવગણના "
 "કરવા માટે, તમારે ઓછામાં ઓછું એક પ્રતિ અથવા આને પણ હેડર દાખલ કરી દેવું જોઈએ. "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14390,7 +14124,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "અને હવે સુધારાઈ ગયેલ છે."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14404,11 +14138,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "અને હવે સુધારાઈ ગયેલ છે."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "સ્ક્રિપ્ટ ફાઈલ હાજર હોવી જ જોઈએ અને તે ચલાવી શકાય તેવી હોવી જોઈએ."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14416,17 +14150,17 @@ msgstr ""
 "આ ફોલ્ડર કદાચ ઉમેરાઈ ગયેલ છે,\n"
 "શોધ ફોલ્ડર સંપાદકમાં તેને બાહ્ય રીતે ઉમેરવા માટે જાઓ, જો જરૂરી હોય."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "સંદેશો મોકલી શકાતો નથી કારણ કે સાથે મોકલવા માટેનું ખાતું પસંદ કરો તે સક્રિય કરેલ નથી"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "આ સંદેશો મોકલી શકાતો નથી કારણ કે તમે કોઈ મેળવનારો સ્પષ્ટ કર્યો નથી"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14434,21 +14168,21 @@ msgstr ""
 "આ સર્વર આ પ્રકારના સત્તાધિકરણને આધાર આપતું નથી અને તે કદાચ બધાનું સત્તાધિકરણને આધાર આપતું "
 "નથી."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "સહી બદલાઈ ગયેલ છે, પરંતુ તે સંગ્રહાયેલ નથી."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "આ બધા સંદેશાઓને પસંદિત ફોલ્ડર અને તેના ઉપફોલ્ડરોમાં વંચાયેલ એમ ચિહ્નિત કરશે."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise સર્વર સાથે જોડાવામાં અસમર્થ."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14456,39 +14190,39 @@ msgstr ""
 "આ ખાતા માટે ડ્રાફ્ટ ફોલ્ડર ખોલવા સમર્થ નથી. સિસ્ટમ ડ્રાફ્ટ ફોલ્ડરો જ તેની જગ્યાએ વાપરવા "
 "છે?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "લાઈસન્સ ફાઈલ વાંચવામાં અસમર્થ."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "મૂળભુત વાપરો (_D)"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "શું મૂળભુત ડ્રાફ્ટ ફોલ્ડર વાપરવું છે?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "તમે બધી જરુરી જાણકારી ભરી નથી."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "તમે સંદેશાઓ સુયોજિત કર્યા નથી, શું તમે કોઈપણ રીતે ચાલુ રાખવા માંગો છો?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "તમે એક જ નામથી બે ખાતાઓ બનાવી શકશો નહિં."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "તમારે આ શોધ ફોલ્ડરને નામ આપવું જ જોઈએ."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "તમારે ફોલ્ડર સ્પષ્ટ કરવું જ પડશે."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14498,98 +14232,94 @@ msgstr ""
 "ક્યાં તો ફોલ્ડરોને વ્યક્તિગત રીતે પસંદ કરીને, અને/અથવા બધા સ્થાનિક ફોલ્ડરો, બધા દૂરસ્થ "
 "ફોલ્ડરો, અથવા બંને પસંદ કરીને."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "તમારા સર્વર પરનો તમારો પ્રવેશ &quot;{0}&quot; નો &quot;{0}&quot; તરીકે નિષ્ફળ."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "ઉમેરો (_A)"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "બદલાવો અવગણો (_D)"
 
 #: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "વાંચ્યા એમ ચિહ્નિત કરશો નહિં (_D)"
-
-#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "સંપૂર્ણપણે કાઢી નાંખો (_E)"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "સંદેશાઓ ખોલો (_O)"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "જોયેલ નથી"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "જોયેલ છે"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "જવાબ અપાયેલ છે"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "ઘણા બધા નહિં જોયેલા સંદેશાઓ"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "ઘણા બધા સંદેશાઓ"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "નીચામાં નીચું"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "થી નીચું"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "થી ઊંચું"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "ઊંચામાં ઊંચુ"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "આજે %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "ગઈકાલે %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "સંદેશાઓ"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "સંદેશા યાદી બનાવી રહ્યા છીએ"
 
@@ -14609,15 +14339,15 @@ msgstr "નિશાનિત"
 msgid "Follow Up Flag"
 msgstr "નિશાનીને અનુસરો"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "મૂળ જગ્યા"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "મેળવેલ છે"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "મોકલાયેલ સંદેશાઓ"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "માપ"
@@ -14765,10 +14495,6 @@ msgstr "આપોઆપ સંપર્કો"
 msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "જ્યારે મેઈલનો વળતો જવાબ આપી રહ્યા હોય ત્યારે આપોઆપ પ્રવેશો બનાવે છે (_A)"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "આપોઆપ સંપર્કો માટે સરનામા પુસ્તિકા પસંદ કરો"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "તુરંત સંદેશા સંપર્કો"
@@ -14778,10 +14504,6 @@ msgstr "તુરંત સંદેશા સંપર્કો"
 msgid "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "gaim વ્યક્તિ યાદીમાંથી સંપર્ક જાણકારી અને ચિત્રો સામયિકપણે સુમેળ કરો"
 
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "Gaim વ્યક્તિ યાદી માટે સરનામા પુસ્તિકા પસંદ કરો"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -14889,6 +14611,10 @@ msgstr ""
 "ચકાસણી પ્લગઈન કે જે પોપઅપ મેનુ પ્લગઈન રજૂ કરે છે જે તમને વસ્તુઓની ક્લિપબોર્ડમાં નકલ કરવા માટે "
 "પરવાનગી આપે છે."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "ઈમેઈલ સરનામાની નકલ કરો (_E)"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "સાધનની નકલ કરો"
@@ -14994,7 +14720,7 @@ msgid "Change the password for Exchange account"
 msgstr "એક્સચેન્જ ખાતા માટે પાસવર્ડ બદલો"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "પાસવર્ડ બદલો"
 
@@ -15026,19 +14752,19 @@ msgstr "ફોલ્ડરોનું માપ"
 msgid "Exchange Settings"
 msgstr "એક્સચેન્જ સુયોજનો"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "સત્તાધિકરણ કરો (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "સત્તાધિકરણ પ્રકાર"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "આધારભૂત પ્રકારો માટે ચકાસો (_e)"
 
@@ -15066,33 +14792,31 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "બે પાસવર્ડો બંધબેસતા નથી. મહેરબાની કરીને પાસવર્ડો પાછા-દાખલ કરો."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "ખાતરી પાસવર્ડ:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "વર્તમાન પાસવર્ડ:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "નવો પાસવર્ડ:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr ""
 "તમારો વર્તમાન પાસવર્ડની સમયમર્યાદા સમાપ્ત થઈ ગઈ છે. મહેરબાની કરીને તમારો પાસવર્ડ "
 "હમણાં બદલો."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, 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
 msgid "Custom"
 msgstr "વૈવિધ્યપૂર્ણ"
 
@@ -15212,7 +14936,7 @@ msgstr "ફોલ્ડર નામ"
 msgid "Folder Size"
 msgstr "ફોલ્ડર માપ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "અન્ય વપરાશકર્તાઓના ફોલ્ડરમાં ઉમેદવારી નોંધાવો"
@@ -15227,14 +14951,14 @@ msgstr "એક્સચેન્જ ફોલ્ડર વૃક્ષ"
 msgid "Unsubscribe Folder..."
 msgstr "ફોલ્ડરોની ઉમેદવારી દૂર કરો..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "શું ખરેખર ફોલ્ડર \"%s\" માંથી ઉમેદવારી દૂર કરવી છે?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" માંથી ઉમેદવારી દૂર કરો"
@@ -15267,66 +14991,62 @@ msgstr "વપરાશકર્તા ઉમેરો:"
 msgid "Add User"
 msgstr "વપરાશકર્તા ઉમેરો"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>પરવાનગીઓ</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "કાઢી શકતા નથી"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "ફેરફાર કરી શકતા નથી"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "વસ્તુઓ બનાવો"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "ઉપફોલ્ડરો બનાવો"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "કોઈપણ વસ્તુઓ કાઢી નાંખો"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "પોતાની વસ્તુઓ કાઢી નાંખો"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "કોઈપણ વસ્તુઓમાં ફેરફાર કરો"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "પોતાની વસ્તુઓમાં ફેરફાર કરો"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "ફોલ્ડર સંપર્ક"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "ફોલ્ડર માલિક"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "ફોલ્ડર દૃશ્યમાન"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "વસ્તુઓ વાંચો"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "ભૂમિકા: "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "ના, પરિસ્થિતિ બદલો નહિં"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 msgid "Select User"
 msgstr "વપરાશકર્તા પસંદ કરો"
@@ -15362,26 +15082,22 @@ msgid "Cannot display folders."
 msgstr "ફોલ્ડરો દર્શાવી શકતા નથી."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"ફેરબદલી ખાતા \"{0}\" માટેના વિકલ્પોમાં ફેરફારો માત્ર ઈવોલ્યુશન પુનઃશરૂ કર્યા પછી જ અસર "
-"આપશે."
+"એક્સચેન્જ ખાતા રૂપરેખાંકનમાં બદલે છે જે તમે ઈવોલ્યુશનમાંથી બહાર નીકળો અને તેને ફરીથી શરૂ કરો "
+"ત્યારે થશે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "સર્વરમાં સત્તાધિકરણ કરી શક્યા નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "પાસવર્ડ બદલી શક્યા નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15391,55 +15107,55 @@ msgstr ""
 "એક અજ્ઞાત ભૂલ ઉદ્દભવી. URL, વપરાશકર્તા નામ, અને પાસવર્ડ ચકાસો, \n"
 "અને ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "એક્સચેન્જ સર્વર સાથે જોડાઈ શક્યા નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "સર્વર {0} સાથે જોડાઈ શક્યા નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "પ્રતિનિધીઓ માટે ફોલ્ડર પરવાનગીઓ નક્કી કરી શક્યા નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "એક્સચેજન્જ વેબ સ્ટોરેજ સિસ્ટમ શોધી શકતા નથી."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "સર્વર {0} સ્થિત કરી શક્યા નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "{0} ને પ્રતિનિધી બનાવી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "ફોલ્ડર પરવાનગીઓ વાંચી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "ફોલ્ડર પરવાનગીઓ વાંચી શક્યા નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "ઓફિસ-ની-બહાર સ્થિતિ વાંચી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "ફોલ્ડર પરવાનગીઓ સુધારી શક્યા નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "ઓફિસ-ની-બહાર સ્થિતિ સુધારી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "એક્સચેન્જ ખાતું ઓફલાઈન છે"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15467,32 +15183,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "પ્રતિનિધીઓ સુધારવામાં નિષ્ફળ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "ફોલ્ડર પહેલાથી જ હાજર છે"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "ફોલ્ડર અસ્તિત્વમાં નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "ફોલ્ડર ઓફલાઈન"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "સામાન્ય ભૂલ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-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:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15500,67 +15212,63 @@ msgstr ""
 "જો OWA એ અલગ પાથ પર ચાલી રહેલ હોય, તો તમારે તેને ખાતા રૂપરેખાંકન સંવાદમાં સ્પષ્ટ કરવું જ "
 "પડશે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 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:40
 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:41
 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:42
 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:43
 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:44
 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:45
 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:46
 msgid "Password successfully changed."
 msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Sever name is correct."
-msgstr "મહેરબાની કરીને ખાતરી કરો કે વૈશ્વિક કેટલોગ સર્વર નામ યોગ્ય છે."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
-msgid "Please restart Evolution for changes to take effect"
-msgstr "ફેરફારોની અસર જોવા માટે મહેરબાની કરીને ઈવોલ્યુશન પુનઃશરૂ કરો"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "મહેરબાની કરીને ઈવોલ્યુશન પુનઃશરૂ કરો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "મહેરબાની કરીને વપરાશકર્તા પસંદ કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "સર્વરે પાસવર્ડ નકાર્યો કારણ કે તે ખૂબ નબળો છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "એક્સચેન્જ ખાતું નિષ્ક્રિય કરવામાં આવશે જ્યારે તમે ઈવોલ્યુશનમાંથી બહાર નીકળો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "એક્સચેન્જ ખાતું દૂર કરવામાં આવશે જ્યારે તમે ઈવોલ્યુશનમાંથી બહાર નીકળો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "એક્સચેન્જ સર્વર એક્સચેન્જ કનેક્ટર સાથે સુસંગત નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15568,7 +15276,7 @@ msgstr ""
 "સર્વર Exchange 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:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15582,51 +15290,51 @@ msgstr ""
 "\n"
 "અથવા કદાચ તમે તમારો પાસવર્ડ ખોટો લખ્યો હશે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "અલગ પાસવર્ડ સાથે ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "વપરાશકર્તાને વપરાશ નિયંત્રણ યાદીમાં ઉમેરવામાં અસમર્થ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "પ્રતિનિધીઓમાં ફેરફાર કરવામાં અસમર્થ."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 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:65
 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:66
 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:67
 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:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "તમે આ સર્વર પર મેઈલ સંગ્રહવા માટે ઉપલબ્ધ ક્વોટા નજીક કરી રહ્યા છો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "તમે તમારી પોતાની જાતે પ્રતિનિધી બની શકો નહિં"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "તમે આ સર્વર પર મેઈલ સંગ્રહવા માટે ક્વોટાની મર્યાદા ઓળંગી દીધી છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "તમે માત્ર એક એક્સચેન્જ ખાતું રૂપરેખાંકિત કરી શકો છો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15634,7 +15342,7 @@ msgstr ""
 "તમારો વર્તમાન વપરાશ: {0} KB છે. અમુક મેઈલ કાઢી નાંખીને થોડી જગ્યા સાફ કરવાનો પ્રયત્ન "
 "કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -15642,7 +15350,7 @@ msgstr ""
 "તમારો વર્તમાન વપરાશ: {0} KB છે. તમે ક્યાં તો મેઈલો મોકલવા માટે કે મેળવવા માટે સમર્થ હશો "
 "નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15650,19 +15358,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:75
 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:77
 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:78
 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:79
 msgid "{0} is already in the list"
 msgstr "{0} એ પહેલાથી જ યાદીમાં છે"
 
@@ -15687,17 +15395,7 @@ msgstr "ફોલ્ડર વૃક્ષ સંદર્ભ મેનુમા
 msgid "Unsubscribe Folders"
 msgstr "ફોલ્ડરોમાંથી ઉમેદવારી દૂર કરો"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "ઉમેદવારી દૂર કરો (_U)"
-
-#: ../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
-msgid "Notes"
-msgstr "નોંધો"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "ચકાસણી યાદી"
 
@@ -15742,21 +15440,13 @@ msgstr "સક્રિય કરો (_E)"
 msgid "_Junk List"
 msgstr "જંક યાદી (_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
-msgid "Message retracted successfully"
-msgstr "સંદેશો સફળતાપૂર્વક મેળવાયો"
-
-#: ../plugins/groupwise-features/mail-retract.c:60
-msgid "Retract Mail"
-msgstr "મેઈલ રીટ્રેક્ટ કરો"
-
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "જૂથપ્રમાણે સંદેશાઓને મોકલવા માટેના વિકલ્પો ઉમેરો"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "મોકલોના વિકલ્પો"
 
@@ -15772,40 +15462,40 @@ msgstr "Groupwise લક્ષણો"
 msgid "Accept Tentatively"
 msgstr "કસોટી માટે સ્વીકારો"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>વપરાશકર્તાઓ:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 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
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "સંપર્કો (_C)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "સૂચક સંદેશો વૈવિધ્યપૂર્ણ બનાવો (_C)"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "વહેંચાયેલ નથી (_N)"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "સાથે વહેંચાયેલ (_S) ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "વહેંચી રહ્યા છીએ (_S)"
 
@@ -15874,10 +15564,7 @@ msgstr "પ્રોક્સી પ્રવેશ"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s માટે પાસવર્ડ દાખલ કરો (વપરાશકર્તા %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "પ્રોક્સી પ્રવેશ (_P)..."
 
@@ -15938,12 +15625,12 @@ msgid "Select Calendar"
 msgstr "કેલેન્ડર પસંદ કરો"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "આયાત (_I)"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar બંધારણ (.ics)"
 
@@ -15995,116 +15682,116 @@ msgstr "કેલેન્ડર/આમકરો ખોલી શક્યા �
 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:391
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "કેલેન્ડર '%s' લાવવામાં નિષ્ફળ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "કેલેન્ડર '%s' માંની મુલાકાત આ મંત્રણા સાથે તકરાર થાય છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "કેલેન્ડર '%s' માં મુલાકાત મળી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "કોઈપણ કેલેન્ડર શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "કોઈપણ કેલેન્ડરમાં આ મંત્રણા શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "કોઈપણ બાબત યાદીમાં આ બાબત શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "કોઈપણ જર્નલમાં આ જર્નલ પ્રવેશ શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "આ મુલાકાતની તાજેતરની આવૃત્તિ માટે શોધ કરી રહ્યા છીએ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "વસ્તુનું પદચ્છેદ કરવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "કેલેન્ડર '%s' ને વસ્તુ મોકલવામાં અસમર્થ.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "કેલેન્ડર '%s' ને સ્વીકારાયેલ તરીકે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "કેલેન્ડર '%s' ને ચોક્કસ નથી એમ મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "કેલેન્ડર '%s' ને નકારાઈ ગયેલ છે એ રીતે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "કેલેન્ડર '%s' ને રદ કરાયેલ તરીકે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "આયોજકે પ્રતિનિધી %s ને દૂર કરી નાંખ્યો "
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "પ્રતિનિધીને રદ કરવાનું સૂચન મોકલ્યું છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "પ્રતિનિધીને રદ કરવાનું સૂચન મોકલી શક્યા નહિં"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "સભાજન સ્થિતિ સુધારી શકાઈ નહિં કારણ કે સ્થિતિ અયોગ્ય છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "સભાજન સુધારવામાં અસમર્થ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "સભાજન સ્થિતિ સુધારાઈ ગઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "જોડાયેલ કેલેન્ડર માન્ય નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "સંદેશો કેલેન્ડર સમાવવા માટે દાવો મૂકે છે, પરંતુ કેલેન્ડર એ માન્ય iCalendar નથી."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "કેલેન્ડરની વસ્તુ માન્ય નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16112,11 +15799,11 @@ msgstr ""
 "સંદેશો કેલેન્ડર સમાવતો નથી, પરંતુ કેલેન્ડર કોઈ ઘટનાઓ સમાવતું નથી, બાબતો અથવા મુક્ત/વ્યસ્ત "
 "જાણકારી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "જોડાયેલ કેલેન્ડર ઘણી વસ્તુઓ સમાવે છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16124,421 +15811,383 @@ msgstr "આ બધી વસ્તુઓ પર પ્રક્રિયા ક�
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "ક્રિયા કર્યા પછી સંદેશો કાઢી નાંખો (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "તકરાર શોધ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "મંત્રણા મતભેદો શોધવા માટે કેલેન્ડર પસંદ કરો"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "આજે"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "આજે %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "આજે %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:202
 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:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "આવતી કાલે"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "આવતી કાલે %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 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:228
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "આવતી કાલે %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "આવતી કાલે %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની મંત્રણા જાણકારી પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણા જાણકારી પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણાનું તમારા માટે આયોજન કર્યું છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> મારફતે %s એ તમારી નીચેની મંત્રણામાં હાજરીની માંગણી કરી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> એ તમારી નીચેની મંત્રણામાં હાજરીની માંગણી કરી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> મારફતે %s હાલની મંત્રણા ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> હાલની મંત્રણા ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> નીચેની મંત્રણા માટે તાજેતરની જાણકારી મેળવવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણા પ્રત્યુત્તર પાછો મોકલ્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની મંત્રણા રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> એ નીચેની મંત્રણા રદ કરી."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> એ નીચેના મંત્રણા ફેરફારોનો પ્રસ્તાવ મૂક્યો છે."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેના મંત્રણા ફેરફારો નકાર્યા છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> એ નીચેના મંત્રણા ફેરફારો નકાર્યા છે."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> મારફતે %s એ નીતેની બાબત પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> એ નીચેની બાબત પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, 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:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> મારફતે %s એ તમને બાબત સોંપી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> એ તમને બાબત સોંપી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> મારફતે %s હાલની બાબત ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> હાલની બાબત ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> નીચેની સોંપાયેલ બાબતો માટે તાજેતરની જાણકારી મેળવવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> એ નીચેની સોંપાયેલી બાબતોનો પ્રત્યુત્તર પાછો મોકલ્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની સોંપાયેલ બાબતો રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> એ નીચેની સોંપાયેલ બાબતો રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> એ નીચેની બાબત સોંપમી ફેરફારોનો પ્રસ્તાવ મૂક્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, 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:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> નીચેની સોંપણી બાબતને નકારી:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> મારફતે %s એ નીચેનો મેમો પ્રકાશિત કર્યો:"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> એ નીચેનો મેમો પ્રકાશિત કર્યો:"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, 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:491
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> વર્તમાન મેમો ઉમેરવાની ઈચ્છા રાખે છે:"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, 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:497
-#, 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:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "કેલેન્ડર ખોલો (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "નકારો (_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "સ્વીકારો (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "બધું નામંજૂર કરો (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "નકારો (_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "બધું અજમાયશ માટે કરો (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "અજમાયશ (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "બધું સ્વીકારો (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "જાણકારી મોકલો (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "સભાજન પરિસ્થિતિ સુધારો (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "સુધારો (_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "શરૂઆતનો સમય:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "અંતિમ સમય:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "ટિપ્પળી:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "સભાજનોને સુધારાઓ મોકલો (_p)"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "બધી પળોને લાગુ પાડો (_p)"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "બાબતો (_T) :"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "મેમો :"
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "સંદેશાઓમાં લખાણ/કેલેન્ડર ભાગો દર્શાવે છે."
@@ -16550,10 +16199,8 @@ msgstr "Itip ફોર્મેટર"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot; એ મંત્રણા આયોજિત કરી હતી. શું તમે &quot;{1}&quot; પ્રતિનીધિ ઉમેરવા "
-"માંગો છો?"
+"&quot;{1}&quot; ?"
+msgstr "&quot;{0}&quot; એ મંત્રણા આયોજિત કરી હતી. શું તમે &quot;{1}&quot; પ્રતિનીધિ ઉમેરવા માંગો છો ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16635,14 +16282,17 @@ msgid "Convert the selected message to a new task"
 msgstr "પસંદ કરેલ સંદેશાને નવી બાબતમાં ફેરવો"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "સંપર્ક યાદી માલિક (_o)"
 
 #: ../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 "યાદી પેટી મેળવો (_a)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "યાદી વપરાશ જાણકારી મેળવો (_u)"
 
@@ -16664,14 +16314,17 @@ msgstr ""
 "કરો, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "યાદીમાં સંદેશો પોસ્ટ કરો (_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "યાદીમાં ઉમેદવારી નોંધાવો (_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "યાદીમાંથી ઉમેદવારી દૂર કરો (_U)"
 
@@ -16752,27 +16405,15 @@ msgstr "સંદેશામાં ફેરફાર કરો (_E)"
 msgid "_Send message"
 msgstr "સંદેશો મોકલો (_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "સંપર્ક યાદી માલિક (_O)"
-
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "આ સંદેશો જેને અનુસરે છે તે મેઈલિંગ યાદીના માલિકનો સંપર્ક કરો"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "યાદી પેટી મેળવો (_A)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "યાદી વપરાશ જાણકારી મેળવો (_U)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "આ સંદેશો જે યાદીને અનુસરે છે તેની પેટી મેળવો"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "આ સંદેશો જે યાદીને અનુસરે છે તેના વપરાશ વિશે જાણકારી મેળવો"
 
@@ -16788,25 +16429,13 @@ msgstr "આ સંદેશો જે મેઈલિંગ યાદીને �
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "આ સંદેશો જે મેઈલિંગ યાદીને અનુસરે છે તેમાંથી ઉમેદવારી દૂર કરો"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "યાદીમાં સંદેશાઓ મોકલો (_P)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "યાદીમાં ઉમેદવારી નોંધાવો (_S)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "યાદીમાંથી ઉમેદવારી દૂર કરો (_U)"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "બધાને વાંચ્યા એમ નિશાનિત કરો"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "સંદેશાઓને વાંચ્યા એમ નિશાનિત કરો (_s)"
+msgid "Mark me_ssages as read"
+msgstr "સંદેશાઓને વાચ્યા એમ નિશાનિત કરો (_s)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
@@ -17066,16 +16695,16 @@ msgstr "જોડાણો સંગ્રહો ..."
 msgid "Save all attachments"
 msgstr "બધા જોડાણ સંગ્રહો"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "આધાર નામ સંગ્રહો પસંદ કરો"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME પ્રકાર"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "સંગ્રહો"
 
@@ -17185,7 +16814,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF બંધારણ (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "અંતિમ મુકામ ફાઈલ પસંદ કરો"
 
@@ -17233,19 +16862,19 @@ msgstr ""
 "\n"
 "મહેરબાની કરીને ચાલુ રાખવા માટે \"આગળ ધપાવો\" બટન ક્લિક કરો. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "મહેરબાની કરીને તમે જેની આયાત કરવા માંગો તે જાણકારી પસંદ કરો:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, 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:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "માહિતી આયાત કરી રહ્યા છીએ."
 
@@ -17299,64 +16928,56 @@ msgid "Default window height"
 msgstr "મૂળભુત વિન્ડો ઊંચાઈ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-msgid "Default window state"
-msgstr "મૂળભૂત વિન્ડો સ્થિતિ"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "મૂળભુત વિન્ડો પહોળાઈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "શરુઆતમાં ભાગનું ID અથવા ઉપનામ મૂળભુત રીતે દેખાય છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "છેલ્લે સુધારાયેલ રૂપરેખાંકન આવૃત્તિ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ફોલ્ડરો માટે યાદીના પથો કે જે ઓફલાઈન વપરાશ માટે ડિસ્ક સાથે સુમેળ કરવાના છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "પ્રિન્ટર સુયોજનો"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Sidebar is visible"
 msgstr "બાજુપટ્ટી દૃશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "વિકાસ ચેતવણી સંવાદ અવગણો"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "ઓફલાઈન સ્થિતિમાં શરુ કરો"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "પરિસ્થિતિદર્શક પટ્ટી દૃશ્યમાન છે"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "ઈવોલ્યુશનની રૂપરેખાંકિત આવૃત્તિ, મુખ્ય/ગૌણ/રૂપરેખાંકન સ્તર સાથે (ઉદાહરણ તરીકે \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "મુખ્ય વિન્ડો માટે મૂળભુત ઊંચાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "મુખ્ય વિન્ડો માટે મૂળભુત પહોળાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "બાજુની પટ્ટી માટે મૂળભુત પહોળાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17364,7 +16985,7 @@ msgstr ""
 "ઈવોલ્યુશનની છેલ્લી સુધારાયેલ રૂપરેખાંકિત આવૃત્તિ, મુખ્ય/ગૌણ/ રૂપરેખાંકન સ્તરો સાથે (ઉદાહરણ "
 "તરીકે \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17374,43 +16995,35 @@ msgstr ""
 "\"સાધનપટ્ટી\" સુયોજિત હોય, તો જીનોમ સાધનપટ્ટી સુયોજનો દ્વારા બટનોની શૈલી નક્કી થાય "
 "છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "સાધનપટ્ટી દ્રશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "શું ઈવોલ્યશન ઓનલાઈન સ્થિતિની જગ્યાઓ ઓફલાઈન સ્થિતિમાં શરૂ થશે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether or not the window should be maximized."
-msgstr "વિન્ડો મોટી થવી જોઈએ કે નહિં."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether the sidebar should be visible."
 msgstr "શું બાજુપટ્ટી દૃશ્યમાન હોવી જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "શું પરિસ્થિતિદર્શક પટ્ટી દૃશ્યમાન હોવી જોઈએ."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "શું સાધનપટ્ટી દ્રશ્યમાન થશે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "શું ઈવોલ્યુશનની વિકાસ આવૃત્તિઓમાંનો ચેતવણી સંવાદ અવગણાયેલ છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "શું વિન્ડો બટનો દેખાવા જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "વિન્ડો બટન શૈલી"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "વિન્ડો બટનો દ્રશ્યમાન છે"
 
@@ -17431,11 +17044,11 @@ msgstr "આ જોડાણો બંધ કરવા માટે બરાબ�
 msgid "(Untitled)"
 msgstr "(શીર્ષક વગરનું)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "ચલાવવા માટે આયાત કરનારનો પ્રકાર પસંદ કરો:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17449,11 +17062,11 @@ msgstr ""
 "જો તમે જાણતા ના હોય તો તમે \"આપોઆપ\" પસંદ કરી શકો છો, અને ઈવોલ્યુશન તેને કામ કરવા "
 "માટે લઈ લેશે."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "આ આયાત માટે અંતિમ મુકામ પસંદ કરો"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17465,23 +17078,23 @@ msgstr ""
 "સુયોજનો મળ્યા નથી. જો તમે ફરીથી પ્રયત્ન કરવા\n"
 "માંગતા હોય, તો મહેરબાની કરીને \"પાછળ\" બટન ક્લિક કરો.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "ફાઈલનું નામ (_i):"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "ફાઈલ પસંદ કરો"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "ફાઈલનો પ્રકાર (_t):"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "જૂના કાર્યક્રમોમાંથી માહિતી અને સુયોજનો આયાત કરો (_o)"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "એક ફાઈલ જ આયાત કરો (_s)"
 
@@ -17537,7 +17150,7 @@ msgstr "અંકિત પટેલ <ankit644@yahoo.com>"
 msgid "_Work Online"
 msgstr "ઓનલાઈન કામ કરો (_W)"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "ઓફલાઈન કામ કરો (_W)"
 
@@ -17545,57 +17158,52 @@ msgstr "ઓફલાઈન કામ કરો (_W)"
 msgid "Work Offline"
 msgstr "ઓફલાઈન કામ કરો"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓનલાઈન છે. ઓફલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "ઈવોલ્યુશન પ્રક્રિયાને ઓફલાઈન કામ કરવાની પ્રક્રિયામાં છે."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓફલાઈન છે. ઓનલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "%s માં બદલો"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "અજ્ઞાત સિસ્ટમ ભૂલ."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "બરાબર"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "અયોગ્ય દલીલો"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "OAF પર નોંધ કરાવી શકતા નથી"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 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:685
 msgid "New"
 msgstr "નવું"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " નવું "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "નવી ચકાસણી"
@@ -17647,7 +17255,7 @@ msgstr ""
 "કેવી રીતે આયાત કરવી તે પ્રક્રિયાનું માર્ગદર્શન આપવામાં આવેલ છે."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17682,7 +17290,7 @@ msgstr ""
 "અમે એવી આશા રાખીએ છીએ કે તમે અમારી સખ્ત મહેનતના પરિણામને માણી રહ્યા હશો,\n"
 "અને અમે તમારા ફાળાની આતુરતાથી રાહ જોઈ રહ્યા છીએ!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17690,39 +17298,35 @@ msgstr ""
 "આભાર\n"
 "ઈવોલ્યુશન ટુકડી\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "મને ફરી વાર કહો નહિં"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "સ્પષ્ટ કરેલ કમ્પોનન્ટ ક્રિયાશીલ કરવા માટે ઈવોલ્યુશન શરુ કરો"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "ઓનલાઈન સ્થિતિમાં શરુ કરો"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "ઈવોલ્યુશનના બધા કમ્પોનન્ટો દબાણપૂર્વક બંધ કરી દો"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ઈવોલ્યુશન ૧.૪ માંથી દબાણપૂર્વક ફેરવો"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "ફાઈલના બધા કમ્પોનન્ટો માટે ભૂલ શોધવા માટેનું આઉટપુટ મોકલો."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "કોઈપણ પ્લગઈનો લાવવાનું નિષ્ક્રિય કરો."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- ઈવોલ્યુશન PIM અને ઈમેઈલ ક્લાઈન્ટ"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18148,7 +17752,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:664
 msgid "Certificate already exists"
 msgstr "પ્રમાણપત્ર પહેલાથી જ હાજર છે"
 
@@ -18380,12 +17984,6 @@ msgstr "બધા સંપર્કોની નકલ અંહિ કરો (
 msgid "Contact _Preview"
 msgstr "સંપર્ક પૂર્વદર્શન (_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "નકલ કરો"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "પસંદિત સંપર્કોને બીજા ફોલ્ડરમાં નકલ કરો..."
@@ -18482,12 +18080,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:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "બધું પસંદ કરો"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "બધું પસંદ કરો (_A)"
@@ -18557,7 +18155,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:46
 msgid "_New"
 msgstr "નવું (_N)"
 
@@ -18618,7 +18216,6 @@ msgid "Month"
 msgstr "મહિનો"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "આગળ વધો"
 
@@ -18627,7 +18224,7 @@ msgid "Previews the calendar to be printed"
 msgstr "કેલેન્ડરનું છાપન માટે પૂર્વદર્શન આપે છે"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "પહેલાનું"
 
@@ -18715,11 +18312,11 @@ msgstr "પસંદગીને ક્લિપબોર્ડમાં કા�
 msgid "Paste from clipboard"
 msgstr "ક્લિપબોર્ડમાંથી ચોંટાડો"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "ક્લિપબોર્ડમાંથી લખાણ ચોંટાડો"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "બધું લખાણ પસંદ કરો"
 
@@ -18754,31 +18351,30 @@ msgstr "ઉપલબ્ધ મદદ જોવા માટે અંહિ ક�
 msgid "Close"
 msgstr "બંધ કરો"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "દાખલ કરો (_n)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "જોડાણ (_A)..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "બંધ કરો (_C)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "ફાઈલ (_F)"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "મદદ (_H)"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "દાખલ કરો (_I)"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "વિકલ્પો (_O)"
@@ -18876,11 +18472,6 @@ msgstr "શું સમયને વ્યસ્ત તરીકે બતા�
 msgid "_Alarms"
 msgstr "એલાર્મ (_A)"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "વર્ગો (_C)"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18946,73 +18537,53 @@ msgid "F_older"
 msgstr "ફોલ્ડર (_o)"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "સંદેશા પૂર્વદર્શન (_P)"
+
+#: ../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
-msgid "Show Message _Preview"
-msgstr "સંદેશા પૂર્વદર્શન બતાવો (_P)"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "સંદેશા યાદી નીચે સંદેશા પૂર્વદર્શન બતાવો"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "સંદેશા યાદી સાથે બાજુ-પછી-બાજુ સંદેશા પૂર્વદર્શન બતાવો"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "સંદેશા પૂર્વદર્શન વિન્ડો બતાવો"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "દૂરસ્થ સર્વરો પર ફોલ્ડરોની ઉમેદવારી કરો અથવા દૂર કરો"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "શાસ્ત્રિય દેખાવ (_C)"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "ફોલ્ડરને આમાં નકલ કરો (_C)..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "સંદેશા ગાળકો (_M)"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "ફોલ્ડરને આમાં ખસેડો (_M)..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "નવું (_N)..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-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:23
 msgid "_Subscriptions"
 msgstr "ઉમેદવારીઓ (_S)"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "ઊભો દેખાવ (_V)"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "આ ફોલ્ડરનું નામ બદલો"
@@ -19569,10 +19140,6 @@ msgid "_Unread"
 msgstr "નહિં વંચાયેલ (_U)"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "નાનું મોટું (_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "મોટું કરો (_Z)"
 
@@ -19580,7 +19147,7 @@ msgstr "મોટું કરો (_Z)"
 msgid "Close this window"
 msgstr "આ વિન્ડો બંધ કરો"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "મુખ્ય સાધનપટ્ટી"
 
@@ -19655,6 +19222,11 @@ msgstr "જ્યારે તમારો સંદેશો વંચાય �
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "દાખલ કરો (_n)"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "ફાઈલ ખોલો"
@@ -19983,51 +19555,43 @@ msgstr "ચિહ્નો અને લખાણ (_a)"
 msgid "Import data from other programs"
 msgstr "બીજા કાર્યક્રમોમાંથી માહિતી આયાત કરો"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "દેખાવ (_y)"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "નવી વિન્ડો (_W)"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "પસંદગીઓ (_n)"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "મોકલો / મેળવો"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "મોકલો / મેળવો (_R)"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "કતારમાં રહેલી વસ્તુઓ મોકલો અને નવી વસ્તુઓ મેળવો"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "પાયલોટ રુપરેખાંકન સુયોજિત કરો"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "ઈવોલ્યુશન વિશે જાણકારી બતાવો"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "બાજુ પટ્ટી બતાવો (_B)"
+msgid "Side _Bar"
+msgstr "બાજુ પટ્ટી (_B)"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "પરિસ્થિતિદર્શક પટ્ટી બતાવો (_S)"
+msgid "Status _Bar"
+msgstr "પરિસ્થિતિદર્શક પટ્ટી (_B)"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "સાધનપટ્ટી બતાવો (_T)"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "ઈવોલ્યુશન વિશે જાણકારી બતાવો"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "ભૂલનો અહેવાલ રજૂ કરો"
 
@@ -20035,71 +19599,75 @@ msgstr "ભૂલનો અહેવાલ રજૂ કરો"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "ભૂલનો અહેવાલ રજૂ કરો (_B)"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "બગ બડીની મદદથી ભૂલનો અહેવાલ રજૂ કરો"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "શું આપણે ઓફલાઈન કામ કરી રહ્યા છીએ એ ફેરબદલી કરો."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "સાધનપટ્ટી (_b)"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "સાધનપટ્ટી શૈલી (_b)"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "બાજુ પટ્ટી બતાવો/છુપાવો"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "પરિસ્થિતિદર્શક પટ્ટી જુઓ/છુપાવો"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "વિશે (_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "વિન્ડો બંધ કરો (_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "પાસવર્ડો ભૂલી ગયા (_F)"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "બટનો છુપાવો (_H)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "માત્ર ચિહ્નો (_I)"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "ઝડપી સંદર્ભ (_Q)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "બહાર નીકળો (_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "સ્વીચરનો દેખાવ (_S)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "સુમેળ વિકલ્પો (_S)..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "માત્ર લખાણ (_T)"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "વિન્ડો (_W)"
 
@@ -20136,34 +19704,26 @@ msgid "_Work Week View"
 msgstr "કામ કરવાના અઠવાડિયાનો દેખાવ (_W)"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "પહોળા દેખાવ માટે મોકલાયેલ ફોલ્ડર તરીકે (_d)"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "મોકલેલા ફોલ્ડર તરીકે (_S)"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "સ્થિતિ દ્વારા (_t)"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "મોકલનાર દ્વારા (_n)"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "વિષય દ્વારા (_b)"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "ઝંડાને અનુસરો (_F)"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "પહોળા દેખાવ માટે (_W)"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "સંદેશાઓ (_M)"
 
@@ -20179,32 +19739,28 @@ 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>ટાઈમ ઝોન</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>પસંદગી (_S)</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "ટાઈમ ઝોન પસંદ કરો"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "ટાઈમઝોન કમ્બોબોક્સ"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20240,7 +19796,7 @@ msgid "_Edit..."
 msgstr "ફેરફાર કરો (_E)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20254,11 +19810,11 @@ msgstr "પળ"
 msgid "Save Current View"
 msgstr "વર્તમાન દેખાવ સંગ્રહો"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "નવો દેખાવ બનાવો (_C)"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "વર્તમાન દેખાવ બદલો (_R)"
 
@@ -20293,31 +19849,26 @@ msgstr "કારખાનું"
 msgid "Define New View"
 msgstr "નવો દેખાવ વ્યાખ્યાયિત કરો"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "નવા દેખાવનું નામ:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "દેખાવનો પ્રકાર"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20327,8 +19878,8 @@ 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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "રંગ ભરો"
 
@@ -20337,16 +19888,16 @@ msgstr "રંગ ભરો"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "સ્ટીપલ ભરો"
 
@@ -20385,11 +19936,11 @@ msgid "Minimum Width"
 msgstr "ન્યુનતમ પહોળાઈ"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "જગ્યા છોડી રહ્યા છીએ"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "હમણાં"
 
@@ -20517,41 +20068,33 @@ msgstr "સમય પસંદ કરવા માટે કમ્બો બો�
 msgid "Time"
 msgstr "સમય"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "હમણાં (_w)"
-
-#: ../widgets/misc/e-dateedit.c:467
-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
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "વિસ્તૃત થયેલ"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "શું વિસ્તારનાર વિસ્તૃત થશે કે નહિં"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "વિસ્તારનારના લેબલનું લખાણ"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "નીચે લીટી વાપરો"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20559,89 +20102,73 @@ msgstr ""
 "જો સુયોજિત હોય, તો લખાણમાં નીચે લીટી પછીનો અક્ષર મ્નેમોનિક એસીલરેટર કી માટે વપરાય છે "
 "એમ સૂચવે છે"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "લેબલ અને બાળક વચ્ચે મૂકવાની જગ્યા"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "લેબલ વિજેટ"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "રોજિંદા વિસ્તૃતકારક લેબલ ની જગ્યાએ વિજેટ બતાવો"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "વિસ્તારનારનું માપ"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "વિસ્તારનાર તીરનું માપ"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "સૂચકની વચ્ચેની જગ્યા"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "વિસ્તારનાર તીરની ફરતે જગ્યા છોડી રહ્યા છીએ"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "ઉન્નત શોધ"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "શોધ સંગ્રહો"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "શોધો (_S)"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "શોધો"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "શોધ સંગ્રહો"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "શોધ સંગ્રહો (_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 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:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "અદ્યતન શોધ (_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "બધા ખાતાઓ"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "વર્તમાન ખાતું"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "વર્તમાન ફોલ્ડર"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "વર્તમાન સંદેશો"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 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."
@@ -20673,45 +20200,45 @@ msgstr "મોડેલ ફરી ભરો"
 msgid "Column width"
 msgstr "સ્તંભ પહોળાઈ"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "શોધ"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "શોધ (_S)"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "હમણાં શોધો (_F)"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "સાફ કરો (_C)"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "શોધ પ્રકાર"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "વસ્તુ ID"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "ઉપવસ્તુ ID"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "લખાણ"
 
-#. 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:911
-msgid "Show: "
-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:927
-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:939
-msgid " i_n "
-msgstr " અંદર (_n) "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "હમણા શોધો (_N)"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20760,8 +20287,8 @@ msgid "A_uto-delete sent item"
 msgstr "મોકલાયેલ વસ્તુઓને આપોઆપ કાઢી નાંખો (_u)"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "વર્ગીકરણ"
+msgid "C_lassification"
+msgstr "વર્ગીકરણ (_l)"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -20785,29 +20312,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"સામાન્ય\n"
-"વ્યક્તિગત\n"
+"જાહેર\n"
 "ખાનગી\n"
-"છુપું\n"
-"ખૂબ છુપું\n"
-"માત્ર તમારી આંખો માટે"
+"વિશ્વસનીય\n"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "જવાબની માંગણી થયેલ છે (_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "પરિસ્થિતિ પકડવાનું (_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -20819,51 +20340,51 @@ msgstr ""
 "પ્રમાણભૂત\n"
 "નીચું"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "જ્યારે સ્વીકારાય (_p):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "જ્યારે પૂર્ણ થાય (_m):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "જ્યારે નકારાય (_n):"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "ની સાથે (_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "પછી (_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "બધી જાણકારી (_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "સંદેશો પહોંચવામાં વિલંબ (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "પહોંચી ગયો (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "સમયસમાપ્તિ તારીખ સુયોજિત કરો (_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "જ્યાં સુધી નહિં (_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "જ્યારે યોગ્ય લાગે (_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "જ્યારે ખૂલે (_W):"
 
@@ -20881,19 +20402,19 @@ msgstr "%s (%d%% પૂર્ણ થયું)"
 msgid "Click here to go to URL"
 msgstr "URL પર જવા માટે અંહિ ક્લિક કરો"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "મુખ્ય વર્ગ યાદીમાં ફેરફાર કરો..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "વસ્તુઓ આ વર્ગોને અનુસરે છે:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "ઉપલબ્ધ વર્ગો (_A):"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "વર્ગો"
 
@@ -20917,23 +20438,23 @@ msgstr "પ્રકાશિત કરેલ સ્તંભ"
 msgid "Unselected Column"
 msgstr "પસંદ નહિં કરેલ સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "સ્તંંભ ચેકી નાખો"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "નીચે લીટી કરેલ સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "ઘાટો સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "રંગીન સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "BG રંગવાળો સ્તંભ"
 
@@ -20948,7 +20469,6 @@ 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
 msgid "Ascending"
 msgstr "ચઢતો ક્રમ"
 
@@ -20959,7 +20479,6 @@ 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 "Descending"
 msgstr "ઊતરતો ક્રમ"
 
@@ -21057,14 +20576,14 @@ msgstr "આ ક્ષેત્રો ક્રમમાં બતાવો (_S):
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD કોડ"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "સંપૂર્ણ હેડર"
 
@@ -21084,19 +20603,25 @@ msgstr ""
 "તમારા કોષ્ટકમાં સ્તંભ ઉમેરવા માટે, તેને એવા સ્થાનમાં ખેંચો\n"
 "કે જેમાં તમે તેને જોવા માંગો."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d વસ્તુ)"
-msgstr[1] "%s : %s (%d વસ્તુઓ)"
+msgstr "%s : %s (%d વસ્તુ)"
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d વસ્તુઓ)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d વસ્તુ)"
-msgstr[1] "%s (%d વસ્તુઓ)"
+msgstr "%s (%d વસ્તુ)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d વસ્તુઓ)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21176,69 +20701,65 @@ msgstr "હરોળની અનન્ય ઊંચાઈ"
 msgid "Frozen"
 msgstr "ઠંડુ થયેલ"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "વર્તમાન દેખાવ બદલો"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "ચઢતા ક્રમમાં ગોઠવો"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "ઊતરતા ક્રમમાં ગોઠવો"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "ક્રમમાં ગોઠવો નહિં"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "આ ક્ષેત્ર દ્વારા જૂથ પાડો"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "બોક્સ દ્વારા જૂથ"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "આ સ્તંભ કાઢી નાખો"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "સ્તંભ ઉમેરો..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "ગોઠવણી"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "શ્રેષ્ઠ રીતે બંધબેસતું"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "સ્તંભોનું બંધારણ ઘડો..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "વર્તમાન દેખાવ બદલો..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "આના પ્રમાણે ક્રમમાં ગોઠવો"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "ફોન્ટ સુયોજિત કરો"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "ક્રમમાં ગોઠવવાની જાણકારી"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21290,7 +20811,7 @@ msgid "This should test the minicard canvas item"
 msgstr "આણે મિનિકાર્ડ કેનવાસ વસ્તુને ચકાસવી જોઈએ"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "ઘટના પ્રોસેસર"
 
@@ -21303,57 +20824,57 @@ 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
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "ન્યાય"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "લંબગોળો વાપરો"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "લંબગોળો"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "લીટી લપેટો"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "અક્ષરો તોડો"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "મહત્તમ લીટીઓ"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "નવી લીટીઓને પરવાનગી આપો"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "કિનારીઓ દોરો"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "પાશ્વ ભાગ દોરો"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "બટન દોરો"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "કર્સરની સ્થિતિ"
 
@@ -21361,59 +20882,59 @@ msgstr "કર્સરની સ્થિતિ"
 msgid "Emulate label resize"
 msgstr "લેબલનું માપ બદલવાનું ઈમ્યુલેટ કરો"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "ઈનપુટ પદ્ધતિઓ"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "ઘાટુ"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "ચેકી નાખવાનું"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "એન્કર"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "ક્લિપ પહોળાઈ"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "ક્લિપ ઊંચાઈ"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "ક્લિપ"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "ક્લિપ લંબચોરસ ભરો"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "X ઓફસેટ"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Y ઓફસેટ"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "લખાણની પહોળાઈ"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "લખાણની ઊંચાઈ"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "IM સંદર્ભ"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "પોપ-અપ નિયંત્રિત કરો"
 
diff --git a/po/hu.po b/po/hu.po
index 91b9654d8f..2eeb347ea7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,26 +2,26 @@
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 # meeting - találkozó
-#appointment- értekezlet
+# appointment- értekezlet
+#
 # Szabolcs Ban <shooby@gnome.hu>, 2000.
 # Andras Timar <timar@gnome.hu>, 2001, 2002, 2003, 2004.
 # Zsiraf <zsiraf@mylinux.hu>, 2003.
 # Laszlo Dvornik <dvornik@gnome.hu>, 2004.
 # Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005, 2006.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-07 06:12+0100\n"
-"PO-Revision-Date: 2006-03-18 23:29+0100\n"
+"POT-Creation-Date: 2006-05-24 05:36+0200\n"
+"PO-Revision-Date: 2006-05-25 03:42+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -63,32 +63,32 @@ msgstr "Névjegyek: "
 msgid "evolution minicard"
 msgstr "evolution minikártya"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Vannak figyelmeztetések."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Vannak ismétlődései."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Ez egy találkozó."
 
-#: ../a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Naptáresemény összefoglalója: %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Naptáresemény: nincs összefoglalója."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "naptáresemény megjelenítése"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Fókusz elkapása"
 
@@ -117,14 +117,14 @@ msgstr "Ugrás dátumra"
 msgid "a table to view and select the current time range"
 msgstr "a megjelenítendő tábla és válassza ki a jelenlegi időtartamot"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "%d esemény tartozik hozzá."
 msgstr[1] "%d esemény tartozik hozzá."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Nem tartozik hozzá esemény."
 
@@ -218,21 +218,21 @@ msgstr "Ugrás gomb"
 msgid "Click here, you can find more events."
 msgstr "Kattintson ide további események kereséséhez."
 
-#: ../a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Hónapnézet: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:162
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Hétnézet: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:193
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "naptárnézet egy hónaphoz"
 
-#: ../a11y/calendar/ea-week-view.c:195
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "naptárnézet egy vagy több héthez"
 
@@ -548,9 +548,9 @@ msgstr "Automatikus kiegészítés beállítása itt"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Névjegyek"
 
@@ -806,10 +806,11 @@ msgstr "Ú_j címjegyzék"
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/e-calendar-table.c:1194
 #: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Törlés"
 
@@ -819,11 +820,11 @@ msgstr "Mentés Vcardként..."
 
 #: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Névjegyforrás-választó"
 
@@ -832,12 +833,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Sikertelen hitelesítés.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Adja meg %s jelszavát (%s felhasználó)"
@@ -1019,9 +1020,9 @@ msgid ""
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
 msgstr ""
-"A keresési szűrő a keresett objektumok típusa a keresés végrehajtása "
-"közben. Ennek módosítása nélkül a keresés a \"személy\" "
-"objektumosztályán lesz végrehajtva."
+"A keresési szűrő a keresett objektumok típusa a keresés végrehajtása közben. "
+"Ennek módosítása nélkül a keresés a \"személy\" objektumosztályán lesz "
+"végrehajtva."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
@@ -1047,8 +1048,8 @@ msgid ""
 "vulnerable to security exploits."
 msgstr ""
 "Ez a beállítás azt jelenti, hogy a kiszolgáló nem támogatja sem az SSL, sem "
-"a TLS protokollt. Emiatt a kapcsolat nem lesz biztonságos és "
-"sebezhetővé válik a biztonsági hibákkal szemben."
+"a TLS protokollt. Emiatt a kapcsolat nem lesz biztonságos és sebezhetővé "
+"válik a biztonsági hibákkal szemben."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1073,8 +1074,8 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "A keresési alap a bejegyzésnek az a megkülönböztető neve, ahol a keresés "
-"kezdődik majd. Amennyiben üresen hagyja, a keresés a könyvtárfa "
-"gyökerében fog kezdődni."
+"kezdődik majd. Amennyiben üresen hagyja, a keresés a könyvtárfa gyökerében "
+"fog kezdődni."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -2545,6 +2546,22 @@ msgstr ""
 "A névjegyadat érvénytelen:\n"
 "\n"
 
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "\"%s\" formátuma érvénytelen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s\"%s\" formátuma érvénytelen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s\"%s\" üres"
+
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Érvénytelen névjegy."
@@ -2702,8 +2719,8 @@ msgstr "_IM szolgáltatás:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:239
-#: ../plugins/exchange-operations/exchange-contacts.c:228
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "He_ly:"
 
@@ -2947,12 +2964,13 @@ msgstr "_Kivágás"
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1182
 #: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Másolás"
 
@@ -3427,9 +3445,9 @@ msgid ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
-"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy a "
-"címjegyzék nincs megjelölve, vagy még nem lett letöltve kapcsolat nélküli "
-"használatra. A letöltéséhez nyissa meg egyszer online módban."
+"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy a címjegyzék "
+"nincs megjelölve, vagy még nem lett letöltve kapcsolat nélküli használatra. "
+"A letöltéséhez nyissa meg egyszer online módban."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
@@ -3437,16 +3455,16 @@ msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
-"Nem nyitható meg a címjegyzék. Ellenőrizze, hogy a(z) %s útvonal "
-"létezik-e, és van-e jogosultsága az eléréséhez."
+"Nem nyitható meg a címjegyzék. Ellenőrizze, hogy a(z) %s útvonal létezik-e, "
+"és van-e jogosultsága az eléréséhez."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:112
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy helytelen "
-"URI-t adott meg, vagy az LDAP-kiszolgáló elérhetetlen."
+"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy helytelen URI-t "
+"adott meg, vagy az LDAP-kiszolgáló elérhetetlen."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
@@ -3463,8 +3481,8 @@ msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
-"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy helytelen "
-"URI-t adott meg, vagy a kiszolgáló elérhetetlen."
+"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy helytelen URI-t "
+"adott meg, vagy a kiszolgáló elérhetetlen."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
 msgid ""
@@ -3759,7 +3777,7 @@ msgstr "Formátum"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Élőfej"
@@ -3863,9 +3881,9 @@ msgstr "Árnyalás"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:229
-#: ../plugins/exchange-operations/exchange-contacts.c:211
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Méret:"
 
@@ -4031,7 +4049,9 @@ msgstr ""
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr "Ezekről az értekezletekről minden információ visszavonhatatlanul törlésre kerül."
+msgstr ""
+"Ezekről az értekezletekről minden információ visszavonhatatlanul törlésre "
+"kerül."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
@@ -4164,22 +4184,24 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr ""
-"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog tudni a "
-"napló törléséről."
+"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog "
+"tudni a napló törléséről."
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog tudni a találkozó lemondásáról."
+msgstr ""
+"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog "
+"tudni a találkozó lemondásáról."
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
-"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog tudni a feladat "
-"törléséről."
+"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog "
+"tudni a feladat törléséről."
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
@@ -4201,17 +4223,23 @@ msgstr ""
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
-msgstr "Néhány melléklet még letöltés alatt áll. Ha menti az értekezletet, az a mellékletek elveszését fogja okozni."
+msgstr ""
+"Néhány melléklet még letöltés alatt áll. Ha menti az értekezletet, az a "
+"mellékletek elveszését fogja okozni."
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
-msgstr "Néhány melléklet még letöltés alatt áll. Ha menti a feladatot, az a mellékletek elveszését fogja okozni."
+msgstr ""
+"Néhány melléklet még letöltés alatt áll. Ha menti a feladatot, az a "
+"mellékletek elveszését fogja okozni."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
-msgstr "Néhány funkció nem biztos, hogy megfelelően fog működni a jelenlegi kiszolgálóval."
+msgstr ""
+"Néhány funkció nem biztos, hogy megfelelően fog működni a jelenlegi "
+"kiszolgálóval."
 
 #: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
@@ -4292,8 +4320,8 @@ msgid ""
 "a supported version."
 msgstr ""
 "Egy nem támogatott GroupWise kiszolgálóhoz csatlakozik, emiatt problémákat "
-"tapasztalhat az Evolution használata közben. A legjobb eredmények "
-"érdekében a kiszolgálót frissíteni kell egy támogatott verzióra."
+"tapasztalhat az Evolution használata közben. A legjobb eredmények érdekében "
+"a kiszolgálót frissíteni kell egy támogatott verzióra."
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "You have changed this appointment, but not yet saved it."
@@ -4330,7 +4358,7 @@ msgid "_Save Changes"
 msgstr "_Változtatások mentése"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Küldés"
 
@@ -4448,9 +4476,9 @@ msgstr "Feljegyzések"
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Feladatok"
@@ -4873,7 +4901,8 @@ msgid ""
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
 "A Szabad/foglalt adatokhoz használt tartalék URL sablon, a %u az e-mail cím "
-"felhasználónév részével, a %d pedig annak tartomány részével lesz helyettesítve."
+"felhasználónév részével, a %d pedig annak tartomány részével lesz "
+"helyettesítve."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
@@ -5040,10 +5069,10 @@ msgstr "Nyomtatás"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../plugins/hula-account-setup/camel-hula-listener.c:379
 #: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -5056,8 +5085,8 @@ msgid ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
-"Ez a művelet véglegesen eltávolítja a megadott időnél régebbi eseményeket. Ha "
-"folytatja, akkor ezek az események visszavonhatatlanul törlődnek."
+"Ez a művelet véglegesen eltávolítja a megadott időnél régebbi eseményeket. "
+"Ha folytatja, akkor ezek az események visszavonhatatlanul törlődnek."
 
 #: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
@@ -5418,7 +5447,7 @@ msgid "Display"
 msgstr "Megjelenítés"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Szabad/elfoglalt"
@@ -5615,7 +5644,9 @@ msgstr "A feladatlista elemeiről helyi másolat készítése kapcsolat nélkül
 
 #: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Copy memo list contents locally for offline operation"
-msgstr "A feljegyzéslista elemeiről helyi másolat készítése kapcsolat nélküli munkához"
+msgstr ""
+"A feljegyzéslista elemeiről helyi másolat készítése kapcsolat nélküli "
+"munkához"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
@@ -5803,7 +5834,7 @@ msgstr "_Mellékletsáv megjelenítése"
 #: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5875,8 +5906,8 @@ msgid "No summary"
 msgstr "Nincs összefoglaló"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2654
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "melléklet"
 
@@ -5987,7 +6018,7 @@ msgstr "_Naptár:"
 #: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Sz_ervező:"
 
@@ -6008,7 +6039,7 @@ msgid "Event with no end date"
 msgstr "Esemény befejeződési dátum nélkül"
 
 #: ../calendar/gui/dialogs/event-page.c:1257
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "A kezdés dátuma érvénytelen"
 
@@ -6026,25 +6057,25 @@ msgstr "A befejezés időpontja érvénytelen"
 
 #: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "A kijelölt szervezőnek már nincs fiókja."
 
 #: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "A szervezőt be kell állítani."
 
 #: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Legalább egy résztvevő szükséges."
 
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "Hozzá_adás "
 
@@ -6256,7 +6287,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Nem nyithatók meg a feljegyzések ebben: %s."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Csoport:"
@@ -6335,7 +6366,9 @@ msgstr "Minden előfordulást"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ez az értekezlet olyan ismétlődéseket tartalmaz, amelyeket az Evolution nem tud szerkeszteni."
+msgstr ""
+"Ez az értekezlet olyan ismétlődéseket tartalmaz, amelyeket az Evolution nem "
+"tud szerkeszteni."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
@@ -6508,7 +6541,7 @@ msgstr "<span weight=\"bold\">Állapot</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Befejezve"
@@ -6584,11 +6617,11 @@ msgstr "_Feladat"
 msgid "Task Details"
 msgstr "Feladat részletei"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "A lejárat dátuma érvénytelen"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nem nyithatók meg a feladatok ebben: %s."
@@ -6733,7 +6766,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s ismeretlen kiváltó okra"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Kattintson a(z) %s megnyitásához"
@@ -6832,15 +6865,15 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Igen"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nem"
@@ -6851,8 +6884,8 @@ msgstr "Nem"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -7129,25 +7162,25 @@ msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2030
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Szervező: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2034
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Szervező: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Hely: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Idő: %s %s"
@@ -7311,7 +7344,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7324,7 +7357,7 @@ msgstr "Feltételesen elfogadva"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7649,63 +7682,63 @@ msgid "Resources"
 msgstr "Erőforrások"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Egyén"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Csoport"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Erőforrás"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Szoba"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Levezető"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Szükséges résztvevők"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Esetleges résztvevő"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Nem vesz részt"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Beavatkozás szükséges"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Feltételes"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7716,14 +7749,14 @@ msgstr "Átruházva"
 msgid "Attendee                          "
 msgstr "Résztvevő                        "
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Folyamatban"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%Y %B %d, %A"
 
@@ -7732,7 +7765,7 @@ msgstr "%Y %B %d, %A"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%Y. %m. %d., %a."
 
@@ -8019,23 +8052,6 @@ msgstr "iCalendar információ"
 msgid "You must be an attendee of the event."
 msgstr "Részt kell vennie az eseményen."
 
-#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Másolás"
-
-#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Törlés"
-
-#: ../calendar/gui/memos-component.c:453
-msgid "Properties..."
-msgstr "Tulajdonságok..."
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
@@ -10128,8 +10144,8 @@ msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"Adja meg azokat a címeket, akik rejtett másolatot kapnak az üzenetről, azaz a "
-"címzettnél nem jelenik meg a címük."
+"Adja meg azokat a címeket, akik rejtett másolatot kapnak az üzenetről, azaz "
+"a címzettnél nem jelenik meg a címük."
 
 #.
 #. * Post-To
@@ -10156,7 +10172,9 @@ msgstr "Melléklet beszúrása"
 
 #: ../composer/e-msg-composer.c:828
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Nem írható alá a kimenő üzenet: Nincs beállítva tanúsítvány az aláíráshoz ehhez a postafiókhoz"
+msgstr ""
+"Nem írható alá a kimenő üzenet: Nincs beállítva tanúsítvány az aláíráshoz "
+"ehhez a postafiókhoz"
 
 #: ../composer/e-msg-composer.c:835
 msgid ""
@@ -10244,7 +10262,7 @@ msgstr ""
 "miatt: &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "Ok: &quot;{1}&quot;."
 
@@ -10254,8 +10272,8 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"Ezen szerkesztőablak bezárása az üzenet végleges eldobását jelenti, hacsak nem "
-"menti a Piszkozatok mappába. Ez lehetővé teszi az üzenet folytatását egy "
+"Ezen szerkesztőablak bezárása az üzenet végleges eldobását jelenti, hacsak "
+"nem menti a Piszkozatok mappába. Ez lehetővé teszi az üzenet folytatását egy "
 "későbbi időpontban."
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -10360,11 +10378,11 @@ msgstr "Üzenet m_entése"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Csoportmunka-szoftver"
 
@@ -10404,7 +10422,8 @@ msgid ""
 "who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>A lent megadott üzenetet mindenki automatikusan megkapja, aki akkor küld\n"
+"<small>A lent megadott üzenetet mindenki automatikusan megkapja, aki akkor "
+"küld\n"
 "levelet Önnek, amikor házon kívül van.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
@@ -10446,8 +10465,10 @@ msgid ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 msgstr ""
-"<small>Ezen a panelen beállíthatja, hogy szeretne-e értesítést kapni az Ön által elküldött üzenetek\n"
-"elolvasásáról, és hogy mit tegyen az Evolution, ha valaki tértivevényt kér Öntől.</small>"
+"<small>Ezen a panelen beállíthatja, hogy szeretne-e értesítést kapni az Ön "
+"által elküldött üzenetek\n"
+"elolvasásáról, és hogy mit tegyen az Evolution, ha valaki tértivevényt kér "
+"Öntől.</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
@@ -10531,7 +10552,7 @@ msgstr "Felül szeretné írni?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "A(z) &quot;{0}&quot; fájl már létezik."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Felülírás"
 
@@ -10699,7 +10720,7 @@ msgstr "Hiányzó dátum."
 msgid "Missing file name."
 msgstr "Hiányzó fájlnév."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Hiányzó név."
 
@@ -10987,14 +11008,14 @@ msgstr "Aláírás(ok)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Továbbított üzenet --------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "ismeretlen feladó"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1713
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11043,6 +11064,12 @@ msgstr "Fogadás dátuma"
 msgid "Date sent"
 msgstr "Küldés dátuma"
 
+#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Törlés"
+
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Törölt"
@@ -11318,7 +11345,7 @@ msgstr "Piszkozatok"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Beérkezett levelek"
 
@@ -11404,7 +11431,7 @@ msgstr "Új _mappa..."
 msgid "_Rename..."
 msgstr "Á_tnevezés..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "K_uka ürítése"
 
@@ -11547,37 +11574,37 @@ msgid "Filter on _Mailing List"
 msgstr "Szűrő a _levelezőlistára"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Üzenet nyomtatása"
 
-#: ../mail/em-folder-view.c:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Nem kérhető le az üzenet"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "Hivatkozás _címének másolása"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "_Keresőmappa létrehozása"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "Erről a _címről"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "E_rre a címre"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kattintson a(z) %s elküldéséhez"
@@ -11640,7 +11667,9 @@ msgstr "Titkosítatlan"
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr "Ez az üzenet nincs titkosítva. A tartalma megnézhető az interneten való átvitele közben."
+msgstr ""
+"Ez az üzenet nincs titkosítva. A tartalma megnézhető az interneten való "
+"átvitele közben."
 
 #: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
@@ -11651,7 +11680,10 @@ msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
-msgstr "Ez az üzenet titkosítva van, de a titkosítási eljárás gyenge. Egy harmadik személy számára nehéz lenne, de nem lehetetlen az üzenet tartalmát elfogadható időn belül visszafejteni."
+msgstr ""
+"Ez az üzenet titkosítva van, de a titkosítási eljárás gyenge. Egy harmadik "
+"személy számára nehéz lenne, de nem lehetetlen az üzenet tartalmát "
+"elfogadható időn belül visszafejteni."
 
 #: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
@@ -11661,7 +11693,9 @@ msgstr "Titkosított"
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "Ez az üzenet titkosítva van. Egy harmadik személy számára nehéz lenne az üzenet tartalmát megjeleníteni."
+msgstr ""
+"Ez az üzenet titkosítva van. Egy harmadik személy számára nehéz lenne az "
+"üzenet tartalmát megjeleníteni."
 
 #: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
@@ -11672,7 +11706,10 @@ msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
-msgstr "Ez az üzenet egy erős titkosítási eljárással van titkosítva. Egy harmadik személy számára nagyon nehéz lenne az üzenet tartalmát elfogadható időn belül megjeleníteni."
+msgstr ""
+"Ez az üzenet egy erős titkosítási eljárással van titkosítva. Egy harmadik "
+"személy számára nagyon nehéz lenne az üzenet tartalmát elfogadható időn "
+"belül megjeleníteni."
 
 #: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
@@ -11850,7 +11887,7 @@ msgstr "Hírcsoportok"
 msgid "%s attachment"
 msgstr "%s melléklet"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nem dolgozható fel az S/MIME-üzenet: Ismeretlen hiba"
 
@@ -11866,11 +11903,11 @@ msgstr "Nem támogatott titkosítási típus a levél titkosított részében"
 msgid "Unsupported signature format"
 msgstr "Nem támogatott aláírási formátum"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Hiba az aláírás ellenőrzésekor"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Ismeretlen hiba az aláírás ellenőrzésekor"
 
@@ -11946,7 +11983,9 @@ msgstr "Nem hozhatók létre \"%s\" helyen helyi levélkönyvtárak: %s"
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr "Nem olvashatók be az előző Evolution telepítés beállításai az evolution/config-ból. Az xmldb nem létezik vagy sérült."
+msgstr ""
+"Nem olvashatók be az előző Evolution telepítés beállításai az evolution/"
+"config-ból. Az xmldb nem létezik vagy sérült."
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
@@ -11998,20 +12037,20 @@ msgstr "Ne jelenjen meg többé ez az üzenet."
 msgid "Message Filters"
 msgstr "Üzenetszűrők"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "üzenet"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Üzenet mentése..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Cím hozzáadása"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "A feladó %s"
@@ -12249,7 +12288,9 @@ msgstr "Üzenetablak alapértelmezett szélessége"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Üzenet megjelenítési stílusa (\"normal\" (normál), \"full headers\" (teljes fejléc), \"source\" (forrás))"
+msgstr ""
+"Üzenet megjelenítési stílusa (\"normal\" (normál), \"full headers\" (teljes "
+"fejléc), \"source\" (forrás))"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
@@ -13776,26 +13817,28 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"quit."
 msgstr ""
 "Már létezik egy nem üres mappa itt: &quot;{1}&quot;.\n"
 "\n"
 "Választhat, hogy mellőzi ezt a mappát, felülírja vagy hozzáfűzi a tartalmát "
-"vagy kilép.\n"
+"vagy kilép."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
-msgstr "&quot;{1}&quot; olvasási tértivevényt kért. Elküldi a tértivevényt a következőnek: {0}?"
+msgstr ""
+"&quot;{1}&quot; olvasási tértivevényt kért. Elküldi a tértivevényt a "
+"következőnek: {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr "Már létezik &quot;{0}&quot; nevű mappa. Adjon meg egy másik nevet."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13803,210 +13846,217 @@ msgstr ""
 "Egy értelmes Tárgy sor hozzáadása az üzenethez segít a címzettnek képet "
 "alkotni arról, hogy miről szólhat a levél."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Valóban törölni akarja ezt a postafiókot és az összes proxyját?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Valóban törölni akarja ezt a postafiókot?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Valóban le akarja tiltani ezt a felhasználói fiókot és az összes proxyját?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Biztosan meg akar nyitni egyszerre {0} üzenetet?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
-"Valóban véglegesen el szeretné távolítani az összes törölt üzenetet az összes "
-"mappából?"
+"Valóban véglegesen el szeretné távolítani az összes törölt üzenetet az "
+"összes mappából?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
-msgstr "Valóban véglegesen el szeretné távolítani az összes törölt üzenetet a(z) &quot;{0}&quot; mappából?"
+msgstr ""
+"Valóban véglegesen el szeretné távolítani az összes törölt üzenetet a(z) "
+"&quot;{0}&quot; mappából?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Biztosan HTML formátumban akarja küldeni az üzenetet?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Valóban csak rejtett címzetteknek küldi el az üzenetet?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Valóban tárgy nélkül akarja elküldeni az üzenetet?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Ok: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Ok: &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Üres aláírás"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Nem hozható létre a(z) &quot;{0}&quot; keresőmappa."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "A(z) &quot;{0}&quot; mappa nem másolható ide: &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Nem hozható létre a(z) &quot;{0}&quot; mappa."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Nem hozható létre az átmeneti mentési könyvtár."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Nem hozható létre a mentési könyvtár, ok: &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Nem törölhető a(z) &quot;{0}&quot; mappa."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Nem törölhető a(z) &quot;{0}&quot; rendszermappa."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Nem szerkeszthető a(z) &quot;{0}&quot; keresőmappa, mivel nem létezik."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nem mozgatható a(z) &quot;{0}&quot; mappa ide: &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Nem nyitható meg a(z) &quot;{1}&quot; forrás"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Nem nyitható meg a(z) &quot;{2}&quot; forrás."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Nem nyitható meg a(z) &quot;{2}&quot; cél."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
 "license."
-msgstr "Nem olvasható be a(z) &quot;{0}&quot; licencfájl egy telepítési hiba miatt. Nem használhatja ezt a szolgáltatót, míg nem fogadta el a licencét."
+msgstr ""
+"Nem olvasható be a(z) &quot;{0}&quot; licencfájl egy telepítési hiba miatt. "
+"Nem használhatja ezt a szolgáltatót, míg nem fogadta el a licencét."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nem nevezhető át &quot;{0}&quot; erre: &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Nem nevezhető át vagy mozgatható a(z) &quot;{0}&quot; rendszermappa."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Nem menthetők a postafiók beállításai."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Nem lehet menteni a(z) &quot;{0}&quot; könyvtárba."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Nem lehet menteni a(z) &quot;{0}&quot; fájlba."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Nem állítható be a(z) &quot;{0}&quot; aláírás-parancsfájl."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
-msgstr "Ellenőrizze, hogy nem gépelte-e el a jelszavát. Ne feledje, hogy sok jelszóban a kis- és nagybetűk különböznek, a caps lock lehet, hogy be van kapcsolva."
+msgstr ""
+"Ellenőrizze, hogy nem gépelte-e el a jelszavát. Ne feledje, hogy sok "
+"jelszóban a kis- és nagybetűk különböznek, a caps lock lehet, hogy be van "
+"kapcsolva."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Nem menthető az aláírásfájl."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Törli a(z) &quot;{0}&quot;-t?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Törli a postafiókot?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Eldobja a változtatásokat?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Ne törölje"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Ne tiltsa le"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "El akarja végezni a műveletet az almappákban?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Az összes üzenetet olvasottnak jelöli meg?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Szeretné menteni a változtatásait?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Adja meg a jelszót."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Hiba a szűrődefiníciók betöltése közben."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Hiba a művelet végrehajtása közben."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Hiba a következő folyamán: {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "A fájl már létezik, de nem írható felül."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "A fájl már létezik, de nem közönséges fájl."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ha folytatja, ezeket az üzeneteket később nem állíthatja majd vissza."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14014,11 +14064,11 @@ msgstr ""
 "Ha törli a mappát, a tartalma és alkönyvtárainak tartalma véglegesen "
 "törlődik."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ha folytatja, az összes proxy felhasználói fiók véglegesen törlésre kerül."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14026,29 +14076,31 @@ msgstr ""
 "Ha folytatja, a postafiók információi és az\n"
 "összes proxy információ véglegesen törlésre kerül."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ha folytatja, a postafiók információi véglegesen törlésre kerülnek."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "Ha kilép, ezek az üzenetek nem kerülnek elküldésre az Evolution újraindításáig."
+msgstr ""
+"Ha kilép, ezek az üzenetek nem kerülnek elküldésre az Evolution "
+"újraindításáig."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Kihagy"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Érvénytelen hitelesítés"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Levélszűrők automatikusan frissítve."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14057,38 +14109,38 @@ msgid ""
 msgstr ""
 "Sok e-mail rendszer a csak rejtett címzetteknek küldött üzenetekhez hozzáad "
 "egy Apparently-to fejlécet. Ez a fejléc mindenképpen megjeleníti az összes "
-"címzettet az üzenetében. Ennek megelőzése érdekében adjon meg legalább "
-"egy Címzett vagy Másolat címet."
+"címzettet az üzenetében. Ennek megelőzése érdekében adjon meg legalább egy "
+"Címzett vagy Másolat címet."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Az összes üzenetet olvasottnak jelöli meg"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Az összes üzenet megjelölése olvasottként a kijelölt mappában"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Hiányzó mappa."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Nincs forrás kiválasztva."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Túl sok üzenet egyidejű megnyitása sokáig tarthat."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Kérem ellenőrizze a postafiókjának beállításait és próbálja újra."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Engedélyezze a postafiókot vagy küldje másik fiók használatával."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14096,7 +14148,7 @@ msgstr ""
 "Kérem írjon be egy érvényes e-mail címet a Címzett: mezőbe. A beviteli mező "
 "melletti Címzett gombra kattintva kereshet e-mail címeket."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14108,49 +14160,49 @@ msgstr ""
 "{0}\n"
 "Mindenképp el akarja küldeni?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Adjon meg egy egyedi nevet az aláírás azonosításához."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Kérem várjon."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probléma a(z) &quot;{0}&quot; régi levélmappa átköltöztetése közben."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Kiszolgáló lekérdezése"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "A támogatott hitelesítési mechanizmusok listájának lekérdezése a "
 "kiszolgálótól."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Olvasási tértivevény kérés."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Valóban törli &quot;{0}&quot; mappát és minden almappáját?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "A keresőmappák automatikusan frissítve lettek."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Tértivevény küldése"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "A tanúsítvány már létezik"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14158,7 +14210,7 @@ msgstr ""
 "A rendszermappák a Ximian Evolution megfelelő működéséhez szükségesek és nem "
 "lehet őket átnevezni, mozgatni vagy törölni."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14167,13 +14219,14 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"A címzettként megadott címlista a lista címzettjeinek rejtésére van beállítva.\n"
+"A címzettként megadott címlista a lista címzettjeinek rejtésére van "
+"beállítva.\n"
 "\n"
 "Sok e-mail rendszer az ilyen üzenetekhez hozzáad egy Apparently-to fejlécet. "
 "Ez a fejléc megjeleníti az összes címzettet az üzenetében. Ennek "
 "megelőzésére adjon meg legalább egy Címzett vagy Másolat címet. "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14187,7 +14240,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "és frissítve lettek."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14201,21 +14254,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "és frissítve lettek."
 
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application. "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors and "
-"resend."
-msgstr ""
-"Ez az üzenet a &quot;sendmail&quot; külső alkalmazáson keresztül került elküldésre. A sendmail a következő hibát jelentette: 67-es állapot: a levél nincs elküldve.\n"
-"Az üzenet a Postázandó üzenetek mappába került. Ellenőrizze az üzenet hibátlanságát és küldje újra."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "A parancsfájlnak létezőnek és végrehajthatónak kell lennie."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14223,17 +14266,19 @@ msgstr ""
 "Lehet, hogy ezt a mappát közvetett módon hozta létre, ha szükséges,\n"
 "nyissa meg a keresőmappa szerkesztőt és hozza létre közvetlenül."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "Ez az üzenet nem küldhető el, mivel a küldéshez kijelölt postafiók nincs engedélyezve"
+msgstr ""
+"Ez az üzenet nem küldhető el, mivel a küldéshez kijelölt postafiók nincs "
+"engedélyezve"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Ez az üzenet nem küldhető el, mivel nem adott meg egyetlen címzettet sem"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14241,59 +14286,63 @@ msgstr ""
 "Ez a kiszolgáló nem támogatja ezt a hitelesítési típust és lehet, hogy "
 "egyáltalán nem támogatja a hitelesítést."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Az aláírás megváltozott, de nem lett mentve."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr "Ez megjelöli összes üzenetet olvasottként a kijelölt mappában és annak almappáiban."
+msgstr ""
+"Ez megjelöli összes üzenetet olvasottként a kijelölt mappában és annak "
+"almappáiban."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nem lehet kapcsolódni a GroupWise kiszolgálóhoz."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "Nem nyitható meg az ehhez a postafiókhoz tartozó piszkozatok mappa. Szeretné használni a rendszer alapértelmezett piszkozatok mappáját?"
+msgstr ""
+"Nem nyitható meg az ehhez a postafiókhoz tartozó piszkozatok mappa. Szeretné "
+"használni a rendszer alapértelmezett piszkozatok mappáját?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Nem olvasható be a licencfájl."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "_Alapértelmezett használata"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Az alapértelmezett Piszkozatok mappát használja?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Nem adta meg az összes szükséges információt."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Vannak el nem küldött üzenetek. Biztosan kilép?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhat létre két egyező nevű postafiókot."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Nevet kell adnia ennek a keresőmappának."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Meg kell adnia egy mappát."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14303,27 +14352,23 @@ msgstr ""
 "Kiválaszthatja a mappákat egyenként, és/vagy kiválaszthatja az összes helyi "
 "vagy távoli mappát, esetleg mindkettőt."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "A belépése &quot;{0}&quot; kiszolgálóra &quot;{0}&quot; néven sikertelen."
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "A(z) &quot;{0}&quot; tárgyú üzenete nem került kézbesítésre."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Hozzáfűzés"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Változtatások eldobása"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "T_isztítás"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "Üzenetek _megnyitása"
 
@@ -14394,7 +14439,7 @@ msgstr "%Y %b. %d"
 msgid "Messages"
 msgstr "Üzenetek"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Üzenetlista létrehozása"
 
@@ -14579,7 +14624,9 @@ msgstr "Azonnali üzenetküldő névjegyek"
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
 msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Névjegyinformációk és képek szinkronizálása a gaim partnerlistából szabályos időközönként"
+msgstr ""
+"Névjegyinformációk és képek szinkronizálása a gaim partnerlistából szabályos "
+"időközönként"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
@@ -14591,7 +14638,10 @@ msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
-msgstr "Automatikusan feltölti a címjegyzékét nevekkel és e-mail címekkel amikor üzenetekre válaszol. Ezen kívül az azonnali üzenő névjegyinformációkat is kitölti a partnerlistája alapján."
+msgstr ""
+"Automatikusan feltölti a címjegyzékét nevekkel és e-mail címekkel amikor "
+"üzenetekre válaszol. Ezen kívül az azonnali üzenő névjegyinformációkat is "
+"kitölti a partnerlistája alapján."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14729,7 +14779,9 @@ msgstr "Alapértelmezett források"
 msgid ""
 "Provides functionallity for marking a calendar or addressbook as the default "
 "one."
-msgstr "Alapvető funkcionalitást biztosít egy naptár vagy címjegyzék kijelöléséhez alapértelmezettként."
+msgstr ""
+"Alapvető funkcionalitást biztosít egy naptár vagy címjegyzék kijelöléséhez "
+"alapértelmezettként."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -14833,29 +14885,30 @@ msgstr "Mappák mérete"
 msgid "Exchange Settings"
 msgstr "Exchange beállításai"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "_Hitelesítés"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "Hitelesítés típusa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "_Támogatott típusok lekérdezése"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:193
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:166
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
-"Az Evolution jelenleg kapcsolat nélküli módban van. Most nem hozhat létre vagy módosíthat mappákat.\n"
+"Az Evolution jelenleg kapcsolat nélküli módban van. Most nem hozhat létre "
+"vagy módosíthat mappákat.\n"
 "Az ilyen műveletek végrehajtásához kapcsolódjon az internetre."
 
 #. User entered a wrong existing
@@ -15030,14 +15083,14 @@ msgstr "Exchange mappafa"
 msgid "Unsubscribe Folder..."
 msgstr "Leiratkozás mappáról..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Valóban leiratkozik a(z) \"%s\" mappáról?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Leiratkozás a következőről: \"%s\""
@@ -15146,7 +15199,9 @@ msgstr "Feliratkozás más felhasználó naptárjára"
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr "Exchange felhasználói fiókokra jellemző műveleteket és szolgáltatásokat kezelő bővítmény."
+msgstr ""
+"Exchange felhasználói fiókokra jellemző műveleteket és szolgáltatásokat "
+"kezelő bővítmény."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -15164,7 +15219,9 @@ msgstr "Nem jeleníthetők meg a mappák."
 msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
-msgstr "Az Exchange felhasználói fiók beállításainak módosításai az Evolution újraindítása után lépnek életbe."
+msgstr ""
+"Az Exchange felhasználói fiók beállításainak módosításai az Evolution "
+"újraindítása után lépnek életbe."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15255,7 +15312,8 @@ msgstr ""
 "ezeket be kell kapcsolnia, hogy használhassa az\n"
 "Exchange Connectort.\n"
 "\n"
-"Az Exchange adminisztrátorral közölje a következő hivatkozáson található információkat:\n"
+"Az Exchange adminisztrátorral közölje a következő hivatkozáson található "
+"információkat:\n"
 "\n"
 "{0}\n"
 "  "
@@ -15285,7 +15343,9 @@ msgstr "Általános hiba"
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr "Ha az Outlook Web Access más elérési úton fut, adja meg azt a felhasználói fiók beállításai párbeszédablakban."
+msgstr ""
+"Ha az Outlook Web Access más elérési úton fut, adja meg azt a felhasználói "
+"fiók beállításai párbeszédablakban."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
@@ -15413,19 +15473,25 @@ msgstr "Csak egyetlen Exchange fiókot állíthat be."
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
-msgstr "A jelenlegi területhasználata: {0} KB. Próbáljon felszabadítani egy kis helyet néhány levél törlésével."
+msgstr ""
+"A jelenlegi területhasználata: {0} KB. Próbáljon felszabadítani egy kis "
+"helyet néhány levél törlésével."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr "A jelenlegi területhasználata: {0} KB. Mostantól nem lesz képes leveleket sem küldeni, sem fogadni."
+msgstr ""
+"A jelenlegi területhasználata: {0} KB. Mostantól nem lesz képes leveleket "
+"sem küldeni, sem fogadni."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr "A jelenlegi területhasználata: {0} KB. Mostantól nem lesz képes leveleket küldeni, amíg néhány levél törlésével nem szabadít fel egy kis helyet."
+msgstr ""
+"A jelenlegi területhasználata: {0} KB. Mostantól nem lesz képes leveleket "
+"küldeni, amíg néhány levél törlésével nem szabadít fel egy kis helyet."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15464,7 +15530,7 @@ msgstr "Lehetővé teszi a leiratkozást levélmappákról a mappagyökér helyi
 msgid "Unsubscribe Folders"
 msgstr "Leiratkozás mappákról"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Feladatlista"
 
@@ -15723,7 +15789,9 @@ msgstr "Nincs kimeneti könyvtár!"
 msgid ""
 "The output directory was not found on iPod! Please ensure that iPod has been "
 "correctly set up and try again."
-msgstr "A kimeneti könyvtár nem található az iPodon! Győződjön meg róla, hogy az iPod beállításai helyesek és próbálkozzon újra."
+msgstr ""
+"A kimeneti könyvtár nem található az iPodon! Győződjön meg róla, hogy az "
+"iPod beállításai helyesek és próbálkozzon újra."
 
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
@@ -15848,7 +15916,9 @@ msgstr "A csatolt naptár érvénytelen"
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "Az üzenet azt állítja, hogy egy naptárt tartalmaz, de a naptár nem egy érvényes iCalendar."
+msgstr ""
+"Az üzenet azt állítja, hogy egy naptárt tartalmaz, de a naptár nem egy "
+"érvényes iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:1202
@@ -16040,7 +16110,9 @@ msgstr "%Y. %B %e. %A %l.%M.%S %P"
 #: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> %s közvetítésével a következő információt tette közzé a találkozóról:"
+msgstr ""
+"<b>%s</b> %s közvetítésével a következő információt tette közzé a "
+"találkozóról:"
 
 #: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
@@ -16055,7 +16127,9 @@ msgstr "<b>%s</b> átruházta Önre a következő találkozót:"
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> %s közvetítésével arra kéri, hogy vegyen részt a következő találkozón:"
+msgstr ""
+"<b>%s</b> %s közvetítésével arra kéri, hogy vegyen részt a következő "
+"találkozón:"
 
 #: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
@@ -16075,7 +16149,9 @@ msgstr "<b>%s</b> szeretné Önt hozzáadni egy létező találkozóhoz:"
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> szeretné megkapni a legújabb információkat a következő találkozóról:"
+msgstr ""
+"<b>%s</b> szeretné megkapni a legújabb információkat a következő "
+"találkozóról:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
@@ -16100,7 +16176,9 @@ msgstr "<b>%s</b> a következő találkozóváltoztatásokat javasolja:"
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> %s közvetítésével elutasította a következő találkozóváltoztatásokat:"
+msgstr ""
+"<b>%s</b> %s közvetítésével elutasította a következő "
+"találkozóváltoztatásokat:"
 
 #: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
@@ -16417,8 +16495,9 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
-"Egy e-mail üzenet kerül elküldésre a következő URL címre: \"{0}\". Az üzenetet "
-"elküldheti automatikusan, vagy előtte megnézheti és megváltoztathatja.\n"
+"Egy e-mail üzenet kerül elküldésre a következő URL címre: \"{0}\". Az "
+"üzenetet elküldheti automatikusan, vagy előtte megnézheti és "
+"megváltoztathatja.\n"
 "\n"
 "Az üzenet elküldése után hamarosan meg kell kapnia a levelezőlista válaszát."
 
@@ -16454,7 +16533,8 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"A művelet nem hajtható végre. Ez azt jelenti, hogy a művelethez tartozó fejléc nem tartalmaz kezelhető műveleteket.\n"
+"A művelet nem hajtható végre. Ez azt jelenti, hogy a művelethez tartozó "
+"fejléc nem tartalmaz kezelhető műveleteket.\n"
 "\n"
 "Fejléc: {0}"
 
@@ -16485,8 +16565,8 @@ msgstr "Ü_zenet küldése"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
-"Kapcsolat felvétele azon levelezőlista tulajdonosával, amelyhez ez az üzenet"
-"tartozik"
+"Kapcsolat felvétele azon levelezőlista tulajdonosával, amelyhez ez az "
+"üzenettartozik"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get an archive of the list this message belongs to"
@@ -16494,7 +16574,9 @@ msgstr "Azon levelezőlista archívumának lekérése, amelyhez ez az üzenet ta
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "Azon levelezőlista használatára vonatkozó szabályok lekérése, amelyhez ez az üzenet tartozik"
+msgstr ""
+"Azon levelezőlista használatára vonatkozó szabályok lekérése, amelyhez ez az "
+"üzenet tartozik"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
@@ -16600,7 +16682,8 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"Példabővítmény, amely bemutat egy formázóbővítményt, amely lehetővé teszi a HTML üzenetek letiltásának kiválasztását.\n"
+"Példabővítmény, amely bemutat egy formázóbővítményt, amely lehetővé teszi a "
+"HTML üzenetek letiltásának kiválasztását.\n"
 "\n"
 "Ez a bővítmény csak egy nem támogatott példakód.\n"
 
@@ -16748,7 +16831,9 @@ msgstr "Spamassassin (beépített)"
 msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
-msgstr "A levélszemetet szűri a Spamassassin használatával. A bővítmény működéséhez a Spamassassinnak telepítve kell lennie."
+msgstr ""
+"A levélszemetet szűri a Spamassassin használatával. A bővítmény működéséhez "
+"a Spamassassinnak telepítve kell lennie."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
@@ -16756,7 +16841,9 @@ msgstr "Spamassassin levélszemét-bővítmény"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "Egy üzenet összes mellékletének vagy részének együttes mentésére szolgáló bővítmény."
+msgstr ""
+"Egy üzenet összes mellékletének vagy részének együttes mentésére szolgáló "
+"bővítmény."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -17005,64 +17092,72 @@ msgid "Default window height"
 msgstr "Alapértelmezett ablakmagasság"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Alapértelmezett ablakállapot"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Alapértelmezett ablakszélesség"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Az indításkor alapértelmezésként megjelenő összetevő azonosítója vagy álneve."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Utoljára frissített konfiguráció verziója"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "A kapcsolat nélküli használatra szinkronizálandó mappák elérési útjainak "
 "listája"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Nyomtató beállításai"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Az oldalsáv látható"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "A fejlesztői verzióra figyelmeztető párbeszédablak átugrása"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Az Evolution konfiguráció verziója, major/minor/konfiguráció szintekkel (Például \"2.6.0\")."
+msgstr ""
+"Az Evolution konfiguráció verziója, major/minor/konfiguráció szintekkel "
+"(Például \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "A főablak alapértelmezett magassága, képpontokban."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "A főablak alapértelmezett szélessége, képpontokban."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Az oldalsáv alapértelmezett szélessége, képpontokban."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
-msgstr "Az utoljára frissített Evolution konfiguráció verziója, major/minor/konfiguráció szintekkel (Például \"2.6.0\")."
+msgstr ""
+"Az utoljára frissített Evolution konfiguráció verziója, major/minor/"
+"konfiguráció szintekkel (Például \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17072,39 +17167,43 @@ msgstr ""
 "\" (ikonok), \"both\", (mindkettő), \"toolbar\" (eszköztár). Ha a \"toolbar"
 "\" van beállítva, a gombok stílusa a GNOME hasonló beállításához igazodik."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Az eszköztár látható"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Ha be van állítva, az Evolution kapcsolat nélküli módban fog indulni, "
 "kapcsolódott mód helyett."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Az ablak maximális méretű legyen-e?"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Az oldalsáv látható legyen-e."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Az eszköztár látható legyen-e."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Ha be van állítva, az Evolution fejlesztői verzióiban nem jelenik meg a "
 "figyelmeztető ablak."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Az eszköztárgombok láthatóak legyenek-e?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Ablak gombjainak stílusa"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Az ablak gombjai láthatóak"
 
@@ -17223,7 +17322,7 @@ msgstr "Nem futtatható a Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Bán Szabolcs <shooby@gnome.hu>\n"
@@ -17232,31 +17331,35 @@ msgstr ""
 "Tímár András <timar@gnome.hu>\n"
 "Zsiráf <zsiraf@mylinux.hu>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "M_unka a hálózatban"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "K_apcsolat nélküli munka"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Kapcsolat nélküli munka"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Az Evolution jelenleg a hálózatban van. Kattintson erre a gombra a kapcsolat nélküli munkához."
+msgstr ""
+"Az Evolution jelenleg a hálózatban van. Kattintson erre a gombra a kapcsolat "
+"nélküli munkához."
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Az Evolution felkészül a kapcsolat nélküli munkára."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Az Evolution jelenleg kapcsolat nélküli módban van. Kattintson erre a gombra a hálózatra kapcsolódáshoz."
+msgstr ""
+"Az Evolution jelenleg kapcsolat nélküli módban van. Kattintson erre a gombra "
+"a hálózatra kapcsolódáshoz."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Váltás erre: %s"
@@ -17341,7 +17444,7 @@ msgstr ""
 "importálásának folyamatán."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17363,7 +17466,8 @@ msgstr ""
 "Üdvözöljük! Köszönjük, hogy letöltötte az Evolution csoportmunka-szoftver\n"
 "előzetes verzióját.\n"
 "\n"
-"Az Evolution ezen verziója még nincs kész. Közeledik a befejezéshez, de vannak\n"
+"Az Evolution ezen verziója még nincs kész. Közeledik a befejezéshez, de "
+"vannak\n"
 "befejezetlen vagy csak félig működő szolgáltatások.\n"
 "\n"
 "Ha az Evolution stabil verziójára vágyik, akkor távolítsa el ezt a verziót,\n"
@@ -17376,7 +17480,7 @@ msgstr ""
 "Reméljük, élvezni fogja kemény munkánk eredményét, és várjuk\n"
 "hozzájárulását! \n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17384,35 +17488,35 @@ msgstr ""
 "Köszönettel\n"
 "Az Evolution Csapat\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Ne jelenítse meg többé"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Az Evolution indítása a megadott összetevő aktiválásával"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Indítás online módban"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Az összes Evolution-összetevő kényszerített bezárása"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 1.4-ről költöztetés kényszerítése"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden összetevő hibakereső üzeneteit fájlba irányítja."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Minden bővítmény betöltésének kikapcsolása."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18080,6 +18184,12 @@ msgstr "Összes _névjegy másolása..."
 msgid "Contact _Preview"
 msgstr "Névjegy_előnézet"
 
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Másolás"
+
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kijelölt névjegyek másolása másik mappába..."
@@ -18759,7 +18869,9 @@ msgstr "Az összes üzenet ki_jelölése"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Azoknak és csak azoknak az üzeneteknek a kijelölése, amelyek nincsenek jelenleg kijelölve"
+msgstr ""
+"Azoknak és csak azoknak az üzeneteknek a kijelölése, amelyek nincsenek "
+"jelenleg kijelölve"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
@@ -19892,7 +20004,7 @@ msgid "_Edit..."
 msgstr "_Szerkesztés..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20336,12 +20448,12 @@ msgstr "Szöveg"
 msgid "Find _Now"
 msgstr "Keresés m_ost"
 
-#: ../widgets/misc/e-selection-model-array.c:546
+#: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "Kurzor sora"
 
-#: ../widgets/misc/e-selection-model-array.c:553
+#: ../widgets/misc/e-selection-model-array.c:554
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "Kurzor oszlopa"
@@ -20672,14 +20784,14 @@ msgstr "Me_zők megjelenítési sorrendje:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD kód"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Teljes fejléc"
 
@@ -20845,17 +20957,17 @@ msgstr "Oszlopok formázása..."
 msgid "Customize Current View..."
 msgstr "Jelenlegi nézet testreszabása..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Betűkészlet"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Rendezési információ"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
diff --git a/po/id.po b/po/id.po
index 9366e56169..db949c899a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,10 +6,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution HEAD\n"
+"Project-Id-Version: evolution gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-07 10:26+0700\n"
-"PO-Revision-Date: 2006-07-07 11:01+0700\n"
+"POT-Creation-Date: 2006-04-05 13:12+0200\n"
+"PO-Revision-Date: 2006-06-01 16:15+0700\n"
 "Last-Translator: Mohammad DAMT <mdamt@bisnisweb.com>\n"
 "Language-Team: Indonesian <kontak@id.gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "buku alamat evolution"
 
@@ -33,11 +33,11 @@ msgstr "Kontak Baru"
 msgid "New Contact List"
 msgstr "Buat Daftar Kontak"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "folder buku alamat %s saat ini memiliki %d kartu"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "folder buku alamat saat ini memiliki %d kartu"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -56,32 +56,32 @@ msgstr "Kontak: "
 msgid "evolution minicard"
 msgstr "evolution minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr "Ada alarmnya."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "Berulang."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "Pertemuan."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Acara: Keterangannya %s"
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "Acara: Tidak ada keterangan"
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr "kalender tampil acara"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr "Ambil Fokus"
 
@@ -110,13 +110,13 @@ msgstr "Lihat Tanggal"
 msgid "a table to view and select the current time range"
 msgstr "tabel untuk melihat dan memilih cakupan waktu saat ini"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Ada %d acara."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Tidak ada acara."
 
@@ -151,10 +151,8 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -185,10 +183,8 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -214,21 +210,21 @@ msgstr "Tombol lompat"
 msgid "Click here, you can find more events."
 msgstr "Klik di sini untuk melihat acara."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Tampilan Bulan: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Tampilan Minggu: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "kalender tampi untuk sebulan"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "tampilan kalender untuk satu minggu atau lebih"
 
@@ -318,14 +314,6 @@ msgstr "Aktifkan Awal"
 msgid "Popup Menu"
 msgstr "Menu Popup"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Togel Panel Lampiran"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "aktifkan"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -371,9 +359,9 @@ msgid ""
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"Saat ini anda dapat mengakses hanya Sistem Alamat Buku GroupWise dari "
-"Evolution saja. Silahkan pergunakan klien surat GroupWise yang lain, untuk "
-"mendapatkan Alamat GroupWise anda dan direktori Alamat Pribadi Groupwise."
+"Saat ini anda dapat mengakses hanya Sistem Alamat Buku GroupWise dari Evolution saja. "
+"Silahkan pergunakan klien surat GroupWise yang lain, untuk mendapatkan Alamat GroupWise "
+"anda dan direktori Alamat Pribadi Groupwise."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
@@ -484,8 +472,8 @@ msgid ""
 "a supported version"
 msgstr ""
 "Anda tersambung ke suatu layanan GroupWise yang tidak didukung dan bisa saja "
-"bermasalah ketika menggunakan Evolution. Untuk hasil yang maksimal, "
-"servernya harus diperbarui ke versi yang telah didukung"
+"bermasalah ketika menggunakan Evolution. Untuk hasil yang maksimal, servernya "
+"harus diperbarui ke versi yang telah didukung"
 
 #: ../addressbook/addressbook.error.xml.h:31
 msgid ""
@@ -513,7 +501,7 @@ msgid "_Discard"
 msgstr "_Abaikan"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -553,9 +541,9 @@ msgstr "Konfigurasikan auto komplet di sini"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../addressbook/gui/component/addressbook-view.c:1334
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "Alamat"
 
@@ -616,7 +604,7 @@ msgstr "Di Komputer Ini"
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Pribadi"
 
@@ -643,7 +631,7 @@ msgid "Create a new contact list"
 msgstr "Buat daftar kontak baru"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Buku Alamat Baru"
 
@@ -659,75 +647,74 @@ msgstr "Buat buku alamat baru"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Gagal saat meningkatkan pengaturan atau folder Buku Alamat."
 
-#: ../addressbook/gui/component/addressbook-config.c:331
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Basis"
 
-#: ../addressbook/gui/component/addressbook-config.c:532
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipe:"
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr ""
 "Salin isi folder ke sistem lokal agar dapat dikerjakan tanpa tersambung ke "
 "jaringan"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../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:2021
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Umum"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Buku Alamat"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Informasi server"
 
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Otentikasi"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Rincian"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Mencari"
 
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Mengunduh"
 
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Pengaturan Buku Alamat"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Dalam proses migrasi..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Dalam proses migrasi `%s':"
@@ -802,35 +789,34 @@ msgstr "Nama folder tidak boleh berisi karakter \"/\"."
 msgid "A Folder with this name already exists"
 msgstr "Folder dengan nama ini sudah ada"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Buku Alamat Baru"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1279
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Hapus"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Simpan sebagai Vcard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Pengaturan..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Hubungi Pemilih Sumber"
 
@@ -839,12 +825,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Mengakses Server LDAP secara anonim"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "Gagal melakukan otentikasi.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Silakan masukkan kata sandi untuk %s (pengguna %s)"
@@ -878,8 +864,8 @@ msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"Jumlah karakter yang harus diketikkan sebelum Evolution memulai proses auto "
-"komplit."
+"Jumlah karakter yang harus diketikkan sebelum Evolution memulai proses "
+"auto komplit."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -890,7 +876,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI untuk folder yang terakhir digunakan dalam dialog pemilih nama."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Posisi panel vertikal"
 
@@ -1028,9 +1014,9 @@ msgid ""
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
 msgstr ""
-"Cari saring adalah jenis pencarian objek, ketika menjalankan pencarian.Jika "
-"hal ini tidak dimodifikasi, oleh  pencarian default akan dilaksanakan "
-"padaobjectclass dari jenis \"orang\"."
+"Cari saring adalah jenis pencarian objek, ketika menjalankan pencarian."
+"Jika hal ini tidak dimodifikasi, oleh  pencarian default akan dilaksanakan pada"
+"objectclass dari jenis \"orang\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
@@ -1055,8 +1041,8 @@ msgid ""
 "vulnerable to security exploits."
 msgstr ""
 "Pilihan ini berarti server Anda tidak mendukung penggunaan SSL atau TLS. "
-"Artinya koneksi Anda akan tidak aman, dan anda akan rentan terhadap celah "
-"keamanan."
+"Artinya koneksi Anda akan tidak aman, dan anda akan rentan terhadap "
+"celah keamanan."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1116,8 +1102,8 @@ msgid ""
 "server."
 msgstr ""
 "Ini adalah metode yang akan digunakan oleh Evolution untuk mengenali anda. "
-"Ingat bahwa membuat ini ke \"Alamat Email\" membutuhkan akses tak dikenal ke "
-"server ldap anda."
+"Ingat bahwa membuat ini ke \"Alamat Email\" membutuhkan akses tak dikenal "
+"ke server ldap anda."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
@@ -1215,10 +1201,12 @@ msgstr "menit"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
@@ -1268,13 +1256,13 @@ msgstr "<b>Pekerjaan</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1283,7 +1271,7 @@ msgstr "Kontak"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Penyunting Kontak"
 
@@ -1325,7 +1313,7 @@ msgstr "Telepon"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Kantor"
@@ -1348,13 +1336,15 @@ msgid "_Birthday:"
 msgstr "Ulang _Tahun:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "_Kategori..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Kategori"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1441,8 +1431,8 @@ msgid "_Zip/Postal Code:"
 msgstr "Ko_de pos:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Alamat"
 
@@ -1450,15 +1440,15 @@ msgstr "Alamat"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2436,7 +2426,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nama"
@@ -2447,7 +2437,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2457,7 +2447,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2466,7 +2456,7 @@ msgid "Service"
 msgstr "Layanan"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2487,17 +2477,17 @@ msgid "Other"
 msgstr "Lainnya"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2526,20 +2516,20 @@ msgid "Changed"
 msgstr "Berubah"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2405
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Penyunting Kontak - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2783
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Pilih foto untuk orang ini"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2784
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Tidak ada gambar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2547,31 +2537,15 @@ msgstr ""
 "Data kontak salah:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
-#, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' bentuknya salah"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
-#, c-format
-msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' bentuknya salah"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#, c-format
-msgid "%s'%s' is empty"
-msgstr "%s'%s' kosong"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Kontak salah"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Tambah Kontak versi Cepat"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "_Ubah Semua"
 
@@ -2579,11 +2553,11 @@ msgstr "_Ubah Semua"
 msgid "_Full name"
 msgstr "Nama _lengkap"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
-msgstr "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "E-_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Pilih Buku Alamat"
 
@@ -2591,7 +2565,7 @@ msgstr "_Pilih Buku Alamat"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Apakah Anda benar-benar ingin\n"
 "menghapus daftar kontak (%s)?"
@@ -2608,7 +2582,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Apakah Anda benar-benar ingin\n"
 "menghapus kontak (%s)?"
@@ -2719,10 +2693,9 @@ msgid "_IM Service:"
 msgstr "Layanan _IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "_Lokasi:"
 
@@ -2735,7 +2708,7 @@ msgid "Add an email to the List"
 msgstr "Tambahkan email ke dalam Daftar"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Penyunting Daftar Kontak"
 
@@ -2768,24 +2741,24 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Ke_tikkan alamat email atau tarik dari sebuah kontak ke daftar di bawah:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Buku"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Daftar Baru?"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Anggota"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Alamat Daftar Anggota"
 
@@ -2826,18 +2799,25 @@ msgstr ""
 "Nama atau alamat email pada kontak ini sudah ada\n"
 "pada folder. Tambahkan saja?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Kolom berisi"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Kategori"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "Email diawali dengan"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Nama diawali dengan"
@@ -2854,9 +2834,9 @@ msgstr[0] "%d buah kontak"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Query"
 
@@ -2878,11 +2858,11 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Error saat mengubah kartu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Sumber"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
@@ -2891,96 +2871,95 @@ msgstr "Sumber"
 msgid "Type"
 msgstr "Tipe"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Simpan sebagai VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1259
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "B_uka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "Alamat _Baru..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Daftar Alamat _Baru..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Simpan dalam bentuk VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Meneruskan Alamat"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Meneruskan Alamat"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Kirim Pesan ke Ala_mat"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Kiri_m Pesan ke Daftar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Kirim Pesan ke Ala_mat"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Cetak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "Sal_in ke Buku Alamat..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "Pind_ahkan ke Buku Alamat..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Po_tong"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1267
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3125 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Salin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "T_empel"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Kategori Apa Saja"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "Cetak kartu"
 
@@ -3025,7 +3004,7 @@ msgid "Company Phone"
 msgstr "Telepon Kantor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Email"
@@ -3075,7 +3054,7 @@ msgid "Manager"
 msgstr "Manajer"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Telepon Seluler"
 
@@ -3084,7 +3063,7 @@ msgid "Nickname"
 msgstr "Nama panggilan"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Catatan"
 
@@ -3093,7 +3072,7 @@ msgid "Office"
 msgstr "Perkantoran"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisasi"
 
@@ -3211,7 +3190,7 @@ msgstr "Panjang kolom nama maksimal"
 msgid "Column Width"
 msgstr "Lebar Kolom"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3225,7 +3204,7 @@ msgstr ""
 "\n"
 "Silakan klik ganda di sini untuk membuat kontak baru."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3239,7 +3218,7 @@ msgstr ""
 "\n"
 "Silakan klik ganda di sini untuk membuat kontak baru."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3249,7 +3228,7 @@ msgstr ""
 "\n"
 "Mencari Kontak."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3259,7 +3238,7 @@ msgstr ""
 "\n"
 "Tidak ada isian yang dapat ditampilkan."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -3271,89 +3250,68 @@ msgstr "Terpilih"
 msgid "Has Cursor"
 msgstr "Ada Kursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Buka Link dalam Br_owser"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Salin Lokasi Link"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "Kirim Pe_san Baru Ke ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Salin Alamat _Email"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(peta)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "peta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Daftar Anggota"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Posisi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Video Chat"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Konferensi Video"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telepon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "kantor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Halaman Utama"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
-msgstr "Web Log"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "pribadi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Jabatan"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3384,7 +3342,7 @@ msgstr "Tidak ada Kontak Diri Sendiri"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Hak akses ditolak"
 
@@ -3409,7 +3367,7 @@ msgstr "Protokol tidak didukung"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Dibatalkan"
 
@@ -3473,8 +3431,8 @@ msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
-"Kami tidak bisa membuka buku alamat ini.  Tolong periksa apakah lokasi %s "
-"ada dan cukup memiliki hak akses terhadapnya."
+"Kami tidak bisa membuka buku alamat ini.  Tolong periksa apakah lokasi %s ada "
+"dan cukup memiliki hak akses terhadapnya."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:112
 msgid ""
@@ -3544,7 +3502,7 @@ msgid "Error adding list"
 msgstr "Error saat menambahkan isi daftar"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Error saat menambahkan kontak"
 
@@ -3561,7 +3519,7 @@ msgid "Error removing list"
 msgstr "Error saat menghapus daftar"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Error saat menghapus kontak"
 
@@ -3578,7 +3536,7 @@ msgstr ""
 "Membuka %d alamat akan juga membuka %d jendela baru.\n"
 "Yakin ingin menampilkan seluruh alamat ini?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3587,68 +3545,68 @@ msgstr ""
 "%s sudah ada\n"
 "Anda ingin menimpanya dengan data baru?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "Tulis ulang"
 
 #. 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontak"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Pilih Buku Alamat"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "daftar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Pindahkan kontak ke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Salin kontak ke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Pindahkan kontak ke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Salin kontak ke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "VCard Ganda"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard untuk %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Informasi alamat"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informasi alamat untuk %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Mencari dalam Buku Alamat..."
 
@@ -3737,12 +3695,12 @@ msgstr "Program Impor VCard Evolution"
 msgid "Print envelope"
 msgstr "Cetak amplop"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Cetak kontak"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Cetak kontak"
 
@@ -3791,7 +3749,7 @@ msgstr "Format"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Header"
@@ -3895,9 +3853,9 @@ msgstr "Bayangan"
 
 #. 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:955
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "Ukuran:"
 
@@ -4036,8 +3994,8 @@ msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
-"Menambahkan rangkuman yang berarti ke pertemuan anda akan memberikan ide "
-"bagi penerima anda tentang pertemuan anda."
+"Menambahkan rangkuman yang berarti ke pertemuan anda akan memberikan "
+"ide bagi penerima anda tentang pertemuan anda."
 
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -4132,17 +4090,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Apakah Anda ingin menghapus jadwal pertemuan ini?"
 
 #: ../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 "Apakah Anda ingin menghapus entri jurnal ini?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Apakah Anda ingin menghapus pertemuan ini?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Apakah Anda ingin menghapus tugas ini?"
 
@@ -4198,8 +4153,7 @@ msgstr ""
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
-"Surat Undangan akan dikirimkan ke semua peserta dan membolehkan konfirmasi "
-"mereka."
+"Surat Undangan akan dikirimkan ke semua peserta dan membolehkan konfirmasi mereka."
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
@@ -4226,16 +4180,16 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
-"Bila Anda tidak mengirimkan berita pembatalan, peserta lain mungkin tidak "
-"akan tahu bahwa pertemuan ini telah dibatalkan."
+"Bila Anda tidak mengirimkan berita pembatalan, peserta lain mungkin tidak akan "
+"tahu bahwa pertemuan ini telah dibatalkan."
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
-"Bila Anda tidak mengirimkan berita pembatalan, peserta lain mungkin tidak "
-"tahu bahwa tugas ini telah dihapus."
+"Bila Anda tidak mengirimkan berita pembatalan, peserta lain mungkin "
+"tidak tahu bahwa tugas ini telah dihapus."
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
@@ -4356,8 +4310,8 @@ msgid ""
 "a supported version."
 msgstr ""
 "Anda tersambung ke suatu layanan GroupWise yang tidak didukung dan bisa saja "
-"menjumpai masalah ketika menggunakan Evolution. Untuk hasil maksimal, "
-"servernya harus diperbarui ke versi yang telah didukung."
+"menjumpai masalah ketika menggunakan Evolution. Untuk hasil maksimal, servernya harus "
+"diperbarui ke versi yang telah didukung."
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "You have changed this appointment, but not yet saved it."
@@ -4394,7 +4348,7 @@ msgid "_Save Changes"
 msgstr "_Simpan Perubahan"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "_Kirim"
 
@@ -4419,8 +4373,8 @@ msgstr "Pisahkan Acara > 1 hari:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Evolution-data-server tidak dapat dijalankan"
 
@@ -4454,12 +4408,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Tidak bsai menulis blok aplikas Tugas pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Kalender dan Tugas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalender"
 
@@ -4507,14 +4461,14 @@ msgid "Memos"
 msgstr "Memo"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
+#: ../plugins/exchange-operations/exchange-folder.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tugas"
@@ -4532,12 +4486,12 @@ msgstr "_Tugas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Layanan notifikasi alarm Kalender Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "menit"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4548,7 +4502,7 @@ msgid "hours"
 msgid_plural "hours"
 msgstr[0] "jam"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Waktu awal"
 
@@ -4559,10 +4513,10 @@ msgstr "Jadwal Pertemuan"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Lokasi:"
 
@@ -4576,12 +4530,12 @@ msgstr "Waktu _terlelap:"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Ubah"
 
@@ -4593,31 +4547,32 @@ msgstr "_Ingatkan lagi"
 msgid "location of appointment"
 msgstr "lokasi pertemuan"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Tidak ada keterangan"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Tidak ada keterangan"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Tidak ada keterangan lokasi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Anda punya %d alarm"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4629,7 +4584,7 @@ msgstr ""
 "menampilkan kotak dialog saja saat mengingatkan\n"
 "kalender."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4646,7 +4601,7 @@ msgstr ""
 "\n"
 "Benar ingin menjalankan program ini?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Jangan tanya lagi tentang program ini."
 
@@ -4712,8 +4667,7 @@ msgstr "Alarm yang dijalankan Kalender untuk"
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
-"Warna untuk menggambar Baris Marcus Bains di batang Waktu (kosong untuk "
-"awal)."
+"Warna untuk menggambar Baris Marcus Bains di batang Waktu (kosong untuk awal)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -4729,8 +4683,7 @@ msgstr "Konfirmasi menghapus"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
-"Hari yang seharusnya mengindikasikan dimana jam kerja diawali dan diakhiri."
+msgstr "Hari yang seharusnya mengindikasikan dimana jam kerja diawali dan diakhiri."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
@@ -4745,210 +4698,197 @@ msgid "Default reminder value"
 msgstr "Nilai pengingat awal"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Informasi Acara"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Transparansi Acara"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "URL server Bebas/sibuk"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "URL contoh Bebas/sibuk"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Gradasi acara dalam tampilan kalender."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Sembunyikan tugas selesai"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Sembunyikan unit tugas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Sembunyikan nilai tugas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Posisi mendatar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Jam dimana hari kerja berakhir, dalam bentuk dua puluh empat jam, 0 s.d 23."
+msgstr "Jam dimana hari kerja berakhir, dalam bentuk dua puluh empat jam, 0 s.d 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Jam hari kerja dimulai, dalam bentuk dua puluh empat jam, 0 s.d 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Interval pada tampilan Hari dan Minggu Kerja, dalam menit."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Waktu alarm terakhir"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Daftar server URL untuk jadwal luang/sibuk."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Garis Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Warna Garis Marcus Bain - Tampilan Hari"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Warna Garis Marcus Bain - kotak Waktu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Menit jam kerja berakhir pada, 0 s.d 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Menit jam kerja dimulai pada, 0 s.d 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Tampilan bulan posisi panel datar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Tampilan bulan posisi panel tegak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Jumlah unit untuk menentukan pengingat awal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Jumlah unit untuk menentukan kapan menyembunyikan tugas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Warga tugas belum selesai"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"Posisi dari batang datar, antara penunjuk tanggal kalender dan daftar tugas "
-"ketika tidak berada pada tampilan bulan, dalam piksel."
+"Posisi dari batang datar, antara penunjuk tanggal kalender dan "
+"daftar tugas ketika tidak berada pada tampilan bulan, dalam piksel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"Posisi dari batang datar, antara penampil dan penunjuk tanggal kalender "
-"serta daftar tugas ketika pada tampilan bulan, dalam piksel."
+"Posisi dari batang datar, antara penampil dan penunjuk tanggal kalender serta "
+"daftar tugas ketika pada tampilan bulan, dalam piksel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr ""
-"Posisi batang tegak, diantara daftar tugas dan batang cuplikan tugas, dalam "
-"piksel."
+"Posisi batang tegak, diantara daftar tugas dan batang cuplikan tugas, "
+"dalam piksel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"Posisi dari batang tegak, antara penampil dan penunjuk tanggal kalender "
-"serta daftar tugas ketika pada tampilan bulan, dalam piksel."
+"Posisi dari batang tegak, antara penampil dan penunjuk tanggal kalender serta "
+"daftar tugas ketika pada tampilan bulan, dalam piksel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"Posisi dari batang tegak, antara penampil dan penunjuk tanggal kalender "
-"serta daftar tugas ketika tidak pada tampilan bulan, dalam piksel."
+"Posisi dari batang tegak, antara penampil dan penunjuk tanggal kalender serta "
+"daftar tugas ketika tidak pada tampilan bulan, dalam piksel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Program yang dapat dijalankan oleh alarm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Tampilkan bagian RSVP pada penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Tampilkan daerah peran pada penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "_Tampilkan akhir waktu pertemuan dalam tampilan minggu dan bulan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Tampilkan bagian kategori pada penyunting acara/rapat/tugas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Tampilkan alaram pada bagian pemberitahuan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Tampilkan bagian status pada penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Tampilkan panel \"Pratinjau\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Tampilkan panel \"Pratinjau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Tampilkan zona waktu pada penyunting acara/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Tampilkan bagian type pada penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Tampilkan nomor jumlah dalam navigasi tanggal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Warna tugas harus selesai hari ini"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Posisi batang tegak tugas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"Templet URL digunakan sebagai data panggil yang bebas/sibuk, %u diganti oleh "
-"bagian alamat surat pengguna dan $d diganti dengan domain."
+"Templet URL digunakan sebagai data panggil yang bebas/sibuk, %u diganti oleh bagian alamat "
+"surat pengguna dan $d diganti dengan domain."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4957,142 +4897,135 @@ msgstr ""
 "sebagaimana zona lokasi basis data waktu Olsen yang tidak diterjemahkan "
 "seperti \"Amerika/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Pembagian waktu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Waktu terakhir alarm dijalankan, dalam time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Zona waktu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Transparansi acara dalam tampilan kalender (Nilai antara 0 dan 10, "
-"opasi awal)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Bentuk dua puluh empat jam"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Satuan sebagai pengingat, \"menit\", \"jam\" ataupun \"hari\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Unit untuk menentukan kapan menyembunyikan tugas, \"menit\", \"jam\" atau "
-"\"hari\"."
+"Unit untuk menentukan kapan menyembunyikan tugas, \"menit\", \"jam\" atau \"hari\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Mulai minggu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Awal pekan dimulai pada hari, dari Senin (0) s.d Sabtu (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Apakah menggunakan tray pemberitahuan untuk menampilkan alaram."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Atur untuk menentukan apakah ingin melakukan konfirmasi pada saat menghapus "
 "jadwal pertemuan atau tidak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Atur untuk menentukan apakah ingin melakukan konfirmasi pada saat menghapus "
 "jadwal pertemuan atau tidak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
-"Apakah untuk memadatkan mingguan dalam tampilan bulan, yang meletakkan Sabtu "
-"dan Minggu dalam ruang satu minggu."
+"Apakah untuk memadatkan mingguan dalam tampilan bulan, yang meletakkan "
+"Sabtu dan Minggu dalam ruang satu minggu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Tampilkan akhir waktu jadwal pertemuan dalam tampilan minggu dan bulan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "Apakah menggambar Baris Marcus Bains (baris saat ini) di kalender."
+msgstr ""
+"Apakah menggambar Baris Marcus Bains (baris saat ini) di kalender."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Apakah menyembunyikan tugas selesai dalam tampilan tugas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 "Atur untuk menentukan apakah ingin membuat pengingat default untuk pertemuan "
 "atau tidak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Apakah menampilkan daerah RSVP pada penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Apakah menampilkan daerah kategori pada penyunting acara/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Apakah menampilkan daerah peran dalam penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Apakah menampilkan daerah status pada penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "Apakah menampilkan waktu dalam bentuk 24 jam dari pada am/pm."
+msgstr ""
+"Apakah menampilkan waktu dalam bentuk 24 jam dari pada am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Apakah menampilkan zona waktu pada penyunting acara/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Apakah menampilkan jenis pada penyunting acara/tugas/rapat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Apakah menampilkan jumlah minggu dalam navigasi tanggal."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Akhir Jam hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Menit akhir hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Mulai jam hari kerja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Mulai menit hari kerja"
 
@@ -5104,19 +5037,19 @@ msgstr "Ringkasan berisi"
 msgid "Description contains"
 msgstr "Deskripsi berisi"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentar berisi"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Lokasi berisi"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Tidak cocok"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
@@ -5125,12 +5058,12 @@ msgstr "Cetak"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/exchange-operations/exchange-folder.c:579
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
 #: ../plugins/hula-account-setup/camel-hula-listener.c:379
 #: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -5194,59 +5127,59 @@ msgstr "Gagal meningkatkan kalender."
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Tidak dapat membuka kalender '%s' untuk mengatur acara dan pertemuan"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tidak ada kalender tersedia untuk mengatur acara dan pertemuan"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Pilihan Sumber Kalender"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Jadwal pertemuan baru"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "J_anji"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Buat jadwal pertemuan yang baru"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Pertemuan baru"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "P_ertemuan"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Buat usulan pertemuan"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Buat jadwal pertemuan seharian penuh"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Jadwal Pertemuan Sehari _Penuh"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Buat jadwal pertemuan seharian penuh"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Kalender baru"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Buat kalender baru"
 
@@ -5278,7 +5211,7 @@ msgstr "Metode tidak dapat dijalankan saat membuka kalender"
 msgid "Permission denied to open the calendar"
 msgstr "Pembukaan kalender tidak diperbolehkan"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Keybord tak dikenal"
 
@@ -5404,18 +5337,47 @@ msgstr "Tam_bah"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Sarankan fasilitas penampilan lampiran otomatis"
+#: ../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 "Gunakan fasilitas penampilan lampiran otomatis"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Lampirkan file"
 
+#: ../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 "Pengaturan Lampiran"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Keterangan:"
+
+#: ../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 "Nama file:"
+
+#: ../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 "Tipe MIME:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Kalender Terpilih untuk Alarm"
@@ -5426,13 +5388,13 @@ msgid ""
 "30 minutes\n"
 "15 minutes\n"
 "10 minutes\n"
-"05 minutes"
+"05 minutes\n"
 msgstr ""
 "60 menit\n"
 "30 menit\n"
 "15 menit\n"
 "10 menit\n"
-"05 menit"
+"05 menit\n"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
@@ -5478,7 +5440,7 @@ msgid "Display"
 msgstr "Tampilan"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:572
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Luang/Sibuk"
@@ -5514,8 +5476,7 @@ msgid ""
 "Friday\n"
 "Saturday\n"
 "Sunday"
-msgstr ""
-"Senin\n"
+msgstr "Senin\n"
 "Selasa\n"
 "Rabu\n"
 "Kamis\n"
@@ -5529,187 +5490,181 @@ msgstr ""
 msgid "Pick a color"
 msgstr "Pilih warna"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_Min"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Pilih kalender untuk pemberitahuan alarm"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "_Ingatkan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Tampilka_n jumlah pekan dalam penelusur tanggal"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Minggu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "Tug_as harus selesai hari ini:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "_Kam"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Templat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Kamis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "_Zona waktu:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Format waktu:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Rabu"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "Mingg_u dimulai pada:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Hari kerja:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 jam (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 jam"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Konfirm_asi saat menghapus data"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "Pada_tkan akhir pekan pada tampilan bulan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "Awa_l hari:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_Jum"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "S_embunyikan tugas selesai setelah"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Sen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "_Tugas belum selesai padahal harus sudah selesai:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "Sa_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Tampilkan akhir waktu pertemuan pada tampilan minggu dan bulan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "Pembagian wak_tu:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "Se_l"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Rab"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "sebelum setiap pertemuan"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Sal_in isi kalender ke sistem lokal untuk operasi offline"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Salin isi kalender ke sistem lokal untuk operasi offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Sal_in isi daftar tugas ke sistem lokal untuk operasi offline"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Salin isi daftar tugas ke sistem lokal untuk operasi offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Sal_in isi daftar memo ke sistem lokal untuk operasi offline"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Salin isi daftar memo ke sistem lokal untuk operasi offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Wa_rna:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Daftar Tugas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Daftar Memo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Pengaturan Kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Kalender Baru"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Pengaturan Daftar Tugas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Daftar Memo Baru"
 
@@ -5797,48 +5752,48 @@ msgstr "%s  Tidak ada perubahan, perbarui isi editor?"
 msgid "Validation error: %s"
 msgstr "Error validasi: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " ke "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Selesai "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Selesai "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Batas "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Batas "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2861
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Lampiran pesan email - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2866
-#: ../composer/e-msg-composer.c:3062
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d pesan terlampir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3126
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Pindahkan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3128
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr " _Drag"
 
@@ -5846,7 +5801,7 @@ msgstr " _Drag"
 msgid "Could not update object"
 msgstr "Tidak dapat memperbarui obyek"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2490
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5857,98 +5812,99 @@ msgid "Hide Attachment _Bar"
 msgstr "Sem_bunyikan Panel Lampiran"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Tam_pilkan Panel Lampiran"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3624
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Buang"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3625 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Informasi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3627
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "T_ambah lampiran..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Tampilkan Lampiran"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Tekan spasi untuk memunculkan batang attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Ubah Pertemuan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Rapat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Pertemuan - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tugas yang telah diberikan - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tugas - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Isi jurmal - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Tidak ada judul"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "lampiran"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Perubahan yang terjadi pada isian ini akan dibatalkan bila ada data baru "
 "yang datang"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Tidak dapat menggunakan versi ini!"
 
@@ -5964,10 +5920,6 @@ msgstr "Tidak dapat membuka tujuan"
 msgid "Destination is read only"
 msgstr "Tujuan hanya dapat dibaca saja"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Hapus objek ini dari seluruh kotak surat penerima yang lain?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Acara ini tidak dapat dihapus karena ada error corba"
@@ -6029,17 +5981,17 @@ msgstr "Delegasikan Ke:"
 msgid "Enter Delegate"
 msgstr "Masukkan Delegasi"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Perte_muan"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Pengulangan"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Acara ini ada alarmnya"
 
@@ -6049,7 +6001,7 @@ msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6063,92 +6015,100 @@ msgstr "_Delegasi"
 msgid "Atte_ndees"
 msgstr "Pese_rta"
 
-#: ../calendar/gui/dialogs/event-page.c:1083
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Acara tanpa tanggal awal"
 
-#: ../calendar/gui/dialogs/event-page.c:1086
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Acara tanpa tanggal akhir"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Tanggal awal salah"
 
-#: ../calendar/gui/dialogs/event-page.c:1264
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Tanggal akhir salah"
 
-#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Waktu awal salah"
 
-#: ../calendar/gui/dialogs/event-page.c:1294
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Waktu akhir salah"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Penyelenggara yang terpilih tidak memiliki account."
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Penyelenggara harus dipilih."
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Paling tidak harus ada seorang peserta."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "T_ambah "
 
-#: ../calendar/gui/dialogs/event-page.c:2618
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Tidak dapat membuka kalender '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d hari sebelum pertemuan"
 
-#: ../calendar/gui/dialogs/event-page.c:2929
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d jam sebelum pertemuan "
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d menit sebelum pertemuan"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Sesuaikan"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2282
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
 #: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
@@ -6167,7 +6127,8 @@ msgid "15 minutes before appointment"
 msgstr "15 menit sebelum pertemuan"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "Pe_serta..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6188,12 +6149,16 @@ msgstr "D_eskripsi:"
 msgid "Event Description"
 msgstr "Keterangan Acara"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "Lokas_i:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Rin_gkasan:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "Ing_atkan"
 
@@ -6215,6 +6180,14 @@ msgstr "untuk"
 msgid "until"
 msgstr "hingga"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "Dele_gasi"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Dari:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6261,7 +6234,7 @@ msgstr "Konfirmasi/RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Kondisi"
 
@@ -6282,11 +6255,11 @@ msgid "Organizer"
 msgstr "Penyelenggara"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Penyelenggara:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Memo"
 
@@ -6347,14 +6320,12 @@ msgstr "Anda sedang merubah acara yang berulang. Apa yang ingin Anda ganti?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr ""
-"Anda sedang mendelegasikan acara yang berulang. Apa yang ingin Anda "
+msgstr "Anda sedang mendelegasikan acara yang berulang. Apa yang ingin Anda "
 "delegasikan?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr ""
-"Anda sedang merubah tugas yang berulang. Bagian apa yang ingin Anda ganti?"
+msgstr "Anda sedang merubah tugas yang berulang. Bagian apa yang ingin Anda ganti?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
@@ -6381,8 +6352,7 @@ msgstr "Semua Kejadian"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Jadwal pertemuan ini berisi perulangan yang tidak dapat diubah oleh Evolution"
+msgstr "Jadwal pertemuan ini berisi perulangan yang tidak dapat diubah oleh Evolution"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
@@ -6554,15 +6524,15 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Selesai"
 
 #: ../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:1029
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Tinggi"
 
@@ -6571,20 +6541,20 @@ msgstr "Tinggi"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Dalam Proses"
 
 #: ../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:1027
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Rendah"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
@@ -6592,7 +6562,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Belum Dimulai"
 
@@ -6605,7 +6575,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Belum didefinisikan"
 
@@ -6622,12 +6592,12 @@ msgstr "_Prioritas:"
 msgid "_Web Page:"
 msgstr "Halaman _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Tugas"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Rincian Tugas"
 
@@ -6640,10 +6610,6 @@ msgstr "Tanggal target selesai"
 msgid "Unable to open tasks in '%s'."
 msgstr "Tidak dapat membuka tugas pada '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "Pe_serta..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Kategor_i..."
@@ -6782,7 +6748,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s dengan pemicu yang tidak diketahui"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "Klik untuk membuka %s"
@@ -6802,7 +6768,7 @@ msgstr "Tak ada judul"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Ringkasan:"
 
@@ -6820,7 +6786,7 @@ msgstr "Tanggal Harus Selesai:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Status:"
 
@@ -6828,26 +6794,18 @@ msgstr "Status:"
 msgid "Priority:"
 msgstr "Prioritas: "
 
-#: ../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:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "Keterangan:"
-
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Publik"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Pribadi"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Rahasia"
 
@@ -6867,13 +6825,13 @@ msgid "Summary"
 msgstr "Judul"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Luang"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Sibuk"
 
@@ -6887,17 +6845,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ya"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Tidak ada"
@@ -6908,21 +6866,21 @@ msgstr "Tidak ada"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Tidak dikenal"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Berulang"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Telah ditugaskan"
 
@@ -6930,7 +6888,7 @@ msgstr "Telah ditugaskan"
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2081
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Pilih folder untuk menyimpan lampiran ini..."
 
@@ -6939,9 +6897,9 @@ msgstr "Pilih folder untuk menyimpan lampiran ini..."
 msgid "untitled_image.%s"
 msgstr "gambar-tidak-berjudul %s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Simpan _Jadi..."
 
@@ -6959,79 +6917,74 @@ msgstr "_Simpan Terpilih"
 msgid "Open in %s..."
 msgstr "Buka menggunakan %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Menghapus obyek terpilih"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Memperbarui obyek"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Simpan sebagai..."
 
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "_Tugas Baru"
-
-#: ../calendar/gui/e-calendar-table.c:1260 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Buka Halaman _Web"
 
-#: ../calendar/gui/e-calendar-table.c:1262
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7039,44 +6992,44 @@ msgstr "Buka Halaman _Web"
 msgid "_Print..."
 msgstr "_Cetak..."
 
-#: ../calendar/gui/e-calendar-table.c:1266
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "P_otong"
 
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Tem_pel"
 
-#: ../calendar/gui/e-calendar-table.c:1272 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Tug_askan"
 
-#: ../calendar/gui/e-calendar-table.c:1273 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Kirim dalam bentuk iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1274
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Tandai Sudah Selesai"
 
-#: ../calendar/gui/e-calendar-table.c:1275
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Tandai Tugas Sudah Selesai"
 
-#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Hapus Tugas yang Terpilih"
 
-#: ../calendar/gui/e-calendar-table.c:1513
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik untuk menambah tugas baru"
@@ -7111,101 +7064,105 @@ msgstr "Tanggal awal"
 msgid "Task sort"
 msgstr "Pengurutan tugas"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Memindahkan isian"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Menyalin isian"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "J_anji Baru..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Buat Baru Acara S_ehari Penuh"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Perte_muan Baru"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "_Tugas Baru"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Tampilan _Sekarang"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Pilih _Hari ini"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Pilih Tanggal..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Sal_in ke Kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Pin_dahkan ke Kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Jadwalkan Pertemuan..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Jadwalkan Pertemuan..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Kirim dalam bentuk iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Balas"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Balas ke Semu_a"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Kejadian Ini Dapat _Dipindahkan"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Hapus _Kejadian Ini"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Hapus Semu_a Kejadian"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Penyelenggara: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Penyelenggara: %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:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Lokasi: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Waktu: %s %s"
@@ -7235,7 +7192,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i pembagi menit"
@@ -7246,22 +7203,20 @@ msgstr "%02i pembagi menit"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -7365,22 +7320,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Terima"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Sementara Terima"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Ditolak"
 
@@ -7389,13 +7344,15 @@ msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
-"Pertemuan telah dibatalkan, namun ini tidak ditemukan dalam kalender Anda"
+"Pertemuan telah dibatalkan, namun ini tidak ditemukan dalam "
+"kalender Anda"
 
 #: ../calendar/gui/e-itip-control.c:1226
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
-"Tugas telah dibatalkan,namun ini tidak ditemukan dalam daftar tugas Anda"
+"Tugas telah dibatalkan,namun ini tidak ditemukan dalam daftar "
+"tugas Anda"
 
 #: ../calendar/gui/e-itip-control.c:1305
 #, c-format
@@ -7568,8 +7525,7 @@ msgstr "Pesan ini tidak disusun dengan benar"
 
 #: ../calendar/gui/e-itip-control.c:1605
 msgid "The message contains only unsupported requests."
-msgstr ""
-"Pesan email ini berisi permintaan-permintaan yang tidak dapat dikenali."
+msgstr "Pesan email ini berisi permintaan-permintaan yang tidak dapat dikenali."
 
 #: ../calendar/gui/e-itip-control.c:1638
 msgid "The attachment does not contain a valid calendar message"
@@ -7589,13 +7545,11 @@ msgstr "Obyek rusak dan tidak dapat diperbarui\n"
 
 #: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Balasan diperoleh bukan dari peserta. Tambahkan beliau sebagai peserta?"
+msgstr "Balasan diperoleh bukan dari peserta. Tambahkan beliau sebagai peserta?"
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Status peserta tidak dapat diperbarui karena berisi status yang tidak "
+msgstr "Status peserta tidak dapat diperbarui karena berisi status yang tidak "
 "dikenal!\n"
 
 #: ../calendar/gui/e-itip-control.c:1971
@@ -7603,7 +7557,7 @@ msgid "Attendee status updated\n"
 msgstr "Status peserta diperbarui\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status peserta tidak dapat diubah karena sudah tidak ada lagi"
 
@@ -7655,30 +7609,43 @@ msgstr "Kirim Informasi Terakhir"
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--ke--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Pesan Kalender"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Tanggal:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Buka Kalender"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Buka kalender..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Pesan Server:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "tanggal-akhir"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "tanggal-awal"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Pimpinan"
@@ -7697,65 +7664,65 @@ msgid "Resources"
 msgstr "Sumber daya"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "Pribadi"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grup"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Sumber"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Ruangan"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Pimpinan"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "Peserta Wajib"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Peserta Tambahan"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Bukan Peserta"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "Butuh Penanganan"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Sementara"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Terdelegasi"
 
@@ -7764,14 +7731,14 @@ msgstr "Terdelegasi"
 msgid "Attendee                          "
 msgstr "Peserta                            "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 msgid "In Process"
 msgstr "Dalam Proses"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -7779,86 +7746,86 @@ msgstr "%A, %d %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Keluar Kantor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Tidak Ada Informasi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Peser_ta..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Pilihan"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Tampilkan _jam kerja saja"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Tampilkan _zoom keluar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Perbar_ui data waktu luang/sibuk"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "Pili_h otomatis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "Semu_a orang dan sumber daya"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Semua oran_g dan satu sumber daya"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "O_rang -orang yang dibutuhkan"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "_Orang-orang yang dibutuhkan dan satu sumber daya"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Waktu _mulai:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Waktu b_erakhir:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Hapus Memo Terpilih"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klik untuk menambah memo"
 
@@ -7866,7 +7833,7 @@ msgstr "Klik untuk menambah memo"
 msgid "Memo sort"
 msgstr "Memo terurut"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7885,7 +7852,7 @@ msgstr "Buka memo"
 msgid "Opening memos at %s"
 msgstr "Buka memo pada %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Menghapus obyek terpilih..."
 
@@ -7894,32 +7861,31 @@ msgstr "Menghapus obyek terpilih..."
 msgid "Enter the password for %s"
 msgstr "Masukkan kata sandi %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Buka tugas"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Buka tugas pada %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Menyelesaikan tugas..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Menghapus"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "Pilih Zona Waktu"
 
 #. 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:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8068,9 +8034,22 @@ msgstr "Informasi iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Anda harus menjadi peserta acara ini."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "_Daftar Memo Baru"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Salin"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Hapus"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Pengaturan..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8173,240 +8152,240 @@ msgstr "Tidak dapat melakukan migrasi terhadap kalender '%s'"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Tidak dapat melakukan migrasi terhadap tugas '%s'"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Min"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Sen"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Sel"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Rab"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Kam"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Jum"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Sab"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Tanggal yang terpilih (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a, %d %b"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a, %d %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a, %d %b %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Minggu yang dipilih (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Bulan yang dipilih (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Tahun yang dipilih (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Pertemuan"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Tugas"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Keterangan: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritas: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Persen selesai: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategori: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Kontak: "
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Tampilan Cetak"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Cetak Item"
 
@@ -8471,23 +8450,23 @@ msgstr "Daftar _tugas"
 msgid "Create a new task list"
 msgstr "Buat daftar tugas baru"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Proses ini akan menghapus semua tugas yang telah ditandai selesai. Jika "
-"terus, anda tidak akan bisa mengembalikannya lagi.\n"
+"Proses ini akan menghapus semua tugas yang telah ditandai selesai. Jika terus, anda "
+"tidak akan bisa mengembalikannya lagi.\n"
 "\n"
 "Yakin ingin menghapus tugas ini?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Jangan tanya lagi."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Cetak Tugas"
 
@@ -10082,7 +10061,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Kotak Lampiran"
 
@@ -10090,43 +10069,28 @@ msgstr "Kotak Lampiran"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Tidak dapat melampirkan file %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Tidak dapat melampirkan file %s: bukan file biasa"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Pengaturan Lampiran"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Nama file:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "Tipe MIME:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Tujuan posting"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Pilih folder tempat melakukan posting."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Klik untuk membuka buku alamat"
 
@@ -10137,46 +10101,46 @@ msgstr "Klik untuk membuka buku alamat"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Alamat Balasan:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Dari:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "J_udul:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "Un_tuk:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Isi daftar penerima pesan email ini"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Tembusan:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Isi alamat-alamat yang akan menerima salinan karbon (Cc) pesan email ini"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10187,15 +10151,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Kirim Ke:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Klik disini untuk memilih folder tempat posting"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Post To:"
 
@@ -10203,7 +10167,7 @@ msgstr "Post To:"
 msgid "A_ttach"
 msgstr "_Lampirkan"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Sisipkan Lampiran"
 
@@ -10222,12 +10186,12 @@ msgstr ""
 "Tidak dapat mengacak pesan email keluar: Sertifikat enkripsi belum diset "
 "untuk account ini"
 
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Sembunyikan Panel L_ampiran"
 
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Tampilkan P_anel Lampiran"
 
@@ -10253,21 +10217,21 @@ msgstr "Belum Diberi Judul"
 msgid "Open File"
 msgstr "Buka Berksa"
 
-#: ../composer/e-msg-composer.c:2162 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Otomatis"
 
-#: ../composer/e-msg-composer.c:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Tanda tan_gan:"
 
-#: ../composer/e-msg-composer.c:2533 ../composer/e-msg-composer.c:3752
-#: ../composer/e-msg-composer.c:3755
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Tulis Pesan Baru"
 
-#: ../composer/e-msg-composer.c:4979
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10295,11 +10259,10 @@ msgstr "Benar ingin abaikan email yang sedang Anda tulis sekarang ('{0}')?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"Karena &quot;{0}&quot;, anda mungkin perlu memilih pilihan surat berbeda."
+msgstr "Karena &quot;{0}&quot;, anda mungkin perlu memilih pilihan surat berbeda."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Karena &quot;{1}&quot;."
 
@@ -10419,7 +10382,7 @@ msgstr "_Simpan Pesan"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10543,7 +10506,7 @@ msgstr ""
 "Saat menerima email dengan nota pembacaan, apa yang harus dilakukan oleh "
 "Evolution?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10551,28 +10514,28 @@ msgstr ""
 "File dengan nama tersebut sudah ada.\n"
 "Timpa saja?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Timpa file?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Error Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Pesan Peringatan Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Pesan Informasi Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Query Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Kesalahan di dalam, kesalahan tak dikenal '%s' telah diminta"
@@ -10593,7 +10556,7 @@ msgstr "Apakah Anda ingin menimpa file ini?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Berkas sudah ada &quot;{0}&quot;"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "_Tulis ulang"
 
@@ -10660,23 +10623,23 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Pilih tanggal pembanding"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Pilih file"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Penting"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "PR"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Nanti"
@@ -10726,11 +10689,11 @@ msgid "Include threads"
 msgstr "Termasuk ulir diskusi"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Masuk"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Keluar"
 
@@ -10754,7 +10717,7 @@ msgstr "Tanggal belum diisi"
 msgid "Missing file name."
 msgstr "File name tidak ada"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Nama tidak diisi."
 
@@ -10826,7 +10789,7 @@ msgstr "yang lalu"
 msgid "months"
 msgstr "bulan"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "detik"
 
@@ -10898,11 +10861,11 @@ msgstr "Program konfigurasi penyusun Email Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Program pengaturan Email Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Surat"
@@ -10982,11 +10945,11 @@ msgstr "Pilihan Penerimaan"
 msgid "Checking for New Mail"
 msgstr "Periksa Email Baru"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Pengatur Akun"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Pengatur Akun Evolution"
 
@@ -11021,7 +10984,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Belum diberi nama"
 
@@ -11041,14 +11004,14 @@ msgstr "Tanda tangan"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Isi Pesan Asli --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1666
 msgid "an unknown sender"
 msgstr "pengirim tidak diketahui"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:1713
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11097,12 +11060,6 @@ msgstr "Tanggal diterima"
 msgid "Date sent"
 msgstr "Tanggal dikirim"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Hapus"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Dihapus"
@@ -11200,7 +11157,7 @@ msgstr "Spam"
 msgid "Junk Test"
 msgstr "Tes Spam"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
 
@@ -11244,7 +11201,7 @@ msgstr "Bunyikan Suara"
 msgid "Read"
 msgstr "Baca"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Penerima"
 
@@ -11272,11 +11229,11 @@ msgstr "hasil lebih kecil dari"
 msgid "Run Program"
 msgstr "Jalankan Program"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Nilai"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Pengirim"
 
@@ -11308,9 +11265,9 @@ msgstr "diawali dengan"
 msgid "Stop Processing"
 msgstr "Stop Pemrosesan"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11326,42 +11283,10 @@ msgstr " Status"
 msgid "<b>Then</b>"
 msgstr "<b>Lalu</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Buat Sa_ringan Folder dari Hasil Pencarian..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Seluruh Pesan"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Pesan Belum Terbaca"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Tanpa Label"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Baca Pesan"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Pesan Saat ini"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Pesan 5 Hari Terakhir"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Pesan dengan Lampiran"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Pesan Bukan Spam"
-
 #. 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
@@ -11393,7 +11318,7 @@ msgid "Folder _name:"
 msgstr "_Nama folder:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Cari Folder"
 
@@ -11408,7 +11333,7 @@ msgstr "Draf"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "Email Masuk"
 
@@ -11424,77 +11349,77 @@ msgstr "Email Terkirim"
 msgid "Loading..."
 msgstr "Meload...."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Pohon Folder Email"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Memindahkan folder %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Menyalin folder %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Memindahkan semua pesan ke dalam folder %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Menyalin semua pesan ke dalam folder %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Tidak dapat menyimpan email dalam penyimpanan tingkat atas"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Salin ke Folder"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Pindahkan ke folder"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Memeriksa folder dalam \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Lihat"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Buka dalam Je_ndela Baru"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "Sa_lin..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Pindahkan..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "Folder Bar_u"
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Ganti nama..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
 msgid "_Empty Trash"
 msgstr "_Kosongkan Tong Sampah"
 
@@ -11503,14 +11428,13 @@ msgstr "_Kosongkan Tong Sampah"
 msgid "Copying `%s' to `%s'"
 msgstr "Menyalin dari `%s' ke `%s'."
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Pilih folder"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "S_alin"
 
@@ -11532,176 +11456,168 @@ msgstr "Buat folder"
 msgid "Specify where to create the folder:"
 msgstr "Tentukan lokasi folder baru:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Balas ke Pengi_rim"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Teruskan ke Orang Lain"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "Jadikan s_ebagai Pesan Baru..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "T_idak jadi hapus"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Pindahkan ke Folder..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Anggap Sudah _Dibaca"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Tandai Bel_um Dibaca"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Tandai Sebagai Email Pent_ing"
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Tandai Sebagai E_mail Tidak Penting"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Tandai Sebagai Email Sampa_h"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Tandai Buka_n Sebagai Spam"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Tindak Lan_juti..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Label"
 
-#: ../mail/em-folder-view.c:1141
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Tidak ada"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Fla_g Selesai"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Ha_pus Flag"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Bua_t Aturan Baru dari Pesan Ini"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Saring Folder berdasarkan _Judul"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Saring Folder berdasarkan Pe_ngirim"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Saring Folder berdasarkan Pene_rima"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Saring Folder berdasarkan Mi_lis"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filter Berdasarkan Sub_yek"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filter Berdasarkan Pen_girim"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filter Berdasarkan _Penerima"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filter Berdasarkan _Milis"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "Default"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Cetak Pesan"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "Email tidak dapat ditarik"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2460
+msgid "_Copy Link Location"
+msgstr "_Salin Lokasi Link"
+
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "Buat Folder _Pencarian"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_Dari Alamat Ini:"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "Ke Alama_t Ini"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klik untuk mengirim email kepada %s"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Klik untuk sembunyi/tampilkan alamat"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:501
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Jumlah Kecocokan: %d"
 
-#: ../mail/em-format-html-display.c:644
-msgid "Find:"
-msgstr "Cari:"
-
-#: ../mail/em-format-html-display.c:675
-msgid "Match _case"
-msgstr "Cocok _huruf"
-
-#: ../mail/em-format-html-display.c:923 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Tidak Ditandatangani"
 
-#: ../mail/em-format-html-display.c:923
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Pesan ini tidak ditandatangani. Keabsahan isi pesan ini tidak dijamin."
 
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Tanda tangan sah"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11709,11 +11625,11 @@ msgstr ""
 "Pesan ini ditandatangani dan sah, artinya pesan ini benar-benar dikirim oleh "
 "orang ini."
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Tanda tangan tidak sah"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11721,11 +11637,11 @@ msgstr ""
 "Tanda tangan tidak dapat diperiksa keabsahannya, mungkin data tanda tangan "
 "digitalnya terubah pada saat melalui pengiriman."
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Tanda tangan sah, namun tidak dapat memeriksa pengirimnya"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11733,37 +11649,37 @@ msgstr ""
 "Pesan ini ditandatangani dengan tanda tangan yang sah, namun pengirim pesan "
 "ini tidak dapat diverifikasi kebenarannya."
 
-#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Tidak terenkripsi"
 
-#: ../mail/em-format-html-display.c:932
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
-"Pesan ini tidak teracak. Isi pesan ini dapat dilihat pada saat melalui "
-"perjalanan di Internet."
+"Pesan ini tidak teracak. Isi pesan ini dapat dilihat pada saat melalui perjalanan "
+"di Internet."
 
-#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Terenkripsi, lemah"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"Pesan ini teracak, dengan algoritma pengacakan yang lemah. Akan sulit, "
-"tetapi bukan tidak mungkin bagi yang tidak berhak untuk melihat isinya dalam "
-"waktu yang singkat."
+"Pesan ini teracak, dengan algoritma pengacakan yang lemah. Akan sulit, tetapi "
+"bukan tidak mungkin bagi yang tidak berhak untuk melihat isinya dalam waktu "
+"yang singkat."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Diacak"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11771,84 +11687,84 @@ msgstr ""
 "Pesan ini terenkripsi. Orang yang tidak berhak akan cukup mengalami "
 "kesulitan dalam membuka pesan ini."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Terenkripsi, kuat"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"Pesan ini teracak dengan algoritma yang kuat. Akan sangat sulit bagi yang "
-"tidak berhak untuk melihat isi dari pesan dalam waktu yang singkat."
+"Pesan ini teracak dengan algoritma yang kuat. Akan sangat sulit bagi yang tidak "
+"berhak untuk melihat isi dari pesan dalam waktu yang singkat."
 
-#: ../mail/em-format-html-display.c:1036 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Lihat Serti_fikat"
 
-#: ../mail/em-format-html-display.c:1051
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Sertifikat tidak dapat dilihat"
 
-#: ../mail/em-format-html-display.c:1342
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Selesai pada %d %B %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1350
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Waktu Terlewat:"
 
-#: ../mail/em-format-html-display.c:1353
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "pada %d %B %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1413
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Lihat Langsung"
 
-#: ../mail/em-format-html-display.c:1414
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Cari"
 
-#: ../mail/em-format-html-display.c:1415
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Lebarkan"
 
-#: ../mail/em-format-html-display.c:1416
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Tampilkan U_kuran Asli"
 
-#: ../mail/em-format-html-display.c:1835 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Jadikan Lampiran"
 
-#: ../mail/em-format-html-display.c:2042
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Pilih folder untuk menyimpan semua lampiran ini..."
 
-#: ../mail/em-format-html-display.c:2089
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Simpan Terpilih..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2156
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d lampira_n"
 
-#: ../mail/em-format-html-display.c:2163 ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "Simp_an"
 
-#: ../mail/em-format-html-display.c:2174
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Simp_an Semua"
 
-#: ../mail/em-format-html-display.c:2235
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Tidak Ada Lampiran"
 
@@ -11862,94 +11778,94 @@ msgstr "Halaman %d dari %d"
 msgid "Retrieving `%s'"
 msgstr "Mengambil '%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Tanda tangan sah namun pengirim tidak dapat diverifikasi"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Badan email tidak tersusun dengan benar."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mengarah ke situs FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Mengarah ke file lokal (%s) cocok pada situs \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mengarah ke file lokal (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mengarah ke data di lokasi lain (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mengarah ke data eksternal yang tidak diketahui (tipe \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Pembentukan email"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Dari"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Balas-Ke"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Untuk"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Tanggal"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Newsgroups"
@@ -11959,7 +11875,7 @@ msgstr "Newsgroups"
 msgid "%s attachment"
 msgstr "Attachment %s"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Tidak dapat membuka pesan S/MIME: Error tidak diketahui"
 
@@ -11975,11 +11891,11 @@ msgstr "Tipe enkripsi ini tidak dapat dipakai pada multipart/encrypted"
 msgid "Unsupported signature format"
 msgstr "Jenis tanda tangan tidak dapat dibaca"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "Error saat melakukan verifikasi tanda tangan"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "Ada error tidak dikenal saat melakukan verifikasi tanda tangan"
 
@@ -11999,7 +11915,7 @@ msgstr "Sekali dalam seminggu"
 msgid "Once per month"
 msgstr "Sekali dalam sebulan"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12011,47 +11927,47 @@ msgstr ""
 "\n"
 "Silakan tunggu sebentar sementara Evolution melakukan migrasi folder..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Tidak dapat membuat folder baru '%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Tidak dapat menyalin folder '%s' ke '%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Tidak dapat membaca kotak surat yang ada di '%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "TIdak dapat membaca data simpanan POP '%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Tidak dapat membuat direktori data simpanan POP3 '%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Tidak dapat menyalin data simpanan POP3 '%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Gagal saat membuat penyimpanan surat lokal '%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Tidak dapat membuat folder email lokal di '%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12068,6 +11984,10 @@ msgstr "Balas ke pengi_rim"
 msgid "Reply to _List"
 msgstr "Balas ke Mi_lis"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Buka Link dalam Br_owser"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "Kirim Pe_san Baru ke..."
@@ -12098,28 +12018,28 @@ msgstr "Silakan pilih servernya."
 msgid "No server has been selected"
 msgstr "Server belum dipilih"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Jangan tampilkan pesan ini lagi."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Penyaringan Pesan"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "pesan"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Simpan Pesan..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Tambah alamat"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Pesan dari %s"
@@ -12161,110 +12081,82 @@ msgid "Composer Window default width"
 msgstr "Lebar standar Jendela Penulis"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Padatkan tampilan alamat pada TO/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Padatkan tampilan alamat dalam TO/CC/BCC ke nomor yang ditentukan dalam "
-"address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Gugus karakter utama yang digunakan untuk menulis pesan baru"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Gugus karakter utama yang digunakan untuk menulis pesan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Gugus karakter utama yang digunakan untuk menampilkan pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Gugus karakter utama yang digunakan untuk menampilkan pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Gaya penerusan email utama"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Tinggi standar Jendela Penulis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Tinggi standar Jendela Pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Tinggi standar dialog Berlangganan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Gaya utama yang digunakan untuk membalas email"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Lebar standar Jendela Penulis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Lebar standar Jendela Pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Lebar standar dialog Berlangganan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Tampilkan indikator kesalahan ejaan kata pada setiap ketikan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Bersihkan Tong Sampah saat keluar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Kosongkan folder Sampah saat keluar dari Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Aktifkan moda caret, kursor akan tampak saat Anda membaca email."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Aktif atau matikan pengetikan pada fasilitas cari"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Aktifkan panel samping fasilitas cari agar anda dapat mulai mencari dengan "
-"mengetikkan pada teks. Gunakan anda dapat dengan mudah menemukan "
-"folder pada panel samping dengan mengetik nama folder dan pemilih akan "
-"berpindah ke folder tersebut."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Aktifkan/matikan mode caret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Tinggi panel daftar pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Tinggi panel daftar pesan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12272,41 +12164,34 @@ msgstr ""
 "Jika pengguna membuka 10 atau lebih pesan pada suatu saat, tanya mereka "
 "apakah memang benar-benar ingin melakukannya."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Jika panel \"Preview\" hidup, maka tampilkan sisi -demi-sisi dari pada "
-"secara tegak."
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
-"Jika tidak adalah penampil untuk jenis mime khusus pada Evolution, maka time "
-"mime manapun pada daftar ini yang dipetakan ke penampil komponen bonobo pada "
-"database tipe mime GNOME boleh dipergunakan untuk menampilkan isinya."
+"Jika tidak adalah penampil untuk jenis mime khusus pada Evolution, "
+"maka time mime manapun pada daftar ini yang dipetakan ke penampil "
+"komponen bonobo pada database tipe mime GNOME boleh dipergunakan "
+"untuk menampilkan isinya."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Kali terakhir pengosongan sampah dilakukan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Daftar label dan warne yang bersesuaian"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Daftar lisensi yang diterima"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Daftar akun"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12314,132 +12199,127 @@ msgstr ""
 "Daftar akun yang dikenal pada komponen surat Evolution. Daftar ini berisi "
 "nama kalimat subdirektori relatif ke /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Daftar judul custom dan apakah mereka diaktifkan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Daftar label yang dikenal komponel surat Evolution. Daftar ini mengandung "
-"kalimat yang berisi nama:warna di mana warna menggunakan penerjemahan hex "
-"HTML."
+"kalimat yang berisi nama:warna di mana warna menggunakan "
+"penerjemahan hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Daftar dari tipe mime untuk diperiksa penampil komponen bonobo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Daftar nama protokol yang lisensinya telah diterima."
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Baca gambar untuk pesan HTML melalui http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
 msgstr ""
-"Baca gambar untuk pesan HTML melalui http(s). Nilai yang bisa adalah: 0 - "
-"Jangan baca gambar dari jaringan 1 - Baca gambar dalam surat dari alamat 2 - "
-"Selalu baca gambar dari jaringan"
+"Baca gambar untuk pesan HTML melalui http(s). Nilai yang bisa adalah: 0 - Jangan "
+"baca gambar dari jaringan 1 - Baca gambar dalam surat dari alamat 2 - Selalu "
+"baca gambar dari jaringan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Aksi saringan log"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Aksi saringan log ke berkas log yang ditentukan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Aksi berkas log ke saringan log"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Aksi berkas log ke saringan log."
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Tandai sebagai Terlihat setelah jeda tertentu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Tandai sebagai Terlihat setelah jeda tertentu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Tandai kutipan dalam pesan \"Pracetak\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Tandai kutipan dalam pesan \"Pracetak\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Tinggi default Jendela Pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Lebar default Jendela Pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Gaya penampilan-pesan (\"normal\", \"judul penuh\", \"sumber\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Hari paling sedikit antara mengosongkan sampah pada saat keluar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
-"Waktu paling sedikit antara mengosongkan sampah pada saat keluar, dalam hari."
+msgstr "Waktu paling sedikit antara mengosongkan sampah pada saat keluar, dalam hari."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Berkas suara untuk Pemberitahuan Email Baru"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Jenis Pemberitahuan Email Baru"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Jumlah alamat ditampilkan dalam TO/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Konfirmasi pada email dengan judul kosong"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Konfirmasi pada saat user hendak menghapus folder"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Konfirmasi user saat mengirim email dengan judul kosong"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Konfirmasi saat user menghapus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Konfirmasi saat user hanya mengisi kolom Bcc saja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Konfirmasi saat user hendak membuka 10 atau lebih pesan pada satu saat"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12447,212 +12327,190 @@ msgstr ""
 "Konfirmasi saat user hendak mengirim email dalam HTML padahal alamat tujuan "
 "tidak mau menerima email dalam HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Konfirmasi saat user hendak mengirim email tanpa mengisi To atau Cc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Konfirmasi saat user mengirim email HTML yang tidak diinginkan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Kenali link dalam teks dan menggantinya."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Kenali smiley pada teks dan ganti dengan gambar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Jalankan tes spam pada email masuk"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Kirim email HTML secara default"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Kirim email HTML secara default."
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Tampilkan Animasi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Tampilkan gambar animasi."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Tampilkan email yang terhapus dengan tercoret dalam daftar email."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Tampilkan email terhapus dalam daftar pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr ""
-"Tampilkan email pengrim pada kolom pembalasan pesan pada daftar pesan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Tampilkan email pengirim dalam kolom pesan daftar pesan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Mainkan suara saat email datang."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Tentukan jenis Notifikasi Email Baru yang diinginkan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Periksa ejaan inline"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Dafarkan tinggi default dialog"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Dafarkan lebar default dialog"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Huruf jenis Terminal"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"Saat terakhir pengosongan tong sampah dilakukan, dalam hari sejak terakhir."
+msgstr "Saat terakhir pengosongan tong sampah dilakukan, dalam hari sejak terakhir."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Huruf terminal untuk penampil surat"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Huruf variable untuk menampilkan surat"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
-"Kunci ini harus mengandung sebauh daftar struktur XML yang menentukan judul "
-"custom, dan apakah akan ditampilkan. Format struktur XML nya adalah &lt; "
-"judul diaktifkan&gt; - jadikan aktif jika judul akan ditampilkan pada surat."
+"Kunci ini harus mengandung sebauh daftar struktur XML yang menentukan judul custom, "
+"dan apakah akan ditampilkan. Format struktur XML nya adalah &lt; judul diaktifkan&gt; - "
+"jadikan aktif jika judul akan ditampilkan pada surat."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-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:94
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Hubungkan daftar pesan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Hubungkan daftar-pesan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Hubungkan daftar-pesan berdasarkan pada Subjek"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Habis waktu untuk menandai pesan sebagai Telah dilihat"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Habis waktu untuk menandai pesan sebagai Telah dilihat."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Kode UID akun standar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Gunakan daemon dan klien Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Gunakan daemon dan klien Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Gunakan jenis huruf sendiri"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Gunakan jenis huruf sendiri saat menampilkan email"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Gunakan tes spam lokal saja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Gunakan tes spam lokal saja (tanpa DNS)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "Use side-by-side or wide layout"
-msgstr "Gunakan susunan sisi-demi-sisi atau melebar"
-
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Huruf lebar bebas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Data menu Lihat/Bcc dipilih"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Data menu Lihat/Bcc dipilih."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Data menu Lihat/Cc dipilih"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Data menu Lihat/Cc dipilih."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Data menu Lihat/From dipilih"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Data menu Lihat/From dipilih."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Data menu Lihat/PostTo dipilih"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Data menu Lihat/PostTo dipilih."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Data menu Lihat/Reply-To dipilih"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Data menu Lihat/ReplyTo dipilih."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12660,14 +12518,6 @@ msgstr ""
 "Tentukan apakah akan kembali menampilkan dalam bentuk thread berdasarkan "
 "judul saat kepala surat tidak berisi kolom In-Reply-To atau References."
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
-msgid "Width of the message-list pane"
-msgstr "Tinggi panel daftar pesan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:120
-msgid "Width of the message-list pane."
-msgstr "Tinggi panel daftar pesan."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Mengimpor data Elm"
@@ -12699,15 +12549,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Folder pengimpor format Kotak Surat Berkeley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Mengimpor '%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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Silakan tunggu sebentar"
 
@@ -12739,11 +12589,11 @@ msgid ""
 "Evolution's scores, and the affected filters use scores instead\n"
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
-msgstr ""
-"Beberapa penyaring surat Netscape anda berdasarkan pada\n"
+msgstr "Beberapa penyaring surat Netscape anda berdasarkan pada\n"
 "prioritas surat, yang tidak dipergunakan pada Evolution.\n"
 "Namun, Evolution menyediakan nilai dalam batas \n"
-"3 s.d 3 yang dapat dengan mudah diberikan ke surat dan saringan.\n"
+"3 s.d 3 yang dapat dengan mudah diberikan ke surat dan saringan."
+"\n"
 "Suatu set saringan disebut \"Saringan Prioritas\"\n"
 "telah ditambahkan yang mengubah prioritas surat Netscape ke\n"
 "nilai Evolution, dan saringan tersebut menggunakan nilai tersebut\n"
@@ -12877,31 +12727,31 @@ msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d belum dibaca"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Buat Email Baru"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "E_mail Baru"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Buat email baru"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Buat Folder Email"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "_Folder Email"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Buat folder email baru"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Gagal melakukan upgrade konfigurasi Email dan folder."
 
@@ -13517,8 +13367,7 @@ msgstr "_Path:"
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr ""
-"_Konfirmasi bila mengirim email HTML ke kontak yang tidak bersedia dikirimi"
+msgstr "_Konfirmasi bila mengirim email HTML ke kontak yang tidak bersedia dikirimi"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -13538,26 +13387,18 @@ msgid "_Show image animations"
 msgstr "Tampilkan Anima_si gambar"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Pendekkan judul To / CC / Bcc ke "
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "G_unakan Koneksi Teracak:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "G_unakan jenis huruf yang sama dengan aplikasi lain"
 
-#: ../mail/mail-config.glade.h:177
-msgid "addresses"
-msgstr "alamat"
-
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "warna"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "deskripsi"
 
@@ -13668,21 +13509,21 @@ msgstr "dengan semua folder lokal"
 msgid "Pinging %s"
 msgstr "Ping %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Melakukan Filter Dalam Folder"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Mengambil Email"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Gagal untuk melakukan filter keluar: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13691,112 +13532,121 @@ msgstr ""
 "Gagal saat menambahkan file ke %s: %s\n"
 "File disimpan ke folder 'Sent' saja."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Gagal saat meletakkan ke folder 'Sent': %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Mengirim pesan email ke %d dari total %d pesan."
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Gagal saat mengirim pesan email ke-%d dari total %d pesan."
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Dibatalkan."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Selesai."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Simpan pesan email ke dalam folder"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pindahkan pesan email ke %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Menyalin pesan email ke %s."
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Pesan email yang diteruskan"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Membuka folder %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Membuka store %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Menghapus folder %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Menghapus dan menyimpan account '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Menyimpan account '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Memperbarui tampilan folder"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Hapus folder"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Mengosongkan tong sampah pada '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Folder Lokal"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Mengambil pesan email %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mengambil %d email"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Menyimpan %d email"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Tidak dapat membuat file keluaran: %s\n"
+"%s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13805,11 +13655,11 @@ msgstr ""
 "Error saat menyimpan pesan email ke: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Simpan lampiran"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13818,22 +13668,22 @@ msgstr ""
 "Tidak dapat membuat file output: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koneksi putus dari %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Menyambung ulang ke %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Pemeriksaan Layanan"
 
@@ -13861,26 +13711,17 @@ msgstr "Menunggu..."
 msgid "Checking for new mail"
 msgstr "Periksa email baru"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Masukkan Sandi untuk %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Masukkan Kata Sandi"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Sandi %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Masukkan Kata Sandi"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "User membatalkan proses"
 
@@ -13936,11 +13777,11 @@ msgstr "Saringan Folder untuk '%s: %s' diperbarui"
 msgid "Updating Search Folders for '%s'"
 msgstr "Memperbarui Saringan Folder untuk '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Ubah Folder Pencarian"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Pilih Folder Pencarian"
 
@@ -13955,30 +13796,30 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"quit.\n"
 msgstr ""
 "Folder tidak-kosong pada &quot;{1}&quot; sudah ada.\n"
 "\n"
 "Anda boleh mengabaikan folder ini, menimpa atau menambahkan isinya, atau "
-"berhenti."
+"berhenti.\n"
 
-#: ../mail/mail.error.xml.h:5
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
 msgstr ""
-"Pemberitahuan terima baca telah diminta untuk &quot;{1}&quot;. Kirim "
-"pemberitahuan penerimaan ke {0}?"
+"Pemberitahuan terima baca telah diminta untuk &quot;{1}&quot;. Kirim pemberitahuan "
+"penerimaan ke {0}?"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr ""
-"Tanda tangan dengan nama &quot;{0}&quot; sudah ada. Coba berikan nama yang "
-"lain."
+"Tanda tangan dengan nama &quot;{0}&quot; sudah ada. Coba berikan nama "
+"yang lain."
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13986,25 +13827,25 @@ msgstr ""
 "Berilah judul pada kolom Subject untuk menggambarkan isi pesan Anda dalam "
 "email ini."
 
-#: ../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 "Apakah benar Anda ingin menghapus akun dan proksinya ini?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Apakah benar Anda ingin menghapus account ini?"
 
-#: ../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 ""
 "Apakah benar Anda ingin mematikan akun ini dan menghapus seluruh proksinya?"
 
-#: ../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 "Anda yakin ini membuka {0} pesan pada satu saat?"
 
-#: ../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?"
@@ -14012,7 +13853,7 @@ msgstr ""
 "Apakah benar ingin menghapus secara permanen semua email yang sudah ditandai "
 "untuk dihapus pada semua folder?"
 
-#: ../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;?"
@@ -14020,115 +13861,115 @@ msgstr ""
 "Apakah benar ingin menghapus secara permanen semua pesan yang telah dihapus "
 "pada folder &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Apakah benar ingin mengirim email dalam bentuk 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 ""
 "Apakah benar ingin mengirim email dengan penerima hanya pada kolom 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 "Apakah benar ingin mengirim email tanpa judul?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "Karena &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "Karena &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Tanda tangan Kosong"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Tidak dapat menambahkan Folder Pencarian &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Tidak dapat menyalin folder &quot;{0}&quot; ke &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Tidak dapat membuat folder &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Tidak dapat membuat direktori penyimpanan sementara."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "TIdak dapat menyimpan direktori simpan, karena &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Tidak dapat menghapus folder &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "TIdak dapat menghapus folder sistem &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Tidak dapat merubah Folder Pencarian &quot;{0}&quot; karena tidak ada."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Tidak dapat memindahkan folder &quot;{0}&quot; ke &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Tidak dapat membuka sumber &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Tidak dapat membuka sumber &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Tidak dapat membuka target &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
 "Tidak dapat membaca berkas lisensi &quot;{0}&quot;, karena masalah "
-"pemasangan. Anda tidak akan bisa menggunakan penyedia ini sampai anda bisa "
-"menerima lisensinya."
+"pemasangan. Anda tidak akan bisa menggunakan penyedia ini sampai "
+"anda bisa menerima lisensinya."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Tidak dapat mengubah nama &quot;{0}&quot; menjadi &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
 "Tidak dapat mengubah nama atau memindahkan folder sistem &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Tidak dapat menyimpan perubahan ke dalam account."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Tidak dapat menyimpan ke direktori &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Tidak dapat menyimpan ke berkas &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Tidak dapat memasang skrip tanda tangan &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14137,71 +13978,71 @@ msgstr ""
 "biasanya kata sandi membedakan antara huruf besar dan kecil, periksa apakah "
 "tombol CapsLock menyala atau tidak."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "Tidak dapat menyimpan file tanda tangan."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Hapus &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "Hapus account ini?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Discard changes?"
 msgstr "Benar tanpa menyimpan?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Jangan hapus"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Jangan matikan"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Lakukan operasi ini pada subfolder?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Anda ingin menandai semua pesan dengan terbaca?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Anda ingin menyimpan?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Masukkan sandi."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Error saat membuka definisi filter."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Error saat melakukan operasi."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "Error saat {0}"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "File sudah ada tapi tidak dapat ditimpa."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "File sudah ada tapi bukan merupakan file biasa."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Bila ya, email yang sudah dihapus tidak dapat dikembalikan."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14209,11 +14050,11 @@ msgstr ""
 "Bila Anda benar ingin menghapusnya, maka semua isi dan semua sub folder yang "
 "ada di dalamnya juga akan dihapus secara permanen."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Bila anda melanjut, semua account proxy akan dihapus secara permanen."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14221,11 +14062,11 @@ msgstr ""
 "Bila anda melanjut, informasi account dan\n"
 "seluruh informasi proxy akan dihapus secara permanen."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Bila ya, semua informasi account akan dihapus secara permanen."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14233,19 +14074,19 @@ msgstr ""
 "Bila Anda keluar, email-email tersebut tidak akan dikirim sampai Evolution "
 "dijalankan lagi."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "Abaikan"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "Otentikasi invalid"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "Filter email telah secara otomatis diperbarui."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14258,35 +14099,35 @@ msgstr ""
 "justru akan ditampilkan di sana. Untuk menghindarinya, silakan isi paling "
 "tidak satu penerima pada kolom To atau Cc."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read"
 msgstr "Tandai semua pesa dengan terbaca"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Mark all messages as read in the selected folder"
 msgstr "Tandai seluruh pesan menjadi terbaca pada folder terpilih"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Folder hilang."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Tidak ada sumber yang dipilih."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Membuka banyak email sekaligus dapat memperlambat sistem."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Coba periksa pengaturan account Anda dan coba lagi."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "Coba aktifkan account atau kirim menggunakan account lain."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14294,7 +14135,7 @@ msgstr ""
 "Silakan masukkan alamat email yang benar pada kolom To. Anda dapat mencari "
 "alamat seseorang dengan menekan tombol di samping isian kolom To."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14305,55 +14146,55 @@ msgstr ""
 "dalam bentuk HTML:\n"
 "{0}Kirim saja?"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Tolong berikan nama unik untuk mengenali tanda tangan ini."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Silakan tunggu."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Masalah saat memindah folder surat lama &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Menghubungi server"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Mencari server untuk daftar mekanisme autentikasi yang didukung."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Baca resep yang diminta."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Benar ingin menghapus folder &quot;{0}&quot; dan semua isinya?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Saringan Folder otomatis diperbarui."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Nota Pengiriman"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "Tanda tangan Sudah Ada"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Keberadaan folder sistem digunakan oleh Evolution untuk dapat bekerja "
+"Keberadaan folder sistem digunakan oleh Ximian Evolution untuk dapat bekerja "
 "dengan benar, dan tidak dapat diganti namanya, dipinahkan, ataupun dihapus."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14371,7 +14212,7 @@ msgstr ""
 "justru akan ditampilkan di sana. Untuk menghindarinya, silakan isi paling "
 "tidak satu penerima pada kolom To atau Cc."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14385,7 +14226,7 @@ msgstr ""
 "....\"{1}\"\n"
 "Dan telah diperbarui."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14399,11 +14240,23 @@ msgstr ""
 "....\"{1}\"\n"
 "Dan telah diperbarui."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
+msgid ""
+"The message was sent via the &quot;sendmail&quot; external application. "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
+msgstr ""
+"Pesan dikirim melalui aplikasi eksternal &quot;sendmail&quot;. Sendmail "
+"melaporkan error berikut: status 67: surat tidak terkirim.\n"
+"Pesan disimpan dalam folder Email Keluar. Silakan periksa errornya dan "
+"ulangi pengiriman."
+
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "File skrip harus ada dan harus dapat dijalankan."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14411,20 +14264,21 @@ msgstr ""
 "Folder ini sepertinya telah ditambahkan secara implisit, tapi silakan buka "
 "pengatur saringan folder untuk menambahkannya secara eksplisit bila perlu."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
-"Pesan ini tidak dapat dikirim karena account yang anda pilih untuk mengirim "
-"tidak aktif."
+"Pesan ini tidak dapat dikirim karena account yang anda pilih untuk mengirim tidak "
+"aktif."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
-msgstr "Pesan ini tidak dapat dikirim karena Anda belum menentukan penerimanya"
+msgstr ""
+"Pesan ini tidak dapat dikirim karena Anda belum menentukan penerimanya"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14432,23 +14286,23 @@ msgstr ""
 "Server ini tidak dapat menggunakan jenis otentikasi ini dan bahkan tidak "
 "menggunakan otentikasi sama sekali."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tanda tangan ini telah diubah tapi belum disimpan."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
-"Akan menandai seluruh pesan sebagai terbaca pada folder terpilih dan "
-"subfoldernya."
+"Akan menandai seluruh pesan sebagai terbaca pada folder terpilih "
+"dan subfoldernya."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "Tidak dapat tersambung ke server GroupWise."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14456,39 +14310,39 @@ msgstr ""
 "Tidak dapat membuka folder draf untuk account ini. Gunakan folder draf "
 "sistem saja?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "Berkas lisensi tidak dapat dibuka."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "Gunakan Stan_dar"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "Gunakan folder draf utama?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr "Anda belum mengisi semua informasi yang dibutuhkan."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Anda memiliki email yang belum dikirim, benar ingin keluar saja?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "Anda tidak boleh membuat dua buah account dengan nama yang sama."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Saringan Folder ini harus diberi nama."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Anda harus memilih folder dulu."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14498,94 +14352,98 @@ msgstr ""
 "Caranya, pilih folder dan/atau pilih semua folder lokal, atau pilih semua \n"
 "folder pada server atau keduanya."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Login ke server &quot;{0}&quot; sebagai &quot;{0}&quot; gagal."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+msgstr "Email dengan judul &quot;{0}&quot; tidak dapat dikirim."
+
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "T_ambahkan"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "_Abaikan"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "_Hapus"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "B_uka Pesan Email"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Belum dilihat"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Sudah dilihat"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Sudah dijawab"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Pesan Belum Dilihat Ganda"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Pesan Ganda"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Paling Rendah"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Bawah"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Lebih Tinggi"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Paling Tinggi"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hari ini %l:%M %p"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Kemarin %l:%M %p"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Pesan"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Buat daftar email"
 
@@ -14605,15 +14463,15 @@ msgstr "Ada flag"
 msgid "Follow Up Flag"
 msgstr "Tanda Untuk Ditindaklanjuti"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Lokasi Asal"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Diterima"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Kirim Pesan"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Ukuran"
@@ -14772,8 +14630,8 @@ msgstr "Alamat Pesan Instant"
 msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
-"Lakukan sinkronisasi informasi kontak dan foto dengan daftar teman program "
-"gaim secara teratur."
+"Lakukan sinkronisasi informasi kontak dan foto dengan daftar teman program gaim "
+"secara teratur."
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
@@ -14786,8 +14644,8 @@ msgid ""
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"Otomatis isi buku alamat anda dengan nama dan alamat surat ketika anda "
-"membalas pesan. Juga isi informasi alamat IM dari daftar teman anda."
+"Otomatis isi buku alamat anda dengan nama dan alamat surat ketika anda membalas "
+"pesan. Juga isi informasi alamat IM dari daftar teman anda."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14879,8 +14737,12 @@ msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
 msgstr ""
-"Plugin coba yang menunjukkan plugin menu popup yang memudahkan anda untuk "
-"menyalin sesuatu ke papan tempel."
+"Plugin coba yang menunjukkan plugin menu popup yang memudahkan anda "
+"untuk menyalin sesuatu ke papan tempel."
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Salin Alamat _Email"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -14924,8 +14786,8 @@ msgid ""
 "Provides functionallity for marking a calendar or addressbook as the default "
 "one."
 msgstr ""
-"Sediakan fungsionalitas untuk menandai kalender ataupun buku alamat sebagai "
-"yang awal."
+"Sediakan fungsionalitas untuk menandai kalender ataupun buku alamat "
+"sebagai yang awal."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15030,30 +14892,29 @@ msgstr "Ukuran Folder"
 msgid "Exchange Settings"
 msgstr "Pengaturan Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "_Otentikasi"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "Jenis Otentikasi"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "Lihat Pilihan Yang T_ersedia"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-calendar.c:193
+#: ../plugins/exchange-operations/exchange-contacts.c:167
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
-"Evolution pada mode offline. Anda tidak dapat membuat ataupun memodifikasi "
-"direktori.\n"
+"Evolution pada mode offline. Anda tidak dapat membuat ataupun memodifikasi direktori.\n"
 "Coba pindah ke mode online untuk menjalankan operasi tersebut."
 
 #. User entered a wrong existing
@@ -15089,15 +14950,13 @@ msgid "Your current password has expired. Please change your password now."
 msgstr ""
 "Sandi Anda saat ini telah kadaluwarsa. Silakan ganti sandi Anda sekarang."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Kata sandi anda akan kadaluarsa dalam %d hari"
 
-#. 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
 msgid "Custom"
 msgstr "Sesuaikan"
 
@@ -15218,7 +15077,7 @@ msgstr "Nama Folder"
 msgid "Folder Size"
 msgstr "Ukuran Folder"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Daftar ke Direktor Pengguna Yang Lain"
@@ -15233,14 +15092,14 @@ msgstr "Pohon Folder Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Stop Langganan Folder..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Stop langganan folder \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Stop langganan \"%s\""
@@ -15366,26 +15225,22 @@ msgid "Cannot display folders."
 msgstr "Tidak dapat menampilkan folder."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Gagal melakukan operasi."
-
-#: ../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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Perubahan terhadap konfigurasi akun Exchange \"{0}\" akan diaktifkan setelah Anda "
+"Perubahan terhadap konfigurasi akun Exchange akan diaktifkan setelah Anda "
 "keluar dan menjalankan ulang Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Tidak dapat melakukan otentikasi ke server"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Tidak dapat merubah sandi."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15395,55 +15250,55 @@ msgstr ""
 "ada error yang tidak dikenal. Periksa dulu URLnya,\n"
 "nama pengguna dan sandinya, kemudian coba lagi."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Tidak dapat tersambung ke Server Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Tidak dapat tersambung ke server {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Gagal menentukan hak akses folder untuk delegasi."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Sistem Penyimpanan Web Exchange tidak dapat ditemukan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Server {0} tidak dapat ditemukan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "{0} tidak dapat dijadikan delegasi"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Hak akses folder tidak dapat dibaca"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Hak akses folder tidak dapat dibaca."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Status kehadiran di kantor tidak dapat dibaca"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Hak akses folder tidak dapat diperbarui"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Status kehadiran di kantor tidak dapat diperbarui"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Akun Exchange sedang padam."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15470,28 +15325,28 @@ msgstr ""
 "{0}\n"
 ".."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Gagal memperbarui delegasi:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Folder sudah ada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Folder tidak ada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Folder tidak tersambung"
 
-#: ../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:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Error generik"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15499,66 +15354,66 @@ msgstr ""
 "Tentukan path OWA pada dialog konfigurasi bila OWA berada pada path yang "
 "berbeda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Kotak surat {0} tidak ada pada server ini."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Pastikan URLnya sudah ditulis dengan benar, dan silakan coba lagi."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Pastikan nama servernya ditulis dengan benar, kemudian silakan coba kembali."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr "Pastikan nama pengguna dan sandinya benar, kemudian silakan coba lagi."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Server Katalog Global belum dikonfigurasikan untuk akun ini."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Kotak surat penggguna {0} pada {1} tidak ada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Pengguna {0} tidak ada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Sandi berhasil diubah."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Silakan jalankan ulang Evolution supaya perubahan diterapkan"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Silakan jalankan ulang Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Silakan pilih penggunanya."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Sandi tidak diterima oleh server sebab terlalu mudah."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Akun Exchange akan dimatikan saat Anda keluar dari Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Akun Exchange ini akan dihapus saat Anda keluar dari Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 "Server Exchange ini tidak dapat digunakan oleh program Konektor Exchange "
 "Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15566,7 +15421,7 @@ msgstr ""
 "Server ini menjalankan Exchange 5.5. Konektor Exchange \n"
 "hanya mendukung Microsoft Exchange 2000 dan 2003 saja."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15580,87 +15435,87 @@ msgstr ""
 "\n"
 "Atau mungkin anda salah mengetikkan password anda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Silakan coba lagi dengan sandi yang lain."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Pengguna tidak dapat dimasukkan dalam daftar kendali akses:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Delegasi tidak dapat diubah."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Error tak dikenal saat mencari {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Error tak dikenal."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Jenis tidak dikenal"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Operasi tidak dapat dilakukan"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Sebentar lagi kotak surat Anda pada server akan melewati batas quota."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Anda tidak boleh membuat delegasi untuk Anda sendiri"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Anda telah melampaui batas quota pada server ini."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Anda hanya dapat melakukan konfigurasi pada satu akun Exchange saja."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
-"Total pemakaian anda: {0} KB. Hapuslah surat yang tidak diperlukan untuk "
-"menambah tempat."
+"Total pemakaian anda: {0} KB. Hapuslah surat yang tidak diperlukan "
+"untuk menambah tempat."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
-"Total pemakaian anda: {0} KB. Anda sudah tidak dapat mengirim atau menerima "
-"email sekarang."
+"Total pemakaian anda: {0} KB. Anda sudah tidak dapat mengirim atau "
+"menerima email sekarang."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 msgstr ""
-"Total pemakaian anda: {0} KB. Anda tidak dapat mengirim email sampai Anda "
-"menghapus email-email yang tidak perlu."
+"Total pemakaian anda: {0} KB. Anda tidak dapat mengirim email sampai "
+"Anda menghapus email-email yang tidak perlu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Sandi Anda sudah kadaluwarsa."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} tidak dapat dimasukkan dalam daftar kontrol akses"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} sudah merupakan delegasi"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} sudah ada dalam daftar"
 
@@ -15686,7 +15541,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Stop Langganan Folder"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr "Daftar cek"
 
@@ -15855,10 +15710,7 @@ msgstr "Login Proksi"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSilakan masukkan kata sandi untuk %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:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "Login _Proksi..."
 
@@ -15919,12 +15771,12 @@ msgid "Select Calendar"
 msgstr "Pilih Kalender"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Impor"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Bentuk iCalendar (.ics)"
 
@@ -15974,107 +15826,105 @@ msgstr "Tidak dapat membuka kalender/tugas!"
 
 #: ../plugins/ipod-sync/sync.c:292
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Tidak dapat membuka daftar kalender/tugas Evolution untuk mengeksport data."
+msgstr "Tidak dapat membuka daftar kalender/tugas Evolution untuk mengeksport data."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Tidak dapat membuka kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Suatu pertemuan pada kalender '%s' bentrokan dengan rapat ini"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Menemukan pertemuan pada kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Gagal menemukan kalender apapun"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Gagal menemukan pertemuan ini pada kelender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Gagal menemukan tugas ini pada daftar tugas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Gagal menemukan isian jurnal ini dalam jurnal manapun"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Mencari versi yang ada untuk pertemuan ini"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Data tidak dapat diuraikan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Tidak dapat mengirim data ke kalender '%s', %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Terima kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Terkirim sebagai tentatif pada kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Tolak kalender '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Kirim ke kalender '%s' sebagai dibatalkan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Pengatur telah menghapus delegasi %s."
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Kirimkan nota pembatalan pada delegasi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nota pembatalan tidak dapat dikirimkan pada delegasi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Status peserta tidak dapat diperbarui karena berisi status yang tidak "
+msgstr "Status peserta tidak dapat diperbarui karena berisi status yang tidak "
 "dikenal!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Data peserta %s tidak dapat diperbarui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Status peserta diperbarui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Data kalender berikut salah"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16082,15 +15932,15 @@ msgstr ""
 "Pesan ini katanya berisi kalender, tapi kalendernya bukan merupakan "
 "iCalendar yang benar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Objek dalam kalender ini tidak benar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16098,11 +15948,11 @@ msgstr ""
 "Email ini berisi kalender, tapi ternyata tidak terdapat informasi tentang "
 "acara, tugas atau informasi jadwal sibuk/bebasnya"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Kalender yang terlampir terdiri dari banyak objek"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16112,17 +15962,17 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Hapus pesan setelah beraksi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Pencarian Bermasalah"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Cari adanya jadwal pertemuan yang bentrok pada kalender"
 
@@ -16470,26 +16320,26 @@ msgid "_Update"
 msgstr "Pembar_uan"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Waktu mulai:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Waktu berakhir:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Keterangan: "
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Kirim pembar_uan ke peserta"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "Tera_pkan keseluruh kejadian"
 
@@ -16504,10 +16354,10 @@ msgstr "Pembentuk Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
-"&quot;{0}&quot; telah mendelegasikan pertemuan. Anda ingin memasukkan delegasi "
-"&quot;{1}&quot;?"
+"&quot;{0}&quot; telah mendelegasikan pertemuan. Masukkan delegasi &quot;{1}"
+"&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16621,7 +16471,8 @@ msgstr "Mi_lis"
 msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
-msgstr "Menyediakan aksi untuk perintah milis umum (daftar, lepas ...)"
+msgstr ""
+"Menyediakan aksi untuk perintah milis umum (daftar, lepas ...)"
 
 #: ../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
@@ -16745,8 +16596,8 @@ msgid "Mark All Read"
 msgstr "Anggap Sudah _Dibaca"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "Anggap Pe_san sudah Dibaca"
+msgid "Mark me_ssages as read"
+msgstr "Anggap pe_san sudah dibaca"
 
 #: ../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"
@@ -16834,8 +16685,8 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"Plugin coba yang menunjukkan pembentuk plugin yang membolehkan anda memilih "
-"untuk mematikan pesan HTML.\n"
+"Plugin coba yang menunjukkan pembentuk plugin yang membolehkan anda "
+"memilih untuk mematikan pesan HTML.\n"
 "\n"
 "Plugin ini hanya menunjukkan code yang tidak didukung saja.\n"
 
@@ -16984,8 +16835,8 @@ msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
 msgstr ""
-"Saring pesan sampah menggunakan Spamassassin. Plugin ini memerlukan "
-"pemasangan Spamassassin."
+"Saring pesan sampah menggunakan Spamassassin. Plugin ini memerlukan pemasangan "
+"Spamassassin."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
@@ -17012,12 +16863,12 @@ msgstr "Simpan semua lampiran"
 msgid "Select save base name"
 msgstr "Pilih basis nama penyimpanan"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Tipe MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Simpan"
 
@@ -17127,7 +16978,7 @@ msgid "RDF format (.rdf)"
 msgstr "Bentuk RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Pilih berkas tujuan"
 
@@ -17176,19 +17027,19 @@ msgstr ""
 "\n"
 "Silakan klik tombol \"Maju\" untuk mulai."
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Pilih informasi mana saja yang hendak diimpor:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Dari %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Mengimpor data."
 
@@ -17242,48 +17093,40 @@ msgid "Default window height"
 msgstr "Tinggi jendela awal"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-msgid "Default window state"
-msgstr "Lebar jendela awal"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Lebar jendela awal"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID atau alias komponen yang ditampilkan pada saat mulai dijalankan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "Versi konfigurasi Evolution terakhir yang diupgrade."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Daftar path folder yang akan disinkronkan ke disk untuk keperluan offline"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "Pengaturan pencetak"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Sidebar is visible"
 msgstr "Panel samping kelihatan"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Lewatkan dialog peringatan pengembangan"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Jalankan dalam moda offline"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Panel status kelihatan"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17291,19 +17134,19 @@ msgstr ""
 "Versi konfigurasi Evolution, dengan tingkat utama/kecil/konfigurasi "
 "(contohnya \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "Tinggi default untuk jendela utama, dalam piksel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "Lebar default untuk jendela utama, dalam piksel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "Lebar awal batang sisi dalam piksel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17311,53 +17154,46 @@ msgstr ""
 "Versi peningkatan terakhir Evolution, dengan tingkat utama/kecil/konfigurasi "
 "(contohnya \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"Gaya tombol jendela. Bisa \"teks\", \"ikon\", \"keduanya\", \"toolbar\". "
-"Jika \"toolbar\", gaya tombol ditentukan oleh setingan toolbar GNOME."
+"Gaya tombol jendela. Bisa \"teks\", \"ikon\", \"keduanya\", \"toolbar\". Jika "
+"\"toolbar\", gaya tombol ditentukan oleh setingan toolbar GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "Batang tombol kelihatan"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Apakah Evolution akan dimulai dalam mode offline atau online."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether or not the window should be maximized."
-msgstr "Tentukan apakah jendela harus dibesarkan."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether the sidebar should be visible."
 msgstr "Tentukan apakah panel samping kelihatan atau tidak."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Tentukan apakah panel status harus kelihatan."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "Tentukan apakah batang tombol kelihatan atau tidak"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Apakah kotak peringatan versi development Evolution akan dilewatkan."
+msgstr ""
+"Apakah kotak peringatan versi development Evolution akan dilewatkan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "Tentukan apakah tombol jendela kelihatan atau tidak"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "Gaya tombol jendela"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "Tombol jendela kelihatan"
 
@@ -17378,11 +17214,11 @@ msgstr "Klik OK untuk menutup koneksi ini dan masuk ke moda offline"
 msgid "(Untitled)"
 msgstr "(Tidak berjudul)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Pilih jenis program impor yang akan dijalankan:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17396,11 +17232,11 @@ msgstr ""
 "Anda boleh memilih \"Otomatis\" bila Anda tidak tahu, dan Evolution akan "
 "mencoba menebaknya."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Pilih tujuan impor ini"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17412,23 +17248,23 @@ msgstr ""
 "tidak mendeteksi adanya konfigurasi tersebut.\n"
 "Bila hendak mencoba lagi, klik pada tombol \"Mundur\".\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nama f_ile:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Pilih sebuah file"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Tipe file:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Impor data dan pengaturan dari pr_ogram-program lama"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Mengimpor _satu file"
 
@@ -17486,7 +17322,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "_Kerja Online"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Matikan Sambungan"
 
@@ -17494,57 +17330,49 @@ msgstr "_Matikan Sambungan"
 msgid "Work Offline"
 msgstr "Kerja Offline"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution sekarang online. Klik tombol ini untuk offline."
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution dalam proses offline."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution saat ini offline. Klik tombol ini untuk online."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "Ubah ke %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Error sistem tidak diketahui."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Argumen invalid"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Tidak dapat registrasi OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Konfigurasi Database tidak ada"
 
-#: ../shell/e-user-creatable-items-handler.c:689
-#: ../shell/e-user-creatable-items-handler.c:748
-msgid " New "
-msgstr " Baru "
-
-#: ../shell/e-user-creatable-items-handler.c:693
-#: ../shell/e-user-creatable-items-handler.c:705
-#: ../shell/e-user-creatable-items-handler.c:752
-#: ../shell/e-user-creatable-items-handler.c:764
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Baru"
 
@@ -17600,7 +17428,7 @@ msgstr ""
 "kegiatan impor file-file lama Anda ke dalam Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17627,14 +17455,13 @@ msgstr ""
 "Jika anda ingin versi stabil Evolution, kami sarankan anda membuang versi "
 "ini, dan memasang versi %s saja.\n"
 "\n"
-"Jika anda menemukan kesalahan, tolong beritahukan pada kami di bugzilla."
-"gnome.org.\n"
+"Jika anda menemukan kesalahan, tolong beritahukan pada kami di bugzilla.gnome.org.\n"
 "Produk ini datang tanpa jaminan dan sebagainya.\n"
 "\n"
 "Kami harap anda menikmati hasil kerja keras kami, dan kami dengan sabar "
 "menanti kontribusi dari anda!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17642,39 +17469,35 @@ msgstr ""
 "Terima kasih\n"
 "Tim Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Jangan beritahu saya lagi"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Jalankan Evolution sambil mengaktifkan komponen tersebut"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Jalankan dalam moda online"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Matikan semua komponen Evolution dengan paksa"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Lakukan migrasi ulang dari Evolution 1.4 secara paksa"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Simpan hasil debug semua komponen ke dalam sebuah file."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Jangan buka plugin."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "  Pemakai Surat dan PIM Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17704,8 +17527,8 @@ msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
-"Melupakan kata sandi anda akan menghapus seluruh kata sandi yang telah "
-"diingat. Nanti anda akan dimintai kata sandi apabila perlu."
+"Melupakan kata sandi anda akan menghapus seluruh kata sandi yang telah diingat. "
+"Nanti anda akan dimintai kata sandi apabila perlu."
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -17730,8 +17553,8 @@ msgstr ""
 "Semua isi direktori &quot;evolution&quot; akan segera dihapus.\n"
 "\n"
 "Sebaiknya Anda memeriksa sendiri apakah semua surat, alamat, dan data "
-"kalender Anda masih ada, dan periksa apakah dalam versi baru ini dapat "
-"bekerja dengan baik sebelum menghapus data lama Anda.\n"
+"kalender Anda masih ada, dan periksa apakah dalam versi baru ini "
+"dapat bekerja dengan baik sebelum menghapus data lama Anda.\n"
 "\n"
 "Apabila data lama sudah dihapus, Anda tidak dapat menurunkan versi Evolution "
 "Anda kembali ke versi lama secara otomatis.\n"
@@ -17748,9 +17571,8 @@ msgstr ""
 "Evolution versi sebelumnya menyimpan data dalam tempat lain.\n"
 "\n"
 "Bila Anda memutuskan untuk menghapus data ini, maka keseluruhan isi "
-"direktori &quot;evolution&quot; akan dihapus. Bila Anda ingin menyimpan data "
-"ini, maka anda dapat menghapus isi direktori &quot;evolution&quot; ini "
-"secara manual nanti.\n"
+"direktori &quot;evolution&quot; akan dihapus. Bila Anda ingin menyimpan data ini, "
+"maka anda dapat menghapus isi direktori &quot;evolution&quot; ini secara manual nanti.\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -18109,7 +17931,7 @@ msgid "_Edit CA Trust"
 msgstr "_Ubah Trust 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:664
 msgid "Certificate already exists"
 msgstr "Sertifikat sudah ada"
 
@@ -18341,12 +18163,6 @@ msgstr "Sa_lin Seluruh Alamat Ke..."
 msgid "Contact _Preview"
 msgstr "_Pracetak Alamat"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Salin"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Salin Alamat Terpilih ke Folder Lain..."
@@ -18448,7 +18264,7 @@ msgid "Select All"
 msgstr "Pilih semua"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Pilih semu_a"
@@ -18518,7 +18334,7 @@ msgstr "_Pindahkan Alamat ke..."
 msgid "_Move Folder Contacts To"
 msgstr "_Pindahkan Folder Alamat Ke"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "Buat Bar_u"
 
@@ -18579,7 +18395,6 @@ msgid "Month"
 msgstr "Bulan"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Selanjutnya"
 
@@ -18588,7 +18403,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Lihat contoh hasil kalendar yang hendak dicetak"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Sebelum"
 
@@ -18676,11 +18491,11 @@ msgstr "Pindahkan pilihan ke papan tempel"
 msgid "Paste from clipboard"
 msgstr "Tempel dari papan tempel"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Tempelkan teks dari klipbod"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Pilih semua teks"
 
@@ -18715,31 +18530,30 @@ msgstr "Klik di sini untuk menampilkan bantuan tersedia"
 msgid "Close"
 msgstr "Tutup"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "S_isipkan"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "L_ampiran..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "Ba_ntuan"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Masukkan"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Pilihan"
@@ -18837,11 +18651,6 @@ msgstr "Apakah menampilkan waktu sebagai sibuk"
 msgid "_Alarms"
 msgstr "_Alarm"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategori"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18907,73 +18716,53 @@ msgid "F_older"
 msgstr "F_older"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "_Pratinjau Email"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Pindahkan folder terpilih ini ke folder lain"
 
 #. 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 "Hapus secara permanen semua pesan yang sudah dihapus dari semua folder"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "F_older Pencarian"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Tampilkan _Pratinjau Pesan"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Tampilkan preview pesan di bawah daftar pesan"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Tampilkan preview email sisi-demi-sisi dalam daftar pesan"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Tampilkan jendela pratinjau"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Masuk atau keluar dari keanggotaan folder pada server"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "Tampilan _Klasik"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Salin Folder..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Penyar_ingan Pesan"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Pindahkan Folder..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "Buat Bar_u..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Preview"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Langganan"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "Tampilan _Tegak"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Ubah nama folder ini"
@@ -19539,10 +19328,6 @@ msgid "_Unread"
 msgstr "Bel_um Dibaca"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Perbesar"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Perbesar"
 
@@ -19550,7 +19335,7 @@ msgstr "_Perbesar"
 msgid "Close this window"
 msgstr "Tutup jendela ini"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Kotak perkakas utama"
 
@@ -19625,6 +19410,11 @@ msgstr "Dapatkan pengiriman pemberitahuan ketika pesan anda dibaca"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "S_isipkan"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Buka berkas"
@@ -19954,51 +19744,43 @@ msgstr "Ikon d_an teks"
 msgid "Import data from other programs"
 msgstr "Impor data dari program lain"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "Su_sunan"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "_Jendela Baru"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "Pe_ngaturan"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Kirim / Terima"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Ki_rim / Terima"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Kirim antrian email dan ambil email baru"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Atur konfigurasi Pilot"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Tampilkan informasi tentang Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Tampilkan Panel _Samping"
+msgid "Side _Bar"
+msgstr "Panel _Samping"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Tampilkan Panel _Status"
+msgid "Status _Bar"
+msgstr "Panel _Status"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Tampilkan Kotak _peralatan"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Tampilkan informasi tentang Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Kirimkan Laporan Bug"
 
@@ -20006,71 +19788,75 @@ msgstr "Kirimkan Laporan Bug"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Kirim Laporan _Bug"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Kirim laporan bug dengan menggunakan program Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Atur apakah ingin offline atau online"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Kotak _peralatan"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Seperti kotak peralatan"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Tampil/Sembunyi Panel Samping"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Tampil/Sembunyikan Panel Status"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "Tutup _Jendela"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "_Lupa Kata sandi"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Sembunyikan tombol"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "_Ikon saja"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Jalur Cepat"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Tampilan Modul"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Pilihan _Sinkronisasi..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "_Teks saja"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Jendela"
 
@@ -20107,34 +19893,26 @@ msgid "_Work Week View"
 msgstr "Tampilan Per Minggu _Kerja"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Sebagai Fol_der Terkirim untuk Tampilan Lebar"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "_Sebagai Folder Terkirim"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Berdasarkan S_tatus"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Berdasarkan Pe_ngirim"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Berdasarkan Su_byek"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Berdasarkan Tanda _Follow Up"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Untuk _Tampilan Lebar"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Pesan"
 
@@ -20150,12 +19928,8 @@ msgstr "_Dengan Jatuh Tempo"
 msgid "With _Status"
 msgstr "Dengan _Status"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20211,7 +19985,7 @@ msgid "_Edit..."
 msgstr "_Ubah..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1839
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20276,19 +20050,14 @@ msgstr "Jenis Tampilan"
 msgid "Type of view:"
 msgstr "Jenis tampilan:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Gunakan fasilitas penampilan lampiran otomatis"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "SSRKJSM"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20356,7 +20125,7 @@ msgid "Minimum Width"
 msgstr "Lebar minimal"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Rongga"
 
@@ -20498,23 +20267,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Terbuka"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Apakah ingin mengembangkan"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Teks pada bingkai label"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Gunakan garis bawah"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20522,89 +20291,73 @@ msgstr ""
 "Bila diset, karakter yang diberi garis bawah adalah karakter kunci "
 "akselerator mnemonik."
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Ruangan antara label dan anak"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Widget label"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Widget yang ditampilkan pada label expander"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Ukuran ekspander"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Ukuran panah ekspander"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Jarak Indikator"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Ruangan di sekeliling indikator"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Pencarian Detil"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Simpan Pencarian"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Pencarian"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Pencarian"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Simpan Pencarian"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Simpan Pencarian..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "Ubah P_encarian Tersimpan..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "Penc_arian Detil..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Seluruh Account"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Akun Saat ini"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Folder Saat ini"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Pesan Saat ini"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Pilih Gambar"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Peta Dunia"
 
-#: ../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."
@@ -20636,52 +20389,52 @@ msgstr "Alirkan ulang model"
 msgid "Column width"
 msgstr "Lebar kolom"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Cari"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Cari"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Cari"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Kosongkan"
 
-#: ../widgets/misc/e-search-bar.c:787
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Jenis pencarian:"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID Item"
 
-#: ../widgets/misc/e-search-bar.c:794 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "ID Subitem"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Teks"
 
-#. 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:913
-msgid "Show: "
-msgstr "Tampilkan:"
-
-#. 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:929
-msgid "S_earch: "
-msgstr "C_ari: "
-
-#. 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:940
-msgid " in "
-msgstr " dalam "
-
-#: ../widgets/misc/e-selection-model-array.c:547
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "_Cari"
+
+#: ../widgets/misc/e-selection-model-array.c:546
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "Baris kursor"
 
-#: ../widgets/misc/e-selection-model-array.c:554
+#: ../widgets/misc/e-selection-model-array.c:553
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "Kolom Kursor"
@@ -20874,23 +20627,23 @@ msgstr "Kolom Terfokus"
 msgid "Unselected Column"
 msgstr "Kolum Tak Terpilih"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Kolom Tercoret"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Kolom Bergaris Bawah"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Kolom Tebal"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Kolom Warna"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Kolom Warna Latar"
 
@@ -20905,7 +20658,6 @@ msgstr "K_olom Tersedia:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Naik"
 
@@ -20916,7 +20668,6 @@ msgstr "Hapus Semua"
 
 #: ../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 "Descending"
 msgstr "Turun"
 
@@ -21014,14 +20765,14 @@ msgstr "_Tampilkan kolom ini dengan urutan:"
 #: ../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-header-item.c:1804
 msgid "DnD code"
 msgstr "Kode 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-header-item.c:1818
 msgid "Full Header"
 msgstr "Judul Penuh"
 
@@ -21139,69 +20890,65 @@ msgstr "Tinggi baris seragam"
 msgid "Frozen"
 msgstr "Beku"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Sesuaikan Tampilan"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Urutkan Ascending"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Urutkan Descending"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Jangan urutkan"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Kelompokkan sesuai dengan daerah ini"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Kelompokkan Sesuai Kotak"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Hapus Kolom"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Sisipkan Kolom..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Penyesuaian"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Penempatan terbaik"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Format Kolom..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Ubah Tampilan..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Urutkan"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Susunan Jenis Huruf"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Info urutan"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1846
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21380,73 +21127,6 @@ msgstr "Konteks IM"
 msgid "Handle Popup"
 msgstr "Tangani Popup"
 
-#~ msgid "Category is"
-#~ msgstr "Kategori"
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "date-end"
-#~ msgstr "tanggal-akhir"
-
-#~ msgid "date-start"
-#~ msgstr "tanggal-awal"
-
-#~ msgid "Original Location"
-#~ msgstr "Lokasi Asal"
-
-#~ msgid "Search Type"
-#~ msgstr "Jenis pencarian:"
-
-#~ msgid "Subitem ID"
-#~ msgstr "ID Subitem"
-
-#, fuzzy
-#~ msgid "Find No_w"
-#~ msgstr "_Cari"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Konferensi Video"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "Lokas_i:"
-
-#~ msgid "Dele_gatees"
-#~ msgstr "Dele_gasi"
-
-#~ msgid "From:"
-#~ msgstr "Dari:"
-
-#~ msgid "Properties..."
-#~ msgstr "Pengaturan..."
-
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Tidak dapat membuat file keluaran: %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 ""
-#~ "Pesan dikirim melalui aplikasi eksternal &quot;sendmail&quot;. Sendmail "
-#~ "melaporkan error berikut: status 67: surat tidak terkirim.\n"
-#~ "Pesan disimpan dalam folder Email Keluar. Silakan periksa errornya dan "
-#~ "ulangi pengiriman."
-
-#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-#~ msgstr "Email dengan judul &quot;{0}&quot; tidak dapat dikirim."
-
-#~ msgid "_Insert"
-#~ msgstr "_Masukkan"
-
 #~ msgid "Addressbook"
 #~ msgstr "Buku Alamat"
 
diff --git a/po/it.po b/po/it.po
index c352269ab6..f193415427 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@
 # Alessio Dessi <alessio.dessi@libero.it>, 2003
 # Monica Badia <Monica.Badia@Sun.COM>, 2003
 # Craig Jeffares <cjeffares@novell.com>, 2004.
-# Luca Ferretti <elle.uca@infinito.it>, 2003-2005.
+# Luca Ferretti <elle.uca@infinito.it>, 2003-2006.
 #
 # Convenzioni adottate:
 #
@@ -30,8 +30,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 11:34+0100\n"
-"PO-Revision-Date: 2006-02-28 11:33+0100\n"
+"POT-Creation-Date: 2006-03-11 17:00+0100\n"
+"PO-Revision-Date: 2006-03-19 15:18+0100\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -102,12 +102,10 @@ msgstr "Evento di calendario: nessun indice."
 
 # descrizione accessibile... spero di averla indovinata -Luca
 #: ../a11y/calendar/ea-cal-view-event.c:268
-#, fuzzy
 msgid "calendar view event"
 msgstr "evento vista calendario"
 
 #: ../a11y/calendar/ea-cal-view-event.c:485
-#, fuzzy
 msgid "Grab Focus"
 msgstr "Cattura il focus"
 
@@ -137,32 +135,32 @@ msgid "a table to view and select the current time range"
 msgstr ""
 "una tabella per visualizzare e selezionare l'intervallo di tempo corrente"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Presenta %d evento."
 msgstr[1] "Presenta %d eventi."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Non presenta eventi."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista settimana lavorativa: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista giornaliera: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "vista calendario per una settimana lavorativa"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "vista calendario per uno o più giorni"
 
@@ -238,21 +236,21 @@ msgstr "Pulsante \"vai a\""
 msgid "Click here, you can find more events."
 msgstr "Fare clic qui per trovare altri eventi."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista mensile: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista settimanale: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "vista calendario per un mese"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "vista calendario per una o più settimane"
 
@@ -681,7 +679,7 @@ msgstr "_Rubrica"
 msgid "Create a new address book"
 msgstr "Crea una nuova rubrica"
 
-#: ../addressbook/gui/component/addressbook-component.c:382
+#: ../addressbook/gui/component/addressbook-component.c:406
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Aggiornamento delle impostazioni o delle cartelle della rubrica fallito."
@@ -707,7 +705,7 @@ msgstr ""
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
@@ -1058,6 +1056,9 @@ msgid ""
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
 msgstr ""
+"Il filtro di ricerca è il tipo di oggetto cercato, durante l'esecuzione "
+"della ricerca. Se questo non è modificato, in modo predefinito la ricerca "
+"verrà eseguida sulla objectclass di tipo \"person\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
@@ -1231,13 +1232,10 @@ msgstr "tessere"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2020
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1497,7 +1495,7 @@ msgstr "Indirizzo"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2508,7 +2506,7 @@ msgstr "Servizio"
 # verificare nel codice se indica effettivamente posizione geografica -Luca
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Ubicazione"
@@ -2572,15 +2570,15 @@ msgstr "Cambiato"
 msgid "Contact Editor - %s"
 msgstr "Editor dei contatti - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2757
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Selezionare un'immagine per questo contatto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Nessuna immagine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2588,7 +2586,7 @@ msgstr ""
 "I dati del contatto non sono validi:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contatto non valido."
 
@@ -2746,8 +2744,8 @@ msgstr "Servizio _IM:"
 # verificare che sia realmente ubicazione -Luca
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:222
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "_Ubicazione:"
 
@@ -2919,7 +2917,7 @@ msgstr "Origine"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2932,7 +2930,7 @@ msgid "Save as VCard..."
 msgstr "Salva come VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -2999,7 +2997,7 @@ msgstr "_Taglia"
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1182
 #: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
@@ -3158,7 +3156,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:497
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
@@ -3197,7 +3195,7 @@ msgstr "Sito Web"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:656
@@ -3205,7 +3203,7 @@ msgstr "Sito Web"
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Larghezza"
@@ -3213,14 +3211,14 @@ msgstr "Larghezza"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-field-chooser-item.c:663
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Altezza"
@@ -3741,19 +3739,19 @@ msgstr "Importatore CSV e Tab di Evolution"
 msgid "Importing ..."
 msgstr "Importazione..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato dati di scambio LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Importatore LDIF di Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Importatore VCard di Evolution"
 
@@ -3923,8 +3921,8 @@ msgstr "Ombreggiatura"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:205
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "Dimensione:"
 
@@ -4222,7 +4220,6 @@ msgstr ""
 "loro di accettare questo compito."
 
 #: ../calendar/calendar.error.xml.h:32
-#, fuzzy
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
@@ -4242,7 +4239,6 @@ msgid "Error loading task list"
 msgstr "Errore nel caricare l'elenco di compiti"
 
 #: ../calendar/calendar.error.xml.h:36
-#, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4251,7 +4247,6 @@ msgstr ""
 "potrebbero non venire a conoscenza che il diario è stato eliminato."
 
 #: ../calendar/calendar.error.xml.h:37
-#, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4260,7 +4255,6 @@ msgstr ""
 "potrebbero non venire a conoscenza che la riunione è stata annullata."
 
 #: ../calendar/calendar.error.xml.h:38
-#, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4285,22 +4279,20 @@ msgstr ""
 "partecipanti di mantenere i propri elenchi di compiti aggiornati."
 
 #: ../calendar/calendar.error.xml.h:41
-#, fuzzy
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
 " È in corso lo scaricamento di alcuni allegati. Salvando ora l'appuntamento, "
-"questo non includerà tali allegati non ancora disponibili "
+"si potrebbero perdere tali allegati."
 
 #: ../calendar/calendar.error.xml.h:42
-#, fuzzy
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
-" È in corso lo scaricamento di alcuni allegati. Salvando ora il compito, "
-"questo non includerà tali allegati non ancora disponibili "
+" È in corso lo scaricamento di alcuni allegati. Salvando ora il compito, si "
+"potrebbero perdere tali allegati."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
@@ -4357,12 +4349,10 @@ msgid "Would you like to save your changes to this task?"
 msgstr "Salvare le modifiche apportate a questo compito?"
 
 #: ../calendar/calendar.error.xml.h:56
-#, fuzzy
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "Inviare una notifica di annullamento per questa voce di diario?"
 
 #: ../calendar/calendar.error.xml.h:57
-#, fuzzy
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Inviare a tutti i partecipanti una notifica di annullamento?"
 
@@ -4383,7 +4373,6 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "Inviare ai partecipanti informazioni aggiornate sul compito?"
 
 #: ../calendar/calendar.error.xml.h:62
-#, fuzzy
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4552,7 +4541,7 @@ msgid "Memos"
 msgstr "Memo"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
@@ -4578,9 +4567,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Servizio notifica allarme del calendario di Evolution"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
@@ -4714,67 +4700,34 @@ msgstr "Impossibile creare la fabbrica per il servizio di notifica allarme"
 msgid "invalid time"
 msgstr "tempo non valido"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld secondi)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "secondo"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "secondi"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u secondo"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u secondi"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u minuto"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
 #, c-format
-msgid " %u minutes"
-msgstr " %u minuti"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ora"
+msgstr[1] "%d ore"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
 #, c-format
-msgid "%u hour"
-msgstr "%u ora"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minuti"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
 #, c-format
-msgid "%u hours"
-msgstr "%u ore"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d secondo"
+msgstr[1] "%d secondi"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -5480,7 +5433,7 @@ msgstr "minuto/i"
 msgid "start of appointment"
 msgstr "inizio dell'appuntamento"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Azione/Attivatore"
 
@@ -5947,134 +5900,134 @@ msgstr "Messaggio allegato - %s"
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
 #: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3034
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Messaggio allegato"
 msgstr[1] "%d messaggi allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Sposta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Annulla _trascinamento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Impossibile aggiornare l'oggetto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> allegato"
 msgstr[1] "<b>%d</b> allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Nascondi _barra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Mostra _barra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3597
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Proprietà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3600
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Aggiungi allegato..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
-#: ../mail/em-format-html-display.c:2063
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Mostra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Premere la barra spaziatrice per commutare la barra degli allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Modifica appuntamento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Riunione - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
 # Novell Translation
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Compito assegnato - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Compito - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce diario - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Nessun indice"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
 #: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "allegato"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "I cambiamenti apportati a questa voce possono essere scartati se arriva un "
 "aggiornamento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Impossibile usare la versione corrente!"
 
@@ -6165,107 +6118,107 @@ msgid "Recurrence"
 msgstr "Ricorrenza"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Questo evento presenta degli allarmi"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "Cale_ndario:"
 
 # Novell Translation
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:446
 msgid "Or_ganizer:"
 msgstr "Or_ganizzatore:"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Delegati"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Partecipa_nti"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Evento senza data di inizio"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Evento senza data di termine"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "La data di inizio è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "La data di termine è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "L'ora di inizio è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "L'ora di termine è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:909
 msgid "The organizer selected no longer has an account."
 msgstr "L'organizzatore selezionato non ha più un account"
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr "È richiesto un organizzatore."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr "È richiesto almeno un partecipante."
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "A_ggiungi "
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossibile aprire il calendario «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d giorno prima dell'appuntamento"
 msgstr[1] "%d giorni prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d ora prima dell'appuntamento"
 msgstr[1] "%d ore prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto prima dell'appuntamento"
 msgstr[1] "%d minuti prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Personalizza"
 
@@ -6274,7 +6227,7 @@ msgstr "Personalizza"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6405,14 +6358,14 @@ msgstr "Membro"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6553,6 +6506,15 @@ msgstr "il"
 msgid "first"
 msgstr "primo"
 
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+msgid "second"
+msgstr "secondo"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
@@ -6861,30 +6823,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d settimana"
 msgstr[1] "%d settimane"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ora"
-msgstr[1] "%d ore"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minuti"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d secondo"
-msgstr[1] "%d secondi"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Azione sconosciuta da portare a termine"
@@ -7060,7 +6998,7 @@ msgstr "No"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
@@ -7082,35 +7020,35 @@ msgstr "Ricorrente"
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Selezionare una cartella per salvare gli allegati selezionati..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "immagine_senza_nome.%s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Sa_lva come..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Imposta come _sfondo"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Salva selezionati"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
@@ -7394,9 +7332,9 @@ msgstr ""
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
 #: ../calendar/gui/e-day-view-time-item.c:552
-#, fuzzy, c-format
+#, c-format
 msgid "%02i minute divisions"
-msgstr "%02i divisioni per minuto"
+msgstr "divisioni da %02i minuti"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -7548,17 +7486,15 @@ msgstr "Declinato"
 
 # ma che senso ha?
 #: ../calendar/gui/e-itip-control.c:1224
-#, fuzzy
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
-"La riunione è stata annullata, tuttavia potrebbe non essere presente nei "
-"propri calendari"
+"La riunione è stata annullata, tuttavia potrebbe essere presente nei propri "
+"calendari"
 
 # ma che senso ha?
 #: ../calendar/gui/e-itip-control.c:1226
-#, fuzzy
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
@@ -7945,7 +7881,7 @@ msgid "Delegated"
 msgstr "Delegato"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Partecipante                      "
 
@@ -8052,7 +7988,7 @@ msgstr "Fare clic per aggiungere un memo"
 msgid "Memo sort"
 msgstr "Ordinamento memo"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -8071,7 +8007,7 @@ msgstr "Caricamento memo"
 msgid "Opening memos at %s"
 msgstr "Apertura memo presso %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Eliminazione oggetti selezionati..."
 
@@ -8080,20 +8016,20 @@ msgstr "Eliminazione oggetti selezionati..."
 msgid "Enter the password for %s"
 msgstr "Inserire la password per %s"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Caricamento compiti"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Apertura compiti presso %s"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Completamento compiti..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Pulizia"
 
@@ -8208,19 +8144,19 @@ msgstr "È necessario impostare un organizzatore."
 msgid "At least one attendee is necessary"
 msgstr "È richiesto almeno un partecipante"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
 msgid "Event information"
 msgstr "Informazioni sull'evento"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
 msgid "Task information"
 msgstr "Informazioni sul compito"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
 msgid "Journal information"
 msgstr "Informazioni sul diario"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
 msgid "Free/Busy information"
 msgstr "Informazioni libero/occupato"
 
@@ -8240,16 +8176,16 @@ msgstr "Aggiorna"
 msgid "Counter-proposal"
 msgstr "Contro-proposta"
 
-#: ../calendar/gui/itip-utils.c:775
+#: ../calendar/gui/itip-utils.c:772
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informazioni libero/occupato (da %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:782
 msgid "iCalendar information"
 msgstr "Informazioni iCalendar"
 
-#: ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:937
 msgid "You must be an attendee of the event."
 msgstr "È necessario essere un partecipante all'evento."
 
@@ -8373,12 +8309,6 @@ msgstr "Impossibile migrare il calendario «%s»"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Impossibile migrare i compiti «%s»."
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d secondi)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1"
@@ -10296,7 +10226,7 @@ msgid "%.0fG"
 msgstr "%.0f GB"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Barra allegati"
 
@@ -10426,7 +10356,7 @@ msgid "Hide _Attachment Bar"
 msgstr "Nascondi _barra allegati"
 
 #: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
-#: ../composer/e-msg-composer.c:3843
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Mostra _barra allegati"
 
@@ -10461,12 +10391,12 @@ msgstr "Generata autom."
 msgid "Si_gnature:"
 msgstr "Si_gla:"
 
-#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
-#: ../composer/e-msg-composer.c:3728
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Composizione messaggio"
 
-#: ../composer/e-msg-composer.c:4952
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10902,7 +10832,7 @@ msgstr "Nome della ric_erca:"
 
 #: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
-msgstr "Trova elementi che soddisfano i seguenti criteri"
+msgstr "Trova gli elementi che soddisfano i seguenti criteri"
 
 #: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
@@ -10934,7 +10864,7 @@ msgstr "Nessuna risposta o genitore"
 
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
-msgstr "Includere le discussioni"
+msgstr "Includi discussioni"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:311
@@ -11037,6 +10967,10 @@ msgstr "fa"
 msgid "months"
 msgstr "mesi"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "secondi"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "l'ora corrente"
@@ -11154,46 +11088,46 @@ msgstr "Scelta cartella"
 msgid "Ask for each message"
 msgstr "Domandare per ciascun messaggio"
 
-#: ../mail/em-account-editor.c:1779 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identità"
 
-#: ../mail/em-account-editor.c:1828 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Ricezione email"
 
-#: ../mail/em-account-editor.c:2012
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "Controllare automaticamente la _nuova posta ogni"
 
-#: ../mail/em-account-editor.c:2193 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Invio email"
 
-#: ../mail/em-account-editor.c:2252 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Predefiniti"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2318 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Sicurezza"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2355 ../mail/em-account-editor.c:2446
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Ricezione opzioni"
 
-#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Controllo nuova posta"
 
-#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor account"
 
-#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Assistente agli account di Evolution"
 
@@ -11215,7 +11149,7 @@ msgstr "[Predefinito]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Abilitato"
 
@@ -11244,18 +11178,18 @@ msgstr "Aggiungi script di sigla"
 msgid "Signature(s)"
 msgstr "Sigla/e"
 
-#: ../mail/em-composer-utils.c:873 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "------- Messaggio inoltrato -------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1666
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:1713
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11356,9 +11290,11 @@ msgstr "esiste"
 msgid "Expression"
 msgstr "Espressione"
 
+# For Follow Up --> da completare
+#
 #: ../mail/em-filter-i18n.h:25
 msgid "Follow Up"
-msgstr "Segue"
+msgstr "Da completare"
 
 #: ../mail/em-filter-i18n.h:27
 msgid "is"
@@ -11374,7 +11310,7 @@ msgstr "è prima di"
 
 #: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
-msgstr "è con segnalazione"
+msgstr "è contrassegnato"
 
 #: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
@@ -11390,7 +11326,7 @@ msgstr "non è"
 
 #: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
-msgstr "è senza segnalazione"
+msgstr "non è contrassegnato"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
@@ -11520,7 +11456,7 @@ msgstr "Oggetto"
 
 #: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
-msgstr "Stato non impostato"
+msgstr "Azzera stato"
 
 #. and now for the action area
 #: ../mail/em-filter-rule.c:488
@@ -11533,20 +11469,20 @@ msgstr "_Crea cartella di ricerca da ricerca..."
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:145
+#: ../mail/em-folder-properties.c:150
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Messaggi in totale:"
 msgstr[1] "Messaggi in totale:"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:158
+#: ../mail/em-folder-properties.c:163
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Messaggi non letti:"
 msgstr[1] "Messaggi non letti:"
 
-#: ../mail/em-folder-properties.c:289
+#: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Proprietà cartella"
@@ -11752,9 +11688,8 @@ msgid "Mark as _Not Junk"
 msgstr "Contrassenga come atten_dibile"
 
 #: ../mail/em-folder-view.c:1103
-#, fuzzy
 msgid "Mark for Follo_w Up..."
-msgstr "Contrassengal come seg_ue..."
+msgstr "Contrassenga per com_pletamento..."
 
 #: ../mail/em-folder-view.c:1105
 msgid "_Label"
@@ -11766,11 +11701,11 @@ msgstr "_Nessuno"
 
 #: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
-msgstr "Fla_g completata"
+msgstr "_Contrassegna come completato"
 
 #: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
-msgstr "Pu_lisci flag"
+msgstr "Pu_lisci contrassegno"
 
 #: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
@@ -11958,64 +11893,64 @@ msgstr "_Visualizza certificato"
 msgid "This certificate is not viewable"
 msgstr "Certificato non è visualizzabile"
 
-#: ../mail/em-format-html-display.c:1172
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completato il %d %B %Y alle %k.%M"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Scaduto:"
 
-#: ../mail/em-format-html-display.c:1183
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "per il %d %b alle %k.%M"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Visualizza inlinea"
 
-#: ../mail/em-format-html-display.c:1244
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Nascondi"
 
-#: ../mail/em-format-html-display.c:1245
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Adatta alla _larghezza"
 
-#: ../mail/em-format-html-display.c:1246
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Mostra dimensioni _originali"
 
-#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: ../mail/em-format-html-display.c:1872
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Selezionare una cartella per salvare tutti gli allegati..."
 
-#: ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Salva selezionati..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d alle_gato"
 msgstr[1] "%d alle_gati"
 
-#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "S_alva"
 
-#: ../mail/em-format-html-display.c:2004
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "S_alva tutti"
 
-#: ../mail/em-format-html-display.c:2065
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Nessun allegato"
 
@@ -13068,7 +13003,6 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL non è supportato in questa compilazione di Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-#, fuzzy
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Si_gle</b>"
 
@@ -13705,7 +13639,7 @@ msgstr "Trova nel messaggio"
 #: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
-msgstr "Segnalazione che segue"
+msgstr "Contrassegna per completamento"
 
 #: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
@@ -13732,8 +13666,8 @@ msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"I messaggi selezionati come seguenti sono elencati sotto.\n"
-"Selezionare un'azione seguente dal menu \"Segnalazioni\"."
+"I messaggi selezionati per il completamento sono elencati sotto.\n"
+"Selezionare un'azione di completamento dal menu \"Contrassegno\"."
 
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
@@ -13745,7 +13679,7 @@ msgstr "Sca_de il:"
 
 #: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
-msgstr "_Segnalazione:"
+msgstr "C_ontrassegno:"
 
 #: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
@@ -13986,7 +13920,7 @@ msgid "Checking for new mail"
 msgstr "Controllo nuova posta"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:681
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Inserire la password per %s"
@@ -14077,7 +14011,6 @@ msgstr ""
 "accodare il suo contentuto, oppure di uscire.\n"
 
 #: ../mail/mail.error.xml.h:6
-#, fuzzy
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -14204,7 +14137,6 @@ msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Impossibile aprire la destinazione «{2}»."
 
 #: ../mail/mail.error.xml.h:34
-#, fuzzy
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14521,7 +14453,6 @@ msgstr ""
 "Le regole sono state aggiornate."
 
 #: ../mail/mail.error.xml.h:104
-#, fuzzy
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14741,15 +14672,15 @@ msgstr "Scadenza"
 
 #: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
-msgstr "Segnalazione di stato"
+msgstr "Stato contrassegno"
 
 #: ../mail/message-list.etspec.h:5
 msgid "Flagged"
-msgstr "Con segnalazione"
+msgstr "Contrassegnato"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "Segnalazione che segue"
+msgstr "Contrassegno da completare"
 
 #: ../mail/message-list.etspec.h:8
 msgid "Original Location"
@@ -14775,7 +14706,7 @@ msgstr "Non inoltrare"
 
 #: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
-msgstr "Segue"
+msgstr "Da completare"
 
 #: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
@@ -15203,8 +15134,8 @@ msgstr "Tipo di autenticazione"
 msgid "Ch_eck for Supported Types"
 msgstr "Verifica _tipi supportati"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:193
+#: ../plugins/exchange-operations/exchange-contacts.c:167
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15244,7 +15175,7 @@ msgid "Your current password has expired. Please change your password now."
 msgstr ""
 "La password attualmente in uso è scaduta. È opportuno cambiarla subito."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "La password in uso scadrà tra %d giorni"
@@ -15595,7 +15526,6 @@ msgid "Exchange Account is offline."
 msgstr "L'account Exchange è fuori linea."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-#, fuzzy
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15610,19 +15540,17 @@ msgid ""
 "{0}\n"
 "  "
 msgstr ""
-"Exchange Connector richiede l'acceso ad una certa\n"
 "funzionalità su Exchange Server che sembra essere\n"
-"disabilitate o bloccata, di solito in modo non\n"
-"intenzionale. L'amministratore del proprio server\n"
-"Exchage dovrebbe abilitare tale funzionalità per\n"
-"consentire l'uso di Ximian Connector.\n"
+"disabilitate o bloccata (di solito in modo non\n"
+"intenzionale). L'amministratore del server Exchange\n"
+"in uso dovrebbe abilitare tale funzionalità per\n"
+"consentire l'uso di Evolution Exchange Connector.\n"
 "\n"
 "Per le informazioni da fornire al proprio \n"
 "amministratore di Exchange, seguire questo collegamento:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
-"   "
+"{0}\n"
+"  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
@@ -16598,6 +16526,9 @@ msgstr "<b>%s</b> ha declinato il seguente compito assegnato:"
 msgid "_Open Calendar"
 msgstr "_Apri calendario"
 
+# Exchange/Outlook: Accepted --> Accettato
+#
+# LF
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:710
 #: ../plugins/itip-formatter/itip-view.c:715
@@ -16607,27 +16538,33 @@ msgstr "_Apri calendario"
 msgid "_Accept"
 msgstr "_Accetta"
 
+# Exchage/Outlook: Declined --> Rifiutato
+#
+# LF
 #: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
-msgstr "_Declina tutti"
+msgstr "_Rifiuta tutti"
 
 #: ../plugins/itip-formatter/itip-view.c:713
 #: ../plugins/itip-formatter/itip-view.c:718
 #: ../plugins/itip-formatter/itip-view.c:734
 #: ../plugins/itip-formatter/itip-view.c:739
 msgid "_Decline"
-msgstr "_Declina"
+msgstr "_Rifiuta"
 
+# Exchange/Outlook: Tentative --> Provvisorio
+#
+# LF
 #: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
-msgstr ""
+msgstr "_Provvisori tutti"
 
 #: ../plugins/itip-formatter/itip-view.c:714
 #: ../plugins/itip-formatter/itip-view.c:719
 #: ../plugins/itip-formatter/itip-view.c:735
 #: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
-msgstr ""
+msgstr "_Provvisorio"
 
 #: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
@@ -17099,7 +17036,7 @@ msgstr "Posizioni"
 msgid "_Publish Calendar Information"
 msgstr "_Pubblica informazioni calendario"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Rimuovere veramente questo URL?"
 
@@ -17366,7 +17303,6 @@ msgstr "Assistente di configurazione di Evolution"
 msgid "Welcome"
 msgstr "Benvenuti"
 
-# Novell Translation
 #: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
@@ -17374,9 +17310,7 @@ msgid ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Benvenuti a Evolution. Le schermate successive consentono di connettere "
-"Evolution al proprio conto e-mail e di importare file da altre "
-"applicazioni. \n"
+"Benvenuti in Evolution. Le schermate successive consentono di connettere Evolution ai propri account email e di importare file da altre applicazioni. \n"
 "\n"
 "Fare clic sul pulsante \"Avanti\" per continuare. "
 
@@ -19215,14 +19149,12 @@ msgid "Change the properties of this folder"
 msgstr "Cambia le proprietà di questa cartella"
 
 #: ../ui/evolution-mail-list.xml.h:3
-#, fuzzy
 msgid "Collapse All _Threads"
-msgstr "Raggruppa per _discussione"
+msgstr "Comprimi ogni _discussione"
 
 #: ../ui/evolution-mail-list.xml.h:4
-#, fuzzy
 msgid "Collapse all message threads"
-msgstr "Segna tutti i messaggi come letti"
+msgstr "Comprime tutti i messaggi nelle discussioni"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
@@ -19235,7 +19167,7 @@ msgstr "Taglia i messaggi selezionati negli appunti"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "E_spandi tutte discussioni"
+msgstr "E_spandi ogni discussione"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
@@ -19243,7 +19175,7 @@ msgstr "Ri_pulisci"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "Espande tutti i messaggi in discussioni"
+msgstr "Espande tutti i messaggi nelle discussioni"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
@@ -19327,7 +19259,7 @@ msgstr "Raggruppa per _discussione"
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
-msgstr "_Messaggio"
+msgstr "Me_ssaggio"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -19475,13 +19407,12 @@ msgid "Filter the selected messages for junk status"
 msgstr "Filtra i messaggi selezionati per lo stato indesiderato"
 
 #: ../ui/evolution-mail-message.xml.h:39
-#, fuzzy
 msgid "Flag selected messages for follow-up"
-msgstr "Segnala messaggi selezionati come seguenti"
+msgstr "Contrassegna i messaggi selezionati per il completamento"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
-msgstr "Se_gue..."
+msgstr "Com_pletamento..."
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
@@ -19683,19 +19614,18 @@ msgstr "Non _importante"
 msgid "Zoom _Out"
 msgstr "Rid_uci ingrandimento"
 
+# Messaggio: Inoltra come -> Allegato | In linea | Citato
 #: ../ui/evolution-mail-message.xml.h:101
-#, fuzzy
 msgid "_Attached"
-msgstr "Allega"
+msgstr "_Allegato"
 
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
-msgstr "_Modalità visualizzazione cursore"
+msgstr "M_odalità con cursore"
 
 #: ../ui/evolution-mail-message.xml.h:103
-#, fuzzy
 msgid "_Clear Flag"
-msgstr "Pu_lisci flag"
+msgstr "Pu_lisci contrassegno"
 
 #: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
@@ -19706,9 +19636,8 @@ msgid "_Find in Message..."
 msgstr "Tr_ova nel messaggio..."
 
 #: ../ui/evolution-mail-message.xml.h:109
-#, fuzzy
 msgid "_Flag Completed"
-msgstr "Fla_g completata"
+msgstr "Contrassegna come co_mpletato"
 
 #: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
@@ -20062,7 +19991,7 @@ msgstr "_Inverti selezione"
 
 #: ../ui/evolution-task-editor.xml.h:4
 msgid "Click change / view the status details of the task"
-msgstr ""
+msgstr "Fare clic per cambiare/visualizzare i dettagli di stato del compito"
 
 #: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
@@ -20265,7 +20194,7 @@ msgstr "Mostra/Nasconde la barra di stato"
 
 #: ../ui/evolution.xml.h:38
 msgid "_About"
-msgstr "I_nfomazioni"
+msgstr "I_nformazioni"
 
 #: ../ui/evolution.xml.h:39
 msgid "_Close Window"
@@ -20357,7 +20286,7 @@ msgstr "Per _oggetto"
 
 #: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
-msgstr "Per segnato come _seguente"
+msgstr "Per contrassegno di com_pletamento"
 
 #: ../views/mail/galview.xml.h:6
 msgid "_Messages"
@@ -20557,17 +20486,17 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Larghezza minima"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Larghezza minima"
 
@@ -20827,15 +20756,16 @@ msgstr "Sincronizza Record Privati:"
 msgid "Sync Categories:"
 msgstr "Categorie Sync:"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "Messaggio vuoto"
 
-#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#, fuzzy
 msgid "Reflow model"
-msgstr ""
+msgstr "Modello di reflow"
 
-#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "Larghezza colonna"
 
@@ -21077,23 +21007,23 @@ msgstr "Colonna con focus"
 msgid "Unselected Column"
 msgstr "Colonna deselezionata"
 
-#: ../widgets/table/e-cell-text.c:1744
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Colonna barrata"
 
-#: ../widgets/table/e-cell-text.c:1751
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Colonna sottolineata"
 
-#: ../widgets/table/e-cell-text.c:1758
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Colonna in grassetto"
 
-#: ../widgets/table/e-cell-text.c:1765
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Colonna colorata"
 
-#: ../widgets/table/e-cell-text.c:1779
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Colore di sfondo colonna"
 
@@ -21141,6 +21071,7 @@ msgid "Sh_ow these fields in order:"
 msgstr "_Mostra questi campi nell'ordine:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Mostra campi"
@@ -21199,6 +21130,10 @@ msgstr "Non ordinato"
 msgid "No grouping"
 msgstr "Non raggruppato"
 
+#: ../widgets/table/e-table-config.c:584
+msgid "Available Fields"
+msgstr "Campi disponibili"
+
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "_Raggruppa per..."
@@ -21261,7 +21196,7 @@ msgstr "%s (%d oggetti)"
 #: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Colori colonna alternativi"
 
@@ -21269,7 +21204,7 @@ msgstr "Colori colonna alternativi"
 #: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
 #: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "Disegna griglia orizzontale"
@@ -21278,7 +21213,7 @@ msgstr "Disegna griglia orizzontale"
 #: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "Disegna griglia verticale"
@@ -21287,7 +21222,7 @@ msgstr "Disegna griglia verticale"
 #: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "Disegna focus"
@@ -21296,7 +21231,7 @@ msgstr "Disegna focus"
 #: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Modalità cursore"
 
@@ -21304,7 +21239,7 @@ msgstr "Modalità cursore"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Modello di selezione"
 
@@ -21312,7 +21247,7 @@ msgstr "Modello di selezione"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
 #: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
 #: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
@@ -21322,7 +21257,7 @@ msgstr "Lunghezza soglia"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
 #: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
@@ -21399,15 +21334,15 @@ msgstr "Informazioni ordinamento"
 msgid "Tree"
 msgstr "Albero"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Intestazione tabella"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Modello tabella"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Riga cursore"
 
@@ -21581,184 +21516,3 @@ msgstr "Contesto IM"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Gestisci popup"
-
-#~ msgid "Addressbook"
-#~ msgstr "Rubrica"
-
-#~ msgid ""
-#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
-#~ "if you are in a insecure environment. For example, if you and your LDAP "
-#~ "server are behind a firewall at work, then Evolution doesn't need to use "
-#~ "SSL/TLS because your connection is already secure."
-#~ msgstr ""
-#~ "Selezionando quest'opzione, Evolution tenterà di utilizzare SSL/TLS "
-#~ "solamente se ci si trova in un ambiente insicuro. Per esempio se si è, "
-#~ "insieme al server LDAP, dietro ad un firewall funzionante, Evolution non "
-#~ "necessita di utilizzare SSL/TLS dato che la connessione è già sicura."
-
-#~ msgid "Task Table"
-#~ msgstr "Tabella compiti"
-
-#~ msgid "Removal Complete"
-#~ msgstr "Rimozione completata"
-
-#~ msgid "Con_tacts..."
-#~ msgstr "Con_tatti..."
-
-#~ msgid "Memo Table"
-#~ msgstr "Tabella memo"
-
-#~ msgid "Timezone Button"
-#~ msgstr "Pulsante fuso orario"
-
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "La suite Evolution per il groupware"
-
-#~ msgid "Mail Accounts Table"
-#~ msgstr "Tabella account di posta"
-
-#~ msgid "Attachment Button"
-#~ msgstr "Pulsante allegati"
-
-#~ msgid "Toggle Attachment Bar"
-#~ msgstr "Commuta barra allegati"
-
-#~ msgid "Filters"
-#~ msgstr "Filtri"
-
-#~ msgid "_Show animated images"
-#~ msgstr "Mostrare i_mmagini animate"
-
-#~ msgid "<b>%s (%s)</b> : %s"
-#~ msgstr "<b>%s (%s)</b> : %s"
-
-#~ msgid "<b>%s (%s)</b>"
-#~ msgstr "<b>%s (%s)</b>"
-
-#~ msgid "<b>%s</b> : %s"
-#~ msgstr "<b>%s</b> : %s"
-
-#~ msgid "<b>%s</b>"
-#~ msgstr "<b>%s</b>"
-
-#~ msgid "Message List"
-#~ msgstr "Elenco messaggi"
-
-#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Contatti automatici</span>"
-
-#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Contatti di messaggistica istantanea</span>"
-
-#~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "<span weight=\"bold\">Ricerca conflitti</span>"
-
-#~ msgid "_All day Event"
-#~ msgstr "_Evento intera giornata"
-
-#~ msgid "Previous Button"
-#~ msgstr "Pulsante precedente"
-
-#~ msgid "Text Date Entry"
-#~ msgstr "Inserimento testo data"
-
-#~ msgid "Date Button"
-#~ msgstr "Pulsante data"
-
-#~ msgid "Time Combo Box"
-#~ msgstr "Casella combinata orario"
-
-#~ msgid "Search Text Entry"
-#~ msgstr "Inserimento testo da cercare"
-
-#~ msgid "Advanced..."
-#~ msgstr "Avanzata..."
-
-#~ msgid "Select target addressbook."
-#~ msgstr "Seleziona rubrica di destinazione."
-
-#~ msgid "(none)"
-#~ msgstr "(nessuna)"
-
-#~ msgid "Primary Email"
-#~ msgstr "Email principale"
-
-#~ msgid "Select an Action"
-#~ msgstr "Seleziona un'azione"
-
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "Crea un nuovo contatto «%s»"
-
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Aggiungi indirizzo al contatto esistente «%s»"
-
-#~ msgid "Merge E-Mail Address"
-#~ msgstr "Unisci indirizzi email"
-
-#~ msgid "<b>Calendars</b>"
-#~ msgstr "<b>Calendari</b>"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferenze"
-
-#~ msgid "_Configure Alarms"
-#~ msgstr "_Configura allarmi"
-
-#~ msgid "<b>Publishing</b>"
-#~ msgstr "<b>Pubblicazione</b>"
-
-#~ msgid "Publishing Table"
-#~ msgstr "Tabella di pubblicazione"
-
-#~ msgid "_Add URL"
-#~ msgstr "_Aggiungi URL"
-
-# Novell Translation
-#~ msgid "Or_ganizer"
-#~ msgstr "Or_ganizzatore"
-
-#~ msgid "_Description:"
-#~ msgstr "_Descrizione:"
-
-#~ msgid "<b>Dele_gatees</b>"
-#~ msgstr "<b>Dele_gati</b>"
-
-#~ msgid "<b>From:</b>"
-#~ msgstr "<b>Da:</b>"
-
-#~ msgid "<span weight=\"bold\">Basics</span>"
-#~ msgstr "<span weight=\"bold\">Base</span>"
-
-#~ msgid "Classi_fication:"
-#~ msgstr "Classi_ficazione:"
-
-#~ msgid "_Group"
-#~ msgstr "_Gruppo"
-
-#~ msgid "T_erminal Font:"
-#~ msgstr "Carattere del t_erminale:"
-
-#~ msgid "dialog1"
-#~ msgstr "dialogo1"
-
-#~ msgid "Id"
-#~ msgstr "ID"
-
-#~ msgid "Path"
-#~ msgstr "Percorso"
-
-# Novell Translation
-#~ msgid "Evolution Settings"
-#~ msgstr "Impostazioni di Evolution"
-
-#~ msgid "_Select All"
-#~ msgstr "_Seleziona tutto"
-
-#~ msgid "Show Time _Zone"
-#~ msgstr "Mostra _fuso orario"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "I_nformazioni su Evolution..."
-
-#~ msgid "Available Fields"
-#~ msgstr "Campi disponibili"
diff --git a/po/ka.po b/po/ka.po
index 003b0cb30f..ff218ff3f0 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,26 +1,26 @@
-# translation of evolution.po to Georgian
+# translation of evolution.gnome-2-14.po to Georgian
 # Copyright © 2005 Canonical Ltd, and Rosetta Contributors 2005
 # This file is distributed under the same license as the evolution package.
+#
 # Alexander Didebulidze <didebuli@in.tum.de>, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution\n"
+"Project-Id-Version: evolution.gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-03 06:04+0100\n"
-"PO-Revision-Date: 2006-03-08 22:04+0100\n"
-"Last-Translator: Alexander Didebulidze <didebuli@in.tum.de>\n"
+"POT-Creation-Date: 2006-03-10 06:12+0100\n"
+"PO-Revision-Date: 2006-03-15 00:00+0100\n"
+"Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n"
 "Language-Team: Georgian <gnome@inet.ge>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=1; plural=0"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
-msgstr "evolution მისამართების გწიგნაკი"
+msgstr "ევოლუშენ მისამართების წიგნაკი"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:226
@@ -34,9 +34,9 @@ msgstr "ახალი კონტაქტების სია"
 
 #: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
+#, fuzzy
 msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
-msgstr[0] ""
+msgstr "წიგნაკი"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -52,8 +52,9 @@ msgid "Contact: "
 msgstr "კონტაქტი: "
 
 #: ../a11y/addressbook/ea-minicard.c:168
+#, fuzzy
 msgid "evolution minicard"
-msgstr ""
+msgstr "Evolution-Minicard"
 
 #: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
@@ -70,16 +71,17 @@ msgstr "ეს არის შეხვედრა."
 #: ../a11y/calendar/ea-cal-view-event.c:247
 #, fuzzy, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "კალენდარი შემთხვევა ჯამური."
+msgstr "კალენდარი მოვლენა რეზიუმე წმ."
 
 #: ../a11y/calendar/ea-cal-view-event.c:249
 #, fuzzy
 msgid "Calendar Event: It has no summary."
-msgstr "კალენდარი შემთხვევა არა."
+msgstr "კალენდარი მოვლენა არა."
 
 #: ../a11y/calendar/ea-cal-view-event.c:268
+#, fuzzy
 msgid "calendar view event"
-msgstr ""
+msgstr "კალენდარი მოვლენა"
 
 #: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
@@ -90,8 +92,9 @@ msgid "New Appointment"
 msgstr "ახალი ტერმინი"
 
 #: ../a11y/calendar/ea-cal-view.c:303
+#, fuzzy
 msgid "New All Day Event"
-msgstr ""
+msgstr "ახალი ყველა დღე მოვლენა"
 
 #: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
@@ -107,36 +110,40 @@ msgstr "წადი თარიღზე"
 
 #: ../a11y/calendar/ea-day-view-main-item.c:299
 #: ../a11y/calendar/ea-week-view-main-item.c:301
+#, fuzzy
 msgid "a table to view and select the current time range"
-msgstr ""
+msgstr "a ცხრილი -სკენ და"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
+#, fuzzy
 msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] ""
+msgstr "მოვლენა."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#, fuzzy
 msgid "It has no events."
-msgstr ""
+msgstr "არა."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "სამუშაო კვირის ხედი: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "დღის ხედი: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
+#, fuzzy
 msgid "calendar view for a work week"
-msgstr ""
+msgstr "კალენდარი a კვირა"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
+#, fuzzy
 msgid "calendar view for one or more days"
-msgstr ""
+msgstr "კალენდარი ან მეტი დღე"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
 #: ../calendar/gui/calendar-component.c:661
@@ -195,38 +202,43 @@ msgid "Gnome Calendar"
 msgstr "Gnome კალენდარი"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:290
+#, fuzzy
 msgid "search bar"
-msgstr ""
+msgstr "ძიება"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:291
+#, fuzzy
 msgid "evolution calendar search bar"
-msgstr ""
+msgstr "კალენდარი ძიება"
 
 #: ../a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
 msgstr "გადახტომის ღილაკი"
 
 #: ../a11y/calendar/ea-jump-button.c:158
+#, fuzzy
 msgid "Click here, you can find more events."
-msgstr ""
+msgstr "პოვნა მეტი."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "თვის ხედი: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "კვირის ხედი: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
+#, fuzzy
 msgid "calendar view for a month"
-msgstr ""
+msgstr "კალენდარი a თვე"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
+#, fuzzy
 msgid "calendar view for one or more weeks"
-msgstr ""
+msgstr "კალენდარი ან მეტი"
 
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
 msgid "popup"
@@ -234,12 +246,14 @@ msgstr ""
 
 #. action name
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#, fuzzy
 msgid "popup a child"
-msgstr ""
+msgstr "a"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#, fuzzy
 msgid "edit"
-msgstr ""
+msgstr "რედაქტირება"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:613
 msgid "begin editing this cell"
@@ -259,26 +273,30 @@ msgid "expand"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#, fuzzy
 msgid "expands the row in the ETree containing this cell"
-msgstr ""
+msgstr "რიგი -"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
 msgid "collapse"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#, fuzzy
 msgid "collapses the row in the ETree containing this cell"
-msgstr ""
+msgstr "რიგი -"
 
 #: ../a11y/e-table/gal-a11y-e-cell.c:107
+#, fuzzy
 msgid "Table Cell"
-msgstr ""
+msgstr "ცხრილი"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
 #: ../widgets/table/e-table-click-to-add.c:574
+#, fuzzy
 msgid "click to add"
-msgstr ""
+msgstr "-სკენ დამატება"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
 msgid "click"
@@ -299,30 +317,36 @@ msgid "Calendar: from %s to %s"
 msgstr "კალენდარი: %s-დან %s-მდე"
 
 #: ../a11y/widgets/ea-calendar-item.c:339
+#, fuzzy
 msgid "evolution calendar item"
-msgstr ""
+msgstr "კალენდარი"
 
 #: ../a11y/widgets/ea-combo-button.c:40
+#, fuzzy
 msgid "Combo Button"
-msgstr ""
+msgstr "ღილაკი"
 
 #: ../a11y/widgets/ea-combo-button.c:50
+#, fuzzy
 msgid "Activate Default"
-msgstr ""
+msgstr "აქტივირება ნაგულისხმევი"
 
 #: ../a11y/widgets/ea-combo-button.c:52
+#, fuzzy
 msgid "Popup Menu"
-msgstr ""
+msgstr "მხტუნავი მენიუ"
 
 #: ../addressbook/addressbook.error.xml.h:1
+#, fuzzy
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
-msgstr ""
+msgstr "A -სკენ დამატება a ახალი?"
 
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid "Address '{0}' already exists."
-msgstr ""
+msgstr "მისამართი."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Cannot move contact."
@@ -331,76 +355,90 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:4
 #, fuzzy
 msgid "Category editor not available."
-msgstr "კატეგორია."
+msgstr "კატეგორია არა."
 
 #: ../addressbook/addressbook.error.xml.h:5
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
-msgstr ""
+msgstr "შემოწმება -სკენ და a დაიმახსოვრე ჩართულია."
 
 #: ../addressbook/addressbook.error.xml.h:6
+#, fuzzy
 msgid "Could not get schema information for LDAP server."
-msgstr ""
+msgstr "არა სქემა LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:7
+#, fuzzy
 msgid "Could not remove addressbook."
-msgstr ""
+msgstr "არა ამოშლა წიგნაკი."
 
 #: ../addressbook/addressbook.error.xml.h:8
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
+msgstr "სისტემა მისამართი Evolution მონაცემები სხვა ფოსტა -სკენ ხშირი მეგობრები და პირადი მეგობრები."
 
 #: ../addressbook/addressbook.error.xml.h:9
+#, fuzzy
 msgid "Delete address book '{0}'?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../addressbook/addressbook.error.xml.h:10
+#, fuzzy
 msgid "Error loading addressbook."
-msgstr ""
+msgstr "შეცდომა წიგნაკი."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid "Error saving {0} to {1}: {2}"
-msgstr ""
+msgstr "შეცდომა -სკენ"
 
 #: ../addressbook/addressbook.error.xml.h:12
+#, fuzzy
 msgid "Failed to authenticate with LDAP server."
-msgstr ""
+msgstr "ვერ განხორციელდა -სკენ LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:13
+#, fuzzy
 msgid "GroupWise Address book creation:"
-msgstr ""
+msgstr "მისამართი:"
 
 #: ../addressbook/addressbook.error.xml.h:14
+#, fuzzy
 msgid "LDAP server did not respond with valid schema information."
-msgstr ""
+msgstr "LDAP არა სქემა."
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
 msgstr "სერვერის ვერსია"
 
 #: ../addressbook/addressbook.error.xml.h:16
+#, fuzzy
 msgid "Some features may not work properly with your current server"
-msgstr ""
+msgstr "არა"
 
 #: ../addressbook/addressbook.error.xml.h:17
+#, fuzzy
 msgid "The Evolution addressbook has quit unexpectedly."
-msgstr ""
+msgstr "Evolution წიგნაკი დასრულება."
 
 #: ../addressbook/addressbook.error.xml.h:18
+#, fuzzy
 msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
+msgstr "ნახატი -სკენ და?"
 
 #: ../addressbook/addressbook.error.xml.h:19
+#, fuzzy
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
-msgstr ""
+msgstr "LDAP - LDAP არა სუპორტი ან კითხვა ძიება."
 
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "This address book will be removed permanently."
@@ -411,57 +449,68 @@ msgid "This addressbook could not be opened."
 msgstr "ვერ ვხსნი ამ მისამართების წიგნაკს."
 
 #: ../addressbook/addressbook.error.xml.h:22
+#, fuzzy
 msgid "This addressbook server does not have any suggested search bases."
-msgstr ""
+msgstr "წიგნაკი არა ნებისმიერი ძიება."
 
 #: ../addressbook/addressbook.error.xml.h:23
+#, fuzzy
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
-msgstr ""
+msgstr "წიგნაკი ან სახელი ან ქვემოთ."
 
 #: ../addressbook/addressbook.error.xml.h:24
+#, fuzzy
 msgid "This server does not support LDAPv3 schema information."
-msgstr ""
+msgstr "არა სუპორტი სქემა."
 
 #: ../addressbook/addressbook.error.xml.h:25
+#, fuzzy
 msgid "Unable to open addressbook"
-msgstr ""
+msgstr "-სკენ გახსნა წიგნაკი"
 
 #: ../addressbook/addressbook.error.xml.h:26
+#, fuzzy
 msgid "Unable to perform search."
-msgstr ""
+msgstr "-სკენ ძიება."
 
 #: ../addressbook/addressbook.error.xml.h:27
+#, fuzzy
 msgid "Unable to save {0}."
-msgstr ""
+msgstr "-სკენ შენახვა."
 
 #: ../addressbook/addressbook.error.xml.h:28
+#, fuzzy
 msgid "Would you like to save your changes?"
-msgstr ""
+msgstr "-სკენ შენახვა?"
 
 #: ../addressbook/addressbook.error.xml.h:29
+#, fuzzy
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
+msgstr "თქვენ -სკენ a წიგნაკი -სკენ -სკენ შენახვა a კოპირება?"
 
 #: ../addressbook/addressbook.error.xml.h:30
+#, fuzzy
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
-msgstr ""
+msgstr "თქვენ დაკავშირება -სკენ და Evolution -თვის -სკენ a"
 
 #: ../addressbook/addressbook.error.xml.h:31
+#, fuzzy
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr ""
+msgstr "თქვენ -სკენ -სკენ შენახვა?"
 
 #: ../addressbook/addressbook.error.xml.h:32
+#, fuzzy
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
+msgstr "არა Evolution."
 
 #: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
@@ -471,9 +520,8 @@ msgid "_Add"
 msgstr "_დამატება"
 
 #: ../addressbook/addressbook.error.xml.h:34
-#, fuzzy
 msgid "_Discard"
-msgstr "უარყოფა"
+msgstr "_უარყოფა"
 
 #: ../addressbook/addressbook.error.xml.h:35
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
@@ -491,14 +539,15 @@ msgstr "ნაგულისხმევი მისამართი:"
 
 #: ../addressbook/conduit/address-conduit.c:1241
 #: ../addressbook/conduit/address-conduit.c:1242
+#, fuzzy
 msgid "Could not load addressbook"
-msgstr ""
+msgstr "არა წიგნაკი"
 
 #: ../addressbook/conduit/address-conduit.c:1310
 #: ../addressbook/conduit/address-conduit.c:1313
 #, fuzzy
 msgid "Could not read pilot's Address application block"
-msgstr "მისამართი"
+msgstr "არა წმ მისამართი პროგრამა"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -515,7 +564,7 @@ msgstr "სერთიფიკატები"
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #, fuzzy
 msgid "Configure autocomplete here"
-msgstr "კონფიგურირება"
+msgstr "გამართვა თვითშევსება"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
@@ -523,7 +572,7 @@ msgstr "კონფიგურირება"
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
-msgstr ""
+msgstr "კონტაქტები"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #, fuzzy
@@ -533,7 +582,7 @@ msgstr "Evolution მისამართი"
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Address Book address pop-up"
-msgstr "Evolution მისამართი"
+msgstr "Evolution მისამართი ზემოთ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 #, fuzzy
@@ -551,16 +600,19 @@ msgid "Evolution Address Book component"
 msgstr "Evolution მისამართი"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
 msgid "Evolution S/Mime Certificate Management Control"
-msgstr ""
+msgstr "Evolution S Mime სერთიფიკატი Control"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
 msgid "Evolution folder settings configuration control"
-msgstr ""
+msgstr "Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
 msgid "Manage your S/MIME certificates here"
-msgstr ""
+msgstr "S"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
@@ -623,18 +675,19 @@ msgid "Address _Book"
 msgstr "მისამართების _წიგნაკი"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
+#, fuzzy
 msgid "Create a new address book"
-msgstr ""
+msgstr "შექმნა a ახალი"
 
 #: ../addressbook/gui/component/addressbook-component.c:406
 #, fuzzy
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "ოპერაცია ვერ/არ ჩატარდა მისამართი."
+msgstr "ვერ განხორციელდა მისამართი ან."
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 #, fuzzy
 msgid "Base"
-msgstr "ძირითადი"
+msgstr "ფუძე"
 
 #: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
@@ -645,7 +698,7 @@ msgstr "_ტიპი:"
 #: ../addressbook/gui/component/addressbook-config.c:632
 #, fuzzy
 msgid "Copy book content locally for offline operation"
-msgstr "დააკოპირე კავშირგარეშე რეჟიმი"
+msgstr "დააკოპირე ხაზიდან გასვლა"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
@@ -684,8 +737,9 @@ msgid "Searching"
 msgstr "ვეძებ"
 
 #: ../addressbook/gui/component/addressbook-config.c:994
+#, fuzzy
 msgid "Downloading"
-msgstr ""
+msgstr "მიმდინარეობს ჩამოქაჩვა"
 
 #: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
@@ -701,8 +755,9 @@ msgstr ""
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
+#, fuzzy
 msgid "Migrating `%s':"
-msgstr ""
+msgstr "წმ:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
@@ -720,7 +775,7 @@ msgid ""
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "და Evolution Evolution n Evolution."
+msgstr "და - Evolution Evolution x არა Evolution."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1133
 #, fuzzy
@@ -728,49 +783,49 @@ msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "n Evolution."
+msgstr "- სია არა Evolution."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1142
+#, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr ""
+msgstr "Evolution მონაცემები არა Evolution."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1152
+#, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
+msgstr "Evolution წმ და ფაილი არა Evolution."
 
 #: ../addressbook/gui/component/addressbook-view.c:434
 #: ../mail/em-folder-utils.c:503
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
-msgstr "გადაარქვი -სკენ:"
+msgstr "სახელის გადარქმევა წმ -სკენ:"
 
 #: ../addressbook/gui/component/addressbook-view.c:437
 #: ../mail/em-folder-utils.c:505
-#, fuzzy
 msgid "Rename Folder"
-msgstr "გადაარქვი საქაღალდე"
+msgstr "საქაღალდეს გადარქმევა"
 
 #: ../addressbook/gui/component/addressbook-view.c:442
 #: ../mail/em-folder-utils.c:511
 #, fuzzy
 msgid "Folder names cannot contain '/'"
-msgstr "საქაღალდე"
+msgstr "საქაღალდე შეიცავს"
 
 #: ../addressbook/gui/component/addressbook-view.c:445
 #, fuzzy
 msgid "A Folder with this name already exists"
-msgstr "A საქაღალდე"
+msgstr "A საქაღალდე სახელი"
 
 #: ../addressbook/gui/component/addressbook-view.c:953
-#, fuzzy
 msgid "_New Address Book"
-msgstr "ახალი მისამართი"
+msgstr "_ახალი საკონტაქტო ანკეტა"
 
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:954
@@ -793,14 +848,13 @@ msgstr "შენახვა."
 #: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
-#, fuzzy
 msgid "_Properties..."
-msgstr "პარამეტრები."
+msgstr "_პარამეტრები..."
 
 #: ../addressbook/gui/component/addressbook-view.c:1345
 #, fuzzy
 msgid "Contact Source Selector"
-msgstr "კონტაქტი"
+msgstr "კონტაქტი წყარო ამრჩევი"
 
 #: ../addressbook/gui/component/addressbook.c:99
 #, fuzzy
@@ -811,53 +865,58 @@ msgstr "LDAP სერვერი"
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 #, fuzzy
 msgid "Failed to authenticate.\n"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ n"
+msgstr "ვერ განხორციელდა -სკენ არა"
 
 #: ../addressbook/gui/component/addressbook.c:204
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
+#, fuzzy
 msgid "Enter password for %s (user %s)"
-msgstr ""
+msgstr "შეყვანა წმ წმ"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#, fuzzy
 msgid "Autocomplete length"
-msgstr ""
+msgstr "სიგრძე"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#, fuzzy
 msgid "EFolderList XML for the list of completion URIs"
-msgstr ""
+msgstr "სია -"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#, fuzzy
 msgid "EFolderList XML for the list of completion URIs."
-msgstr ""
+msgstr "სია -."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
-msgstr "თანამდებობა ვერტიკალური და და პიქსელი."
+msgstr "პოზიცია - ვერტიკალური და სია და - პიქსელი."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 #, fuzzy
 msgid "Show preview pane"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#, fuzzy
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr ""
+msgstr "რიცხვი - ასო-ნიშნები Evolution -სკენ თვითშევსება."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 #, fuzzy
 msgid "URI for the folder last used in the select names dialog"
-msgstr "URI"
+msgstr "URI - დიალოგი"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 #, fuzzy
 msgid "URI for the folder last used in the select names dialog."
-msgstr "URI."
+msgstr "URI - დიალოგი."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
@@ -900,8 +959,9 @@ msgid "<b>Display</b>"
 msgstr "<b>დისპლეი</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
 msgid "<b>Downloading</b>"
-msgstr ""
+msgstr "<b> მიმდინარეობს ჩამოქაჩვა</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
@@ -916,9 +976,8 @@ msgid "<b>Type:</b>"
 msgstr "<b>ტიპი:</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
 msgid "Add Address Book"
-msgstr "დამატება მისამართი"
+msgstr "საკონტაქტო ანკეტის დამატება"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
 #: ../mail/em-account-editor.c:777
@@ -934,8 +993,9 @@ msgid "Basic"
 msgstr "ძირითადი"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
+#, fuzzy
 msgid "Distinguished name"
-msgstr ""
+msgstr "სახელი"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
@@ -944,12 +1004,12 @@ msgstr "Email მისამართი"
 #: ../addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution -სკენ."
+msgstr "Evolution ელფოსტა -სკენ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Find Possible Search Bases"
-msgstr "ძებნა ძებნა"
+msgstr "ძიება ძებნა"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
@@ -984,7 +1044,7 @@ msgstr "SSL"
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search Filter"
-msgstr "ძებნა ფილტრი"
+msgstr "ძებნის ფილტრი"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
@@ -1002,11 +1062,12 @@ msgid "Search filter"
 msgstr "ძებნა"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
-msgstr ""
+msgstr "ძებნა - ძიება არა შეცვლილი ნაგულისხმები ძიება ჩართულია - პირადი ფორმა."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 #, fuzzy
@@ -1020,7 +1081,7 @@ msgstr "Evolution -სკენ LDAP LDAP SSL."
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
-msgstr "Evolution -სკენ LDAP LDAP."
+msgstr "Evolution -სკენ LDAP LDAP TLS."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
@@ -1028,7 +1089,7 @@ msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
-msgstr "სუპორტი SSL და -სკენ."
+msgstr "არა სუპორტი SSL ან TLS და -სკენ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1046,7 +1107,7 @@ msgstr "ძებნა"
 #: ../mail/em-account-editor.c:308
 #, fuzzy
 msgid "TLS encryption"
-msgstr "აღწერა"
+msgstr "TLS"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
@@ -1054,7 +1115,7 @@ msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
-msgstr "DN დირექტორია."
+msgstr "ძიება სახელი DN - ელემენტი ცარიელი ძიება ეთ root - ხე."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 #, fuzzy
@@ -1063,20 +1124,21 @@ msgid ""
 "the directory tree. A search scope of \"sub\" will include all entries below "
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
-msgstr "-სკენ დირექტორია A A."
+msgstr "ძიება ძიება -სკენ ქვემოთ ხე A ძიება - შემცველობა ყველა ძიება A ძიება - შემცველობა."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr ""
+msgstr "სახელი - -თვის მაგალითი."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
-msgstr "რიცხვი -სკენ პარამეტრი რიცხვი -სკენ."
+msgstr "რიცხვი - -სკენ რიცხვი -სკენ ქვემოთ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
@@ -1084,14 +1146,14 @@ msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
-msgstr "Evolution -სკენ შენიშვნა -სკენ Email მისამართი ანონიმი -სკენ."
+msgstr "Evolution -სკენ შენიშვნა -სკენ ელფოსტა მისამართი ანონიმი -სკენ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
-msgstr "Evolution "
+msgstr "სახელი - Evolution სია "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
 #, fuzzy
@@ -1099,40 +1161,38 @@ msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
-msgstr "LDAP Evolution -სკენ -სკენ A კითხვა."
+msgstr "ჩართულია LDAP Evolution -სკენ -სკენ A სია - კითხვა."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 #, fuzzy
 msgid "Using distinguished name (DN)"
-msgstr "DN"
+msgstr "სახელი DN"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid "Using email address"
-msgstr ""
+msgstr "ელფოსტა"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
 msgid "_Add Address Book"
-msgstr "დამატება მისამართი"
+msgstr "ანკეტის _დამატება"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
 msgid "_Download limit:"
-msgstr "ჩამოტვირთვა:"
+msgstr "_ჩამოტვირთვის ლიმიტი:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "_Find Possible Search Bases"
-msgstr "ძებნა ძებნა"
+msgstr "ძიება ძებნა"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
 msgid "_Login method:"
-msgstr "შესვლა:"
+msgstr "_შესვლის მეთოდი:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:245
@@ -1158,7 +1218,6 @@ msgid "_Server:"
 msgstr "_სერვერი:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
-#, fuzzy
 msgid "_Timeout:"
 msgstr "დაყოვნების დრო:"
 
@@ -1173,12 +1232,9 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -1237,8 +1293,9 @@ msgid "<b>Telephone</b>"
 msgstr "<b>ტელეფონი</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#, fuzzy
 msgid "<b>Web Addresses</b>"
-msgstr ""
+msgstr "<b> ვები მისამართები</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
@@ -1247,8 +1304,9 @@ msgstr "<b>სამსახური</b>"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
+#, fuzzy
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
@@ -1275,9 +1333,8 @@ msgstr "სურათი"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#, fuzzy
 msgid "MSN Messenger"
-msgstr "MSN მესინჯერი"
+msgstr "MSN მესენჯერი"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
@@ -1320,8 +1377,9 @@ msgid "_Anniversary:"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
 msgid "_Assistant:"
-msgstr ""
+msgstr "ასისტენტი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
@@ -1364,23 +1422,20 @@ msgid "_Free/Busy:"
 msgstr "_თავისუფალი/დაკავებული:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
 msgid "_Home Page:"
-msgstr "სახლი გვერდი:"
+msgstr "_პირადი ვებ გვერდი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
 msgid "_Manager:"
-msgstr "მმართველი:"
+msgstr "_მენეჯერი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_შენიშვნები:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#, fuzzy
 msgid "_Office:"
-msgstr "ოფისი:"
+msgstr "_ოფისი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
@@ -1397,13 +1452,11 @@ msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-#, fuzzy
 msgid "_State/Province:"
-msgstr "მდგომარეობა:"
+msgstr "_ქვეყანა/პროვინცია:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:18
-#, fuzzy
 msgid "_Title:"
 msgstr "_სათაური:"
 
@@ -1414,11 +1467,12 @@ msgstr "_ვიდეო Chat-ი:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 #, fuzzy
 msgid "_Wants to receive HTML mail"
-msgstr "-სკენ"
+msgstr "-სკენ HTML ფოსტა"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#, fuzzy
 msgid "_Web Log:"
-msgstr ""
+msgstr "ვები ჟურნალი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
@@ -1451,7 +1505,7 @@ msgstr "მისამართი"
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
-msgstr ""
+msgstr "რედაქტირებადი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
@@ -1459,7 +1513,7 @@ msgstr "შეერთებული შტატები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
-msgstr ""
+msgstr "ავღანეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
@@ -1471,159 +1525,190 @@ msgstr "ალგერია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
-msgstr ""
+msgstr "ამერიკული სამოა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
-msgstr ""
+msgstr "ანდორა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "ანგოლა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#, fuzzy
 msgid "Anguilla"
-msgstr ""
+msgstr "ანგუილა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#, fuzzy
 msgid "Antarctica"
-msgstr ""
+msgstr "ანტარქტიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#, fuzzy
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "ბარბუდა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
-msgstr ""
+msgstr "არგენტინა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#, fuzzy
 msgid "Armenia"
-msgstr ""
+msgstr "სასომხეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
-msgstr ""
+msgstr "არუბა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#, fuzzy
 msgid "Australia"
-msgstr ""
+msgstr "ავსტრალია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#, fuzzy
 msgid "Austria"
-msgstr ""
+msgstr "ავსტრია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#, fuzzy
 msgid "Azerbaijan"
-msgstr ""
+msgstr "აზერბაიჯანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#, fuzzy
 msgid "Bahamas"
-msgstr ""
+msgstr "ბაჰამები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#, fuzzy
 msgid "Bahrain"
-msgstr ""
+msgstr "ბაჰრანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#, fuzzy
 msgid "Bangladesh"
-msgstr ""
+msgstr "ბანგლადეში"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#, fuzzy
 msgid "Barbados"
-msgstr ""
+msgstr "ბარბადოსი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#, fuzzy
 msgid "Belarus"
-msgstr ""
+msgstr "ბელარუსი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#, fuzzy
 msgid "Belgium"
-msgstr ""
+msgstr "ბელგია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#, fuzzy
 msgid "Belize"
-msgstr ""
+msgstr "ბალიზე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#, fuzzy
 msgid "Benin"
-msgstr ""
+msgstr "ბენინი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#, fuzzy
 msgid "Bermuda"
-msgstr ""
+msgstr "ბერმუდა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#, fuzzy
 msgid "Bhutan"
-msgstr ""
+msgstr "ბუტანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#, fuzzy
 msgid "Bolivia"
-msgstr ""
+msgstr "ბოლივია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#, fuzzy
 msgid "Botswana"
-msgstr ""
+msgstr "ბოთსვანა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#, fuzzy
 msgid "Bouvet Island"
-msgstr ""
+msgstr "ბუვეს კუნძული"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "ბრაზილია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#, fuzzy
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "ინდოეთის ოკეანეს ბრიტანული ტერიტორიები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#, fuzzy
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "ბრუნეი დარესსალამი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#, fuzzy
 msgid "Bulgaria"
-msgstr ""
+msgstr "ბულგარეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#, fuzzy
 msgid "Burkina Faso"
-msgstr ""
+msgstr "ბურკინა ფასო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#, fuzzy
 msgid "Burundi"
-msgstr ""
+msgstr "ბურუნდი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#, fuzzy
 msgid "Cambodia"
-msgstr ""
+msgstr "კამბოჯა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#, fuzzy
 msgid "Cameroon"
-msgstr ""
+msgstr "კამერუნი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "კანადა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#, fuzzy
 msgid "Cape Verde"
-msgstr ""
+msgstr "მწვანე კონცხი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#, fuzzy
 msgid "Cayman Islands"
-msgstr ""
+msgstr "კაიმანის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#, fuzzy
 msgid "Central African Republic"
-msgstr ""
+msgstr "ცენტრალური აფრიკის რესპუბლიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#, fuzzy
 msgid "Chad"
-msgstr ""
+msgstr "ჩადი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
@@ -1634,44 +1719,52 @@ msgid "China"
 msgstr "ჩინეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#, fuzzy
 msgid "Christmas Island"
-msgstr ""
+msgstr "შობის კუნძული"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#, fuzzy
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "კოკოსიური(კილინგის)კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#, fuzzy
 msgid "Colombia"
-msgstr ""
+msgstr "კოლუმბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#, fuzzy
 msgid "Comoros"
-msgstr ""
+msgstr "კომორის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "კონგო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#, fuzzy
 msgid "Congo, The Democratic Republic Of The"
-msgstr ""
+msgstr "კონგო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#, fuzzy
 msgid "Cook Islands"
-msgstr ""
+msgstr "კუკის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#, fuzzy
 msgid "Costa Rica"
-msgstr ""
+msgstr "კოსტა რიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#, fuzzy
 msgid "Croatia"
-msgstr ""
+msgstr "ხორვატია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
@@ -1687,48 +1780,58 @@ msgid "Czech Republic"
 msgstr "ჩეხური რესპუბლიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#, fuzzy
 msgid "Denmark"
-msgstr ""
+msgstr "დანია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#, fuzzy
 msgid "Djibouti"
-msgstr ""
+msgstr "ჯიბუტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#, fuzzy
 msgid "Dominica"
-msgstr ""
+msgstr "დომინიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#, fuzzy
 msgid "Dominican Republic"
-msgstr ""
+msgstr "დომინიკური რესპუბლიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#, fuzzy
 msgid "Ecuador"
-msgstr ""
+msgstr "ეკვადორი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "ეგვიპტე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#, fuzzy
 msgid "El Salvador"
-msgstr ""
+msgstr "ელ სალვადორი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#, fuzzy
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "ეკვატორული გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#, fuzzy
 msgid "Eritrea"
-msgstr ""
+msgstr "ერითრეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#, fuzzy
 msgid "Estonia"
-msgstr ""
+msgstr "ესტონეტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#, fuzzy
 msgid "Ethiopia"
-msgstr ""
+msgstr "ეთიოპია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
@@ -1751,27 +1854,27 @@ msgid "France"
 msgstr "საფრანგეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-#, fuzzy
 msgid "French Guiana"
 msgstr "ფრანგული გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-#, fuzzy
 msgid "French Polynesia"
 msgstr "ფრანგული პოლინეზია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #, fuzzy
 msgid "French Southern Territories"
-msgstr "ფრანგული"
+msgstr "სამხრეთ·ფრანგული·ტერიტორიები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#, fuzzy
 msgid "Gabon"
-msgstr ""
+msgstr "გაბონი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#, fuzzy
 msgid "Gambia"
-msgstr ""
+msgstr "გამბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
@@ -1782,76 +1885,90 @@ msgid "Germany"
 msgstr "გერმანია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#, fuzzy
 msgid "Ghana"
-msgstr ""
+msgstr "განა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#, fuzzy
 msgid "Gibraltar"
-msgstr ""
+msgstr "გიბრალტარი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "საბერძნეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#, fuzzy
 msgid "Greenland"
-msgstr ""
+msgstr "გრენლანდია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#, fuzzy
 msgid "Grenada"
-msgstr ""
+msgstr "გრენადა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#, fuzzy
 msgid "Guadeloupe"
-msgstr ""
+msgstr "გუადელუპე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#, fuzzy
 msgid "Guam"
-msgstr ""
+msgstr "გუამი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#, fuzzy
 msgid "Guatemala"
-msgstr ""
+msgstr "გუატემალა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#, fuzzy
 msgid "Guinea"
-msgstr ""
+msgstr "გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#, fuzzy
 msgid "Guinea-bissau"
-msgstr ""
+msgstr "გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#, fuzzy
 msgid "Guyana"
-msgstr ""
+msgstr "გვიანა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#, fuzzy
 msgid "Haiti"
-msgstr ""
+msgstr "ჰაიტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#, fuzzy
 msgid "Holy See"
-msgstr ""
+msgstr "წმინდა ზღვა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#, fuzzy
 msgid "Honduras"
-msgstr ""
+msgstr "ჰონდურასი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#, fuzzy
 msgid "Hungary"
-msgstr ""
+msgstr "უნგრეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
@@ -1862,24 +1979,28 @@ msgid "India"
 msgstr "ინდოეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#, fuzzy
 msgid "Indonesia"
-msgstr ""
+msgstr "ინდონეზია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iran"
 msgstr "ირანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#, fuzzy
 msgid "Iraq"
-msgstr ""
+msgstr "ერაყი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#, fuzzy
 msgid "Ireland"
-msgstr ""
+msgstr "ირლანდია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#, fuzzy
 msgid "Isle of Man"
-msgstr ""
+msgstr "მანის კუნძული"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
@@ -1898,263 +2019,313 @@ msgid "Japan"
 msgstr "იაპონია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#, fuzzy
 msgid "Jersey"
-msgstr ""
+msgstr "ჯერსი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#, fuzzy
 msgid "Jordan"
-msgstr ""
+msgstr "იორდანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#, fuzzy
 msgid "Kazakhstan"
-msgstr ""
+msgstr "ყაზახეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#, fuzzy
 msgid "Kenya"
-msgstr ""
+msgstr "კენია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#, fuzzy
 msgid "Kiribati"
-msgstr ""
+msgstr "კირიბატი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#, fuzzy
 msgid "Korea, Democratic People's Republic Of"
-msgstr ""
+msgstr "ხალხი წმ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#, fuzzy
 msgid "Kuwait"
-msgstr ""
+msgstr "ქუვეითი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#, fuzzy
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "ყირგიზეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#, fuzzy
 msgid "Latvia"
-msgstr ""
+msgstr "ლატვია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#, fuzzy
 msgid "Lebanon"
-msgstr ""
+msgstr "ლიბანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#, fuzzy
 msgid "Lesotho"
-msgstr ""
+msgstr "ლესოტო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#, fuzzy
 msgid "Liberia"
-msgstr ""
+msgstr "ლიბერია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
 msgstr "ლიბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#, fuzzy
 msgid "Liechtenstein"
-msgstr ""
+msgstr "ლიხტენშტეინი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#, fuzzy
 msgid "Lithuania"
-msgstr ""
+msgstr "ლიტვა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#, fuzzy
 msgid "Luxembourg"
-msgstr ""
+msgstr "ლუქსემბურგი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#, fuzzy
 msgid "Macedonia"
-msgstr ""
+msgstr "მაკედონია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#, fuzzy
 msgid "Madagascar"
-msgstr ""
+msgstr "მადაგასკარი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#, fuzzy
 msgid "Malawi"
-msgstr ""
+msgstr "მალავი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#, fuzzy
 msgid "Malaysia"
-msgstr ""
+msgstr "მალაზია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#, fuzzy
 msgid "Maldives"
-msgstr ""
+msgstr "მალდივები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#, fuzzy
 msgid "Mali"
-msgstr ""
+msgstr "მალი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#, fuzzy
 msgid "Malta"
-msgstr ""
+msgstr "მალტა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#, fuzzy
 msgid "Marshall Islands"
-msgstr ""
+msgstr "მარშალის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#, fuzzy
 msgid "Martinique"
-msgstr ""
+msgstr "მარტინიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#, fuzzy
 msgid "Mauritania"
-msgstr ""
+msgstr "მავრიტანია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#, fuzzy
 msgid "Mauritius"
-msgstr ""
+msgstr "მავრიკის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#, fuzzy
 msgid "Mayotte"
-msgstr ""
+msgstr "მაიოტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#, fuzzy
 msgid "Mexico"
-msgstr ""
+msgstr "მექსიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#, fuzzy
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "მოლდოვა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#, fuzzy
 msgid "Monaco"
-msgstr ""
+msgstr "მონაკო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#, fuzzy
 msgid "Mongolia"
-msgstr ""
+msgstr "მონღოლეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#, fuzzy
 msgid "Montserrat"
-msgstr ""
+msgstr "მონსერატტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#, fuzzy
 msgid "Morocco"
-msgstr ""
+msgstr "მოროკო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#, fuzzy
 msgid "Mozambique"
-msgstr ""
+msgstr "მოზამბიკი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#, fuzzy
 msgid "Myanmar"
-msgstr ""
+msgstr "მიანმა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#, fuzzy
 msgid "Namibia"
-msgstr ""
+msgstr "ნამიბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#, fuzzy
 msgid "Nauru"
-msgstr ""
+msgstr "ნაურუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#, fuzzy
 msgid "Nepal"
-msgstr ""
+msgstr "ნეპალი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#, fuzzy
 msgid "Netherlands"
-msgstr ""
+msgstr "ჰოლანდია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#, fuzzy
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "ნიდერლანდის ანტილები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#, fuzzy
 msgid "New Caledonia"
 msgstr "ახალი კალედონია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#, fuzzy
 msgid "New Zealand"
 msgstr "ახალი ზელანდია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#, fuzzy
 msgid "Nicaragua"
-msgstr ""
+msgstr "ნიკარაგუა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#, fuzzy
 msgid "Niger"
-msgstr ""
+msgstr "ნიგერი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "ნიგერია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#, fuzzy
 msgid "Niue"
-msgstr ""
+msgstr "ნიუე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#, fuzzy
 msgid "Norfolk Island"
-msgstr ""
+msgstr "ნორფოლკის კუნძული"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#, fuzzy
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "ჩრდილოეთ მარიანის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#, fuzzy
 msgid "Norway"
-msgstr ""
+msgstr "ნორვეგია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#, fuzzy
 msgid "Oman"
-msgstr ""
+msgstr "ომანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#, fuzzy
 msgid "Pakistan"
-msgstr ""
+msgstr "პაკისტანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#, fuzzy
 msgid "Palau"
-msgstr ""
+msgstr "პალაუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#, fuzzy
 msgid "Panama"
-msgstr ""
+msgstr "პანამა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#, fuzzy
 msgid "Papua New Guinea"
 msgstr "პაპუა ახალი გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#, fuzzy
 msgid "Paraguay"
-msgstr ""
+msgstr "პარაგუაი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "პერუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#, fuzzy
 msgid "Philippines"
-msgstr ""
+msgstr "ფილიპინები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#, fuzzy
 msgid "Pitcairn"
-msgstr ""
+msgstr "პიტკაირნი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
@@ -2165,110 +2336,127 @@ msgid "Portugal"
 msgstr "პორტუგალია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#, fuzzy
 msgid "Puerto Rico"
-msgstr ""
+msgstr "პუერტო რიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#, fuzzy
 msgid "Qatar"
-msgstr ""
+msgstr "ქათარი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#, fuzzy
 msgid "Romania"
-msgstr ""
+msgstr "რუმინეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#, fuzzy
 msgid "Russian Federation"
 msgstr "რუსეთის ფედერაცია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#, fuzzy
 msgid "Rwanda"
-msgstr ""
+msgstr "რუანდა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#, fuzzy
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "ნევისი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#, fuzzy
 msgid "Saint Lucia"
-msgstr ""
+msgstr "წმინდა ლუჩია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#, fuzzy
 msgid "Samoa"
-msgstr ""
+msgstr "სამოა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#, fuzzy
 msgid "San Marino"
-msgstr ""
+msgstr "სან მარინო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#, fuzzy
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "საუდიის არაბეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#, fuzzy
 msgid "Senegal"
-msgstr ""
+msgstr "სენეგალი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Serbia And Montenegro"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#, fuzzy
 msgid "Seychelles"
-msgstr ""
+msgstr "სეიშელის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#, fuzzy
 msgid "Sierra Leone"
-msgstr ""
+msgstr "სიერა ლეონი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "სინგაპური"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#, fuzzy
 msgid "Slovakia"
-msgstr ""
+msgstr "სლოვაკეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#, fuzzy
 msgid "Slovenia"
-msgstr ""
+msgstr "სლოვენია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#, fuzzy
 msgid "Solomon Islands"
-msgstr ""
+msgstr "სოლომონის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#, fuzzy
 msgid "Somalia"
-msgstr ""
+msgstr "სომალია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#, fuzzy
 msgid "South Africa"
-msgstr ""
+msgstr "სამხრეთ აფრიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 #, fuzzy
 msgid "South Georgia And The South Sandwich Islands"
-msgstr "საქართველო"
+msgstr "საქართველო სენდვიჩი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "ესპანეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#, fuzzy
 msgid "Sri Lanka"
-msgstr ""
+msgstr "შრი ლანკი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
@@ -2279,129 +2467,153 @@ msgid "St. Pierre And Miquelon"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#, fuzzy
 msgid "Sudan"
-msgstr ""
+msgstr "სუდანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#, fuzzy
 msgid "Suriname"
-msgstr ""
+msgstr "სურინამი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#, fuzzy
 msgid "Svalbard And Jan Mayen Islands"
-msgstr ""
+msgstr "იან"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#, fuzzy
 msgid "Swaziland"
-msgstr ""
+msgstr "სვაზილენდი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#, fuzzy
 msgid "Sweden"
-msgstr ""
+msgstr "შვედეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#, fuzzy
 msgid "Switzerland"
-msgstr ""
+msgstr "შვეიცარია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Syria"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#, fuzzy
 msgid "Taiwan"
-msgstr ""
+msgstr "ტაივანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#, fuzzy
 msgid "Tajikistan"
-msgstr ""
+msgstr "ტაჯიკეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#, fuzzy
 msgid "Thailand"
-msgstr ""
+msgstr "ტაილანდი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#, fuzzy
 msgid "Timor-Leste"
-msgstr ""
+msgstr "ტიმორ-ლესტე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#, fuzzy
 msgid "Togo"
-msgstr ""
+msgstr "ტოგო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
 msgid "Tokelau"
-msgstr ""
+msgstr "ტოკელაუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
 msgid "Tonga"
-msgstr ""
+msgstr "ტონგა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#, fuzzy
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "თრინიდადი თობაგო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#, fuzzy
 msgid "Tunisia"
-msgstr ""
+msgstr "ტუნიზია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "თურქეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#, fuzzy
 msgid "Turkmenistan"
-msgstr ""
+msgstr "თურქმენეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#, fuzzy
 msgid "Tuvalu"
-msgstr ""
+msgstr "ტუვალუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#, fuzzy
 msgid "Uganda"
-msgstr ""
+msgstr "უგანდა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "უკრაინა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#, fuzzy
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "შეერთებული არაბული ემირატები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-#, fuzzy
 msgid "United Kingdom"
 msgstr "დიდი ბრიტანეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#, fuzzy
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "მცირე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#, fuzzy
 msgid "Uruguay"
-msgstr ""
+msgstr "ურუგვაი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#, fuzzy
 msgid "Uzbekistan"
-msgstr ""
+msgstr "უზბეკეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#, fuzzy
 msgid "Vanuatu"
-msgstr ""
+msgstr "ვანუატუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#, fuzzy
 msgid "Venezuela"
-msgstr ""
+msgstr "ვენესუელა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#, fuzzy
 msgid "Viet Nam"
-msgstr ""
+msgstr "ვიეტნამი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
@@ -2417,20 +2629,24 @@ msgid "Wallis And Futuna Islands"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#, fuzzy
 msgid "Western Sahara"
-msgstr ""
+msgstr "დასავლეთ სახარა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#, fuzzy
 msgid "Yemen"
-msgstr ""
+msgstr "იემენი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#, fuzzy
 msgid "Zambia"
-msgstr ""
+msgstr "ზამბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#, fuzzy
 msgid "Zimbabwe"
-msgstr ""
+msgstr "ზიმბაბვე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
 #: ../plugins/exchange-operations/exchange-delegates.c:934
@@ -2442,8 +2658,9 @@ msgid "Name"
 msgstr "სახელი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#, fuzzy
 msgid "AOL Instant Messenger"
-msgstr ""
+msgstr "შიკრიკი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
@@ -2454,7 +2671,7 @@ msgstr "Jabber"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "Yahoo Messenger"
-msgstr "Yahoo"
+msgstr "Yahoo შიკრიკი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
@@ -2468,7 +2685,7 @@ msgstr "სერვისი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "ადგილმდებარეობა"
@@ -2503,8 +2720,9 @@ msgid "GroupWise"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:260
+#, fuzzy
 msgid "Source Book"
-msgstr ""
+msgstr "წყარო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
@@ -2516,12 +2734,14 @@ msgid "Is New Contact"
 msgstr "ახალი კონტაქტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:288
+#, fuzzy
 msgid "Writable Fields"
-msgstr ""
+msgstr "ჩაწერადი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:295
+#, fuzzy
 msgid "Required Fields"
-msgstr ""
+msgstr "აუცილებელია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
@@ -2531,25 +2751,26 @@ msgstr ""
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, fuzzy, c-format
 msgid "Contact Editor - %s"
-msgstr "კონტაქტი რედაქტორი"
+msgstr "კონტაქტი რედაქტორი წმ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2772
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+#, fuzzy
 msgid "Please select an image for this contact"
-msgstr ""
+msgstr "ნახატი"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 #, fuzzy
 msgid "No image"
-msgstr "არა"
+msgstr "არა ნახატი"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3057
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "n n"
+msgstr "მცდარი არა არა"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 #, fuzzy
 msgid "Invalid contact."
 msgstr "არასწორი."
@@ -2560,50 +2781,52 @@ msgid "Contact Quick-Add"
 msgstr "კონტაქტი დამატება"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
-#, fuzzy
 msgid "_Edit Full"
-msgstr "რედაქტირება სრული"
+msgstr "სრული _რედაქტირება"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 #, fuzzy
 msgid "_Full name"
-msgstr "სრული"
+msgstr "სრული სახელი"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
-#, fuzzy
 msgid "E-_mail"
-msgstr "E"
+msgstr "ელ-_ფოსტა"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 #, fuzzy
 msgid "_Select Address Book"
-msgstr "მისამართი"
+msgstr "ამორჩევა მისამართი"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s) ?"
-msgstr ""
+msgstr "წაშლა სია წმ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s) ?"
-msgstr ""
+msgstr "წაშლა წმ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2614,19 +2837,20 @@ msgid "Ci_ty:"
 msgstr "_ქალაქი:"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#, fuzzy
 msgid "Countr_y:"
-msgstr ""
+msgstr "y:"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "სრული მისამართი"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
 msgid "_ZIP Code:"
-msgstr ""
+msgstr "კოდი:"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:2
-#, fuzzy
 msgid "Dr."
 msgstr "დრ."
 
@@ -2652,7 +2876,6 @@ msgid "III"
 msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:8
-#, fuzzy
 msgid "Jr."
 msgstr "უმც."
 
@@ -2677,12 +2900,14 @@ msgid "Sr."
 msgstr "უფრ."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#, fuzzy
 msgid "_First:"
-msgstr ""
+msgstr "პირველი:"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#, fuzzy
 msgid "_Last:"
-msgstr ""
+msgstr "ბოლო:"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
@@ -2720,7 +2945,7 @@ msgstr "\n"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #, fuzzy
 msgid "Add an email to the List"
-msgstr "დამატება -სკენ სია"
+msgstr "დამატება ელფოსტა -სკენ სია"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
@@ -2731,7 +2956,7 @@ msgstr "კონტაქტი სია რედაქტორი"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
 msgid "Insert email addresses from Address Book"
-msgstr "მისამართი"
+msgstr "ჩამატება ელფოსტა მისამართი"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
@@ -2740,26 +2965,27 @@ msgstr "წევრები"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "Remove an email address from the List"
-msgstr "წაშლა სია"
+msgstr "ამოშლა ელფოსტა სია"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #, fuzzy
 msgid "_Hide addresses when sending mail to this list"
-msgstr "-სკენ"
+msgstr "დამალვა ფოსტა -სკენ სია"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
-msgstr "სია:"
+msgstr "სია სახელი:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#, fuzzy
 msgid "_Select"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "ტიპი a:"
+msgstr "ტიპი ელფოსტა ან a სია:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
@@ -2797,14 +3023,14 @@ msgstr "კონტაქტი:"
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 #, fuzzy
 msgid "Duplicate Contact Detected"
-msgstr "კონტაქტი"
+msgstr "დუბლირება კონტაქტი"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 #, fuzzy
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
-msgstr "-სკენ?"
+msgstr "ელფოსტა ან სახელი - - -სკენ დამატება?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2813,21 +3039,22 @@ msgstr "ახალი კონტაქტი:"
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 #, fuzzy
 msgid "Original Contact:"
-msgstr "კონტაქტი:"
+msgstr "ორიგინალი კონტაქტი:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 #, fuzzy
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
-msgstr "-სკენ?"
+msgstr "სახელი ან ელფოსტა - -სკენ დამატება?"
 
 #. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:172
 #: ../calendar/gui/cal-search-bar.c:53
+#, fuzzy
 msgid "Any field contains"
-msgstr ""
+msgstr "ნებისმიერი ველი შეიცავს"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
 #: ../addressbook/gui/widgets/e-addressbook-view.c:171
@@ -2840,7 +3067,7 @@ msgstr "კატეგორია"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 #, fuzzy
 msgid "Email begins with"
-msgstr "Email"
+msgstr "ელფოსტა"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
@@ -2849,22 +3076,23 @@ msgid "Name begins with"
 msgstr "სახელი"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
 msgid "No contacts"
-msgstr ""
+msgstr "არა"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] ""
+msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
 #: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
+#, fuzzy
 msgid "Query"
-msgstr ""
+msgstr "გამოკითხვა"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:446
 #, fuzzy
@@ -2887,13 +3115,14 @@ msgid "Error modifying card"
 msgstr "შეცდომა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#, fuzzy
 msgid "Source"
-msgstr ""
+msgstr "წყარო"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2907,7 +3136,7 @@ msgid "Save as VCard..."
 msgstr "შენახვა."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -2915,9 +3144,8 @@ msgid "_Open"
 msgstr "_გახსნა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#, fuzzy
 msgid "_New Contact..."
-msgstr "ახალი კონტაქტი."
+msgstr "ახალი _კონტაქტი..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:960
 #, fuzzy
@@ -2932,12 +3160,12 @@ msgstr "შენახვა."
 #: ../addressbook/gui/widgets/e-addressbook-view.c:964
 #, fuzzy
 msgid "_Forward Contact"
-msgstr "კონტაქტი"
+msgstr "წინ კონტაქტი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:965
 #, fuzzy
 msgid "_Forward Contacts"
-msgstr "წინ"
+msgstr "წინ მეგობრები"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #, fuzzy
@@ -2952,7 +3180,7 @@ msgstr "გაგზავნა შეტყობინება -სკენ
 #: ../addressbook/gui/widgets/e-addressbook-view.c:968
 #, fuzzy
 msgid "Send _Message to Contacts"
-msgstr "გაგზავნა შეტყობინება -სკენ"
+msgstr "გაგზავნა შეტყობინება -სკენ მეგობრები"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
@@ -2961,7 +3189,7 @@ msgstr "_ბეჭდვა"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:972
 #, fuzzy
 msgid "Cop_y to Address Book..."
-msgstr "-სკენ მისამართი."
+msgstr "y -სკენ მისამართი."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:973
 #, fuzzy
@@ -2970,8 +3198,9 @@ msgstr "ორ -სკენ მისამართი."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#, fuzzy
 msgid "Cu_t"
-msgstr ""
+msgstr "_ამოჭრა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
@@ -2988,16 +3217,14 @@ msgid "_Copy"
 msgstr "_დააკოპირე"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#, fuzzy
 msgid "P_aste"
-msgstr "ჩასმა"
+msgstr "ჩ_ასმა"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1601
 #: ../calendar/gui/cal-search-bar.c:343
-#, fuzzy
 msgid "Any Category"
-msgstr "კატეგორია"
+msgstr "ნებისმიერი კატეგორია"
 
 #. FIXME: Allow range selection in table views, as in minicard view
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1802
@@ -3006,8 +3233,9 @@ msgid "Print cards"
 msgstr "ბეჭდვა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#, fuzzy
 msgid "Assistant"
-msgstr ""
+msgstr "ასისტენტი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 #, fuzzy
@@ -3017,7 +3245,7 @@ msgstr "ასისტენტი ტელეფონი"
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 #, fuzzy
 msgid "Business Fax"
-msgstr "ფაქსი"
+msgstr "სამუშაო ფაქსი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
@@ -3068,9 +3296,8 @@ msgid "Family Name"
 msgstr "გვარი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-#, fuzzy
 msgid "File As"
-msgstr "ფაილი"
+msgstr "ფაილი როგორც"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 #, fuzzy
@@ -3098,9 +3325,8 @@ msgid "Journal"
 msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#, fuzzy
 msgid "Manager"
-msgstr "მმართველი"
+msgstr "მენეჯერი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #: ../addressbook/gui/widgets/eab-contact-display.c:381
@@ -3117,7 +3343,6 @@ msgid "Note"
 msgstr "შენიშვნა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#, fuzzy
 msgid "Office"
 msgstr "ოფისი"
 
@@ -3143,12 +3368,13 @@ msgid "Primary Phone"
 msgstr "პირველადი ტელეფონი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#, fuzzy
 msgid "Radio"
-msgstr ""
+msgstr "რადიო"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:497
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
@@ -3173,7 +3399,6 @@ msgid "Telex"
 msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#, fuzzy
 msgid "Title"
 msgstr "სათაური"
 
@@ -3182,8 +3407,9 @@ msgid "Unit"
 msgstr "ერთეული"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#, fuzzy
 msgid "Web Site"
-msgstr ""
+msgstr "ვები საიტი"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
@@ -3223,13 +3449,14 @@ msgid "Has Focus"
 msgstr "ფოკუსი"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
 msgid "Field"
-msgstr ""
+msgstr "ველი"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:143
 #, fuzzy
 msgid "Field Name"
-msgstr "სახელი"
+msgstr "ველი სახელი"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:150
 #, fuzzy
@@ -3239,12 +3466,12 @@ msgstr "ტექსტი მოდელი"
 #: ../addressbook/gui/widgets/e-minicard-label.c:157
 #, fuzzy
 msgid "Max field name length"
-msgstr "მაქსიმალური"
+msgstr "მაქსიმალური ველი სახელი სიგრძე"
 
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
 #, fuzzy
 msgid "Column Width"
-msgstr "სიგანე"
+msgstr "სვეტი სიგანე"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:172
 #, fuzzy
@@ -3254,16 +3481,17 @@ msgid ""
 "Search for the Contact\n"
 "\n"
 "or double-click here to create a new Contact."
-msgstr "n კონტაქტი n double -სკენ a კონტაქტი."
+msgstr "არა კონტაქტი არა ორმაგი -სკენ a ახალი კონტაქტი."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:175
+#, fuzzy
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
-msgstr ""
+msgstr "არა არა -სკენ - არა -სკენ a ახალი კონტაქტი."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:180
 #, fuzzy
@@ -3271,7 +3499,7 @@ msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "n კონტაქტი."
+msgstr "არა კონტაქტი."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:182
 #, fuzzy
@@ -3279,14 +3507,13 @@ msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
-msgstr "n არა -სკენ."
+msgstr "არა არა -სკენ -."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr ""
 
 #: ../addressbook/gui/widgets/e-minicard.c:161
-#, fuzzy
 msgid "Selected"
 msgstr "მონიშნულია"
 
@@ -3307,17 +3534,16 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:276
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
-#, fuzzy
 msgid "List Members"
-msgstr "სია წევრები"
+msgstr "წევრების სია"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:339
 #: ../addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
 msgid "E-mail"
-msgstr ""
+msgstr "ელფოსტა"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:363
-#, fuzzy
 msgid "Position"
 msgstr "თანამდებობა"
 
@@ -3352,7 +3578,6 @@ msgid "personal"
 msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
-#, fuzzy
 msgid "Job Title"
 msgstr "პროფესია"
 
@@ -3376,19 +3601,19 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Repository offline"
-msgstr "კავშირგარეშე რეჟიმი"
+msgstr "ხაზიდან გასვლა"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Address Book does not exist"
-msgstr "მისამართი"
+msgstr "მისამართი არა"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: ../addressbook/gui/widgets/eab-gui-util.c:55
 #, fuzzy
 msgid "No Self Contact defined"
-msgstr "არა კონტაქტი"
+msgstr "არა მხოლოდ კონტაქტი"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
@@ -3402,7 +3627,7 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact not found"
-msgstr "კონტაქტი"
+msgstr "კონტაქტი არა"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:60
@@ -3414,7 +3639,7 @@ msgstr "კონტაქტი ID"
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Protocol not supported"
-msgstr "პროტოკოლი"
+msgstr "პროტოკოლი არა"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
@@ -3423,33 +3648,33 @@ msgstr "პროტოკოლი"
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
-#, fuzzy
 msgid "Canceled"
-msgstr "გაუქმებულია"
+msgstr "გაუქმებული"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
 msgid "Could not cancel"
-msgstr ""
+msgstr "არა გაუქმება"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
 #: ../calendar/gui/comp-editor-factory.c:433
 #, fuzzy
 msgid "Authentication Failed"
-msgstr "აუთენტიფიკაცია ოპერაცია ვერ/არ ჩატარდა"
+msgstr "აუთენტიფიკაცია ვერ განხორციელდა"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #, fuzzy
 msgid "Authentication Required"
-msgstr "აუთენტიფიკაცია"
+msgstr "აუთენტიფიკაცია აუცილებელია"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "TLS not Available"
-msgstr "მისაწვდომია"
+msgstr "TLS არა ხელმისაწვდომი"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
@@ -3462,7 +3687,7 @@ msgstr "არა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #, fuzzy
 msgid "Not available in offline mode"
-msgstr "კავშირგარეშე რეჟიმი"
+msgstr "- ხაზიდან გასვლა რეჟიმი"
 
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
@@ -3474,7 +3699,7 @@ msgstr "სხვა შეცდომა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
 #, fuzzy
 msgid "Invalid server version"
-msgstr "არასწორი ვერსია"
+msgstr "არასწორი"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:94
 #, fuzzy
@@ -3482,21 +3707,22 @@ msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
-msgstr "ოთ -სკენ კავშირგარეშე რეჟიმი კავშირგარეშე რეჟიმი -სკენ"
+msgstr "ოთ -სკენ გახსნა წიგნაკი არა ხაზიდან გასვლა ან არა ხაზიდან გასვლა წიგნაკი - ხაზზე რეჟიმი -სკენ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
-msgstr ""
+msgstr "ოთ -სკენ გახსნა წიგნაკი წმ და -სკენ."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
-msgstr "ოთ -სკენ URI LDAP."
+msgstr "ოთ -სკენ გახსნა წიგნაკი URI ან LDAP."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
 #, fuzzy
@@ -3504,14 +3730,14 @@ msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
-msgstr "ვერსია Evolution LDAP სუპორტი -სკენ -სკენ LDAP Evolution LDAP ჩართული Evolution."
+msgstr "- Evolution არა LDAP სუპორტი - -სკენ -სკენ LDAP - Evolution LDAP ჩართული Evolution."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:124
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
-msgstr "ოთ -სკენ URI."
+msgstr "ოთ -სკენ გახსნა წიგნაკი URI ან."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
 #, fuzzy
@@ -3520,7 +3746,7 @@ msgid ""
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
-msgstr "მეტი -სკენ Evolution -სკენ დირექტორია."
+msgstr "მეტი -სკენ ან Evolution -სკენ ძიება მეტი ან - პარამეტრები წიგნაკი."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:153
 #, fuzzy
@@ -3529,26 +3755,27 @@ msgid ""
 "you have configured for this addressbook.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
-msgstr "-სკენ დირექტორია."
+msgstr "-სკენ შესრულება ან წიგნაკი ძიება ან - წიგნაკი."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:159
 #, fuzzy
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "-სკენ."
+msgstr "წიგნაკი -სკენ."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:162
 #, fuzzy
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "-სკენ."
+msgstr "წიგნაკი -სკენ."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:165
+#, fuzzy
 msgid "This query did not complete successfully."
-msgstr ""
+msgstr "არა."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
 #, fuzzy
 msgid "Error adding list"
-msgstr "შეცდომა"
+msgstr "შეცდომა სია"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
 #: ../addressbook/gui/widgets/eab-gui-util.c:695
@@ -3559,7 +3786,7 @@ msgstr "შეცდომა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:198
 #, fuzzy
 msgid "Error modifying list"
-msgstr "შეცდომა"
+msgstr "შეცდომა სია"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:198
 #, fuzzy
@@ -3569,7 +3796,7 @@ msgstr "შეცდომა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
 #, fuzzy
 msgid "Error removing list"
-msgstr "შეცდომა"
+msgstr "შეცდომა სია"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
 #: ../addressbook/gui/widgets/eab-gui-util.c:650
@@ -3582,17 +3809,17 @@ msgstr "შეცდომა"
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
-msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr[0] "-სკენ?"
+msgstr "გახსნა ახალი ფანჯარა -სკენ გახსნა ახალი -სკენ ყველა -?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
+#, fuzzy
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
-msgstr ""
+msgstr "წმ -სკენ?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:325
 #, fuzzy
@@ -3605,8 +3832,7 @@ msgstr "გადაწერა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:370
 #: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
-msgid_plural "contacts"
-msgstr[0] ""
+msgstr ""
 
 #. This is a filename. Translators take note.
 #: ../addressbook/gui/widgets/eab-gui-util.c:420
@@ -3616,15 +3842,17 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Select Address Book"
-msgstr "მისამართი"
+msgstr "ამორჩევა მისამართი"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:596
+#, fuzzy
 msgid "list"
-msgstr ""
+msgstr "სია"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:756
+#, fuzzy
 msgid "Move contact to"
-msgstr ""
+msgstr "გადატანა -სკენ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:758
 #, fuzzy
@@ -3632,8 +3860,9 @@ msgid "Copy contact to"
 msgstr "დააკოპირე -სკენ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:761
+#, fuzzy
 msgid "Move contacts to"
-msgstr ""
+msgstr "გადატანა -სკენ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:763
 #, fuzzy
@@ -3646,8 +3875,9 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
+#, fuzzy
 msgid "VCard for %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:1033
 #: ../addressbook/gui/widgets/eab-gui-util.c:1051
@@ -3658,7 +3888,7 @@ msgstr "კონტაქტი"
 #: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, fuzzy, c-format
 msgid "Contact information for %s"
-msgstr "კონტაქტი"
+msgstr "კონტაქტი წმ"
 
 #: ../addressbook/gui/widgets/eab-popup-control.c:287
 #, fuzzy
@@ -3667,67 +3897,71 @@ msgstr "მისამართი."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
+#, fuzzy
 msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] ""
+msgstr "სხვა."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:223
 #: ../addressbook/gui/widgets/eab-vcard-control.c:272
 #, fuzzy
 msgid "Show Full VCard"
-msgstr "ანახე სრული"
+msgstr "ჩვენება სრული"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:277
 #, fuzzy
 msgid "Save in addressbook"
-msgstr "შენახვა"
+msgstr "შენახვა - წიგნაკი"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 #, fuzzy
 msgid "Card View"
-msgstr "კარტი ხედი"
+msgstr "ბარათი ჩვენება"
 
 #: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 #, fuzzy
 msgid "GTK Tree View"
-msgstr "განშტოება ხედი"
+msgstr "განშტოება ჩვენება"
 
 #: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../mail/importers/evolution-outlook-importer.c:264
 #: ../mail/importers/netscape-importer.c:1252
-#, fuzzy
 msgid "Importing..."
-msgstr "იმპორტი...."
+msgstr "იმპორტი..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:826
+#, fuzzy
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "Outlook CSV ან ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:827
 #, fuzzy
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook და"
+msgstr "Outlook CSV და ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:835
+#, fuzzy
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "მოზილა CSV ან ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:836
+#, fuzzy
 msgid "Mozilla CSV and Tab Importer"
-msgstr ""
+msgstr "მოზილა CSV და ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:844
+#, fuzzy
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "Evolution CSV ან ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:845
+#, fuzzy
 msgid "Evolution CSV and Tab Importer"
-msgstr ""
+msgstr "Evolution CSV და ჩანართი"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
@@ -3736,21 +3970,21 @@ msgstr ""
 msgid "Importing ..."
 msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 #, fuzzy
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP მონაცემი ფორმატი"
+msgstr "LDAP მონაცემები ფორმატი"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 #, fuzzy
 msgid "Evolution LDIF importer"
 msgstr "Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 #, fuzzy
 msgid "Evolution VCard Importer"
 msgstr "Evolution"
@@ -3781,12 +4015,14 @@ msgid "8 pt. Tahoma"
 msgstr ""
 
 #: ../addressbook/printing/e-contact-print.glade.h:3
+#, fuzzy
 msgid "Blank forms at end:"
-msgstr ""
+msgstr "სუფთა ფურცელი ფორმები ეთ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:4
+#, fuzzy
 msgid "Body"
-msgstr ""
+msgstr "ტანი"
 
 #: ../addressbook/printing/e-contact-print.glade.h:5
 #, fuzzy
@@ -3798,19 +4034,20 @@ msgid "Dimensions:"
 msgstr "განზომილებები:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
+#, fuzzy
 msgid "F_ont..."
-msgstr ""
+msgstr "F."
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "შრიფტები"
 
 #: ../addressbook/printing/e-contact-print.glade.h:9
+#, fuzzy
 msgid "Footer:"
-msgstr ""
+msgstr "ქვედა კოლონტიტული:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:10
-#, fuzzy
 msgid "Format"
 msgstr "ფორმატი"
 
@@ -3821,20 +4058,24 @@ msgstr "ფორმატი"
 #: ../widgets/table/e-table-field-chooser.c:91
 #: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
+#, fuzzy
 msgid "Header"
-msgstr ""
+msgstr "ზედა კოლონტიტული"
 
 #: ../addressbook/printing/e-contact-print.glade.h:12
+#, fuzzy
 msgid "Header/Footer"
-msgstr ""
+msgstr "ზედა კოლონტიტული ქვედა კოლონტიტული"
 
 #: ../addressbook/printing/e-contact-print.glade.h:13
+#, fuzzy
 msgid "Headings"
-msgstr ""
+msgstr "სათაურები"
 
 #: ../addressbook/printing/e-contact-print.glade.h:14
+#, fuzzy
 msgid "Headings for each letter"
-msgstr ""
+msgstr "სათაურები"
 
 #: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
@@ -3843,14 +4084,13 @@ msgstr "სიმაღლე:"
 #: ../addressbook/printing/e-contact-print.glade.h:16
 #, fuzzy
 msgid "Immediately follow each other"
-msgstr "მაშინვე"
+msgstr "მაშინვე სხვა"
 
 #: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr ""
 
 #: ../addressbook/printing/e-contact-print.glade.h:18
-#, fuzzy
 msgid "Landscape"
 msgstr "პეიზაჟი"
 
@@ -3859,15 +4099,16 @@ msgid "Left:"
 msgstr "მარცნივ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:20
+#, fuzzy
 msgid "Letter tabs on side"
-msgstr ""
+msgstr "ჩართულია"
 
 #: ../addressbook/printing/e-contact-print.glade.h:21
+#, fuzzy
 msgid "Margins"
-msgstr ""
+msgstr "მინდვრები"
 
 #: ../addressbook/printing/e-contact-print.glade.h:22
-#, fuzzy
 msgid "Number of columns:"
 msgstr "სვეტების რაოდენობა:"
 
@@ -3887,7 +4128,7 @@ msgstr "გვერდი"
 #: ../addressbook/printing/e-contact-print.glade.h:26
 #, fuzzy
 msgid "Page Setup:"
-msgstr "გვერდი ინსტალაცია:"
+msgstr "გვერდი პარამეტრები:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
@@ -3911,16 +4152,18 @@ msgid "Print using gray shading"
 msgstr "ბეჭდვა"
 
 #: ../addressbook/printing/e-contact-print.glade.h:32
+#, fuzzy
 msgid "Reverse on even pages"
-msgstr ""
+msgstr "პირიქით ჩართულია"
 
 #: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "მარჯვნივ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:34
+#, fuzzy
 msgid "Sections:"
-msgstr ""
+msgstr "სექციები:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:35
 #, fuzzy
@@ -3938,12 +4181,12 @@ msgstr "ზომა:"
 #: ../addressbook/printing/e-contact-print.glade.h:37
 #, fuzzy
 msgid "Start on a new page"
-msgstr "გაშვება a"
+msgstr "გაშვება ჩართულია a ახალი პანელი"
 
 #: ../addressbook/printing/e-contact-print.glade.h:38
 #, fuzzy
 msgid "Style name:"
-msgstr "სტილი:"
+msgstr "სტილი სახელი:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
@@ -3969,13 +4212,13 @@ msgstr "კონტაქტი ბეჭდვა სტილი რედა
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
 #: ../addressbook/printing/test-print.c:53
-#, fuzzy
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "საავტორო უფლებები C."
+msgstr "საავტორო უფლებები (C)·2000,·Ximian,·Inc."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
+#, fuzzy
 msgid "This should test the contact print style editor widget"
-msgstr ""
+msgstr "ბეჭდვა"
 
 #: ../addressbook/printing/test-print.c:52
 #, fuzzy
@@ -3983,26 +4226,31 @@ msgid "Contact Print Test"
 msgstr "კონტაქტი ბეჭდვა ტესტი"
 
 #: ../addressbook/printing/test-print.c:55
+#, fuzzy
 msgid "This should test the contact print code"
-msgstr ""
+msgstr "ბეჭდვა"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#, fuzzy
 msgid "Can not open file"
-msgstr ""
+msgstr "არა გახსნა ფაილი"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#, fuzzy
 msgid "Couldn't get list of addressbooks"
-msgstr ""
+msgstr "სია -"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#, fuzzy
 msgid "failed to open book"
-msgstr ""
+msgstr "-სკენ გახსნა"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
+#, fuzzy
 msgid "Specify the output file instead of standard output"
-msgstr ""
+msgstr "ფაილი -"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
@@ -4011,12 +4259,12 @@ msgstr ""
 #: ../addressbook/tools/evolution-addressbook-export.c:58
 #, fuzzy
 msgid "List local addressbook folders"
-msgstr "სია"
+msgstr "სია წიგნაკი"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 #, fuzzy
 msgid "Show cards as vcard or csv file"
-msgstr "ანახე"
+msgstr "ჩვენება ან ფაილი"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
@@ -4025,12 +4273,12 @@ msgstr ""
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 #, fuzzy
 msgid "Export in asynchronous mode"
-msgstr "ექსპორტი"
+msgstr "ექსპორტი - რეჟიმი"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 #, fuzzy
 msgid "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "რიცხვი ნაგულისხმევი სიდიდე."
+msgstr "რიცხვი - - ფაილი - რეჟიმი ნაგულისხმები."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
@@ -4039,21 +4287,22 @@ msgstr ""
 #: ../addressbook/tools/evolution-addressbook-export.c:91
 #, fuzzy
 msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "ბრძანება ხაზი შეცდომა -სკენ."
+msgstr "ბრძანება ხაზი შეცდომა დახმარება -სკენ."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
 #, fuzzy
 msgid "Only support csv or vcard format."
-msgstr "მხოლოდ სუპორტი."
+msgstr "მხოლოდ სუპორტი ან."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:114
+#, fuzzy
 msgid "In async mode, output must be file."
-msgstr ""
+msgstr "რეჟიმი ფაილი."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:122
 #, fuzzy
 msgid "In normal mode, there is no need for the size option."
-msgstr "არა სიდიდე."
+msgstr "საშუალო რეჟიმი არა."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:153
 #, fuzzy
@@ -4063,161 +4312,188 @@ msgstr "შეცდომა"
 #: ../addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
-msgstr "შეცდომა ნაგულისხმევი."
+msgstr "შეცდომა ნაგულისხმები წიგნაკი."
 
 #: ../addressbook/tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
-msgstr "შესავალი ფაილი"
+msgstr "შეყვანა ფაილი"
 
 #: ../addressbook/tools/evolution-addressbook-import.c:82
+#, fuzzy
 msgid "No filename provided."
-msgstr ""
+msgstr "არა."
 
 #: ../calendar/calendar.error.xml.h:1
+#, fuzzy
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
-msgstr ""
+msgstr "a -სკენ - შესახებ."
 
 #: ../calendar/calendar.error.xml.h:2
+#, fuzzy
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
-msgstr ""
+msgstr "a -სკენ დრო - დრო შესახებ."
 
 #: ../calendar/calendar.error.xml.h:3
+#, fuzzy
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "ყველა - და არა."
 
 #: ../calendar/calendar.error.xml.h:4
+#, fuzzy
 msgid "All information in this journal will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა - და არა."
 
 #: ../calendar/calendar.error.xml.h:5
+#, fuzzy
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "ყველა ჩართულია და არა."
 
 #: ../calendar/calendar.error.xml.h:6
+#, fuzzy
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა ჩართულია ამოცანები და არა."
 
 #: ../calendar/calendar.error.xml.h:7
+#, fuzzy
 msgid "All information on this appointment will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა ჩართულია და არა."
 
 #: ../calendar/calendar.error.xml.h:8
+#, fuzzy
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "ყველა ჩართულია ელემენტი და არა."
 
 #: ../calendar/calendar.error.xml.h:9
+#, fuzzy
 msgid "All information on this meeting will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა ჩართულია და არა."
 
 #: ../calendar/calendar.error.xml.h:10
+#, fuzzy
 msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა ჩართულია დრო და არა."
 
 #: ../calendar/calendar.error.xml.h:11
+#, fuzzy
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr ""
+msgstr "-სკენ წაშლა დრო?"
 
 #: ../calendar/calendar.error.xml.h:12
+#, fuzzy
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:13
+#, fuzzy
 msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr ""
+msgstr "-სკენ წაშლა ელემენტი?"
 
 #: ../calendar/calendar.error.xml.h:14
+#, fuzzy
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:15
+#, fuzzy
 msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:16
+#, fuzzy
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr ""
+msgstr "-სკენ წაშლა ამოცანები?"
 
 #: ../calendar/calendar.error.xml.h:17
+#, fuzzy
 msgid "Are you sure you want to delete this appointment?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:18
+#, fuzzy
 msgid "Are you sure you want to delete this journal entry?"
-msgstr ""
+msgstr "-სკენ წაშლა ელემენტი?"
 
 #: ../calendar/calendar.error.xml.h:19
+#, fuzzy
 msgid "Are you sure you want to delete this meeting?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:20
+#, fuzzy
 msgid "Are you sure you want to delete this task?"
-msgstr ""
+msgstr "-სკენ წაშლა დრო?"
 
 #: ../calendar/calendar.error.xml.h:21
+#, fuzzy
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr ""
+msgstr "-სკენ a?"
 
 #: ../calendar/calendar.error.xml.h:22
+#, fuzzy
 msgid "Are you sure you want to send the task without a summary?"
-msgstr ""
+msgstr "-სკენ დრო a?"
 
 #: ../calendar/calendar.error.xml.h:23
 #, fuzzy
 msgid "Cannot create a new event"
-msgstr "a"
+msgstr "a ახალი მოვლენა"
 
 #: ../calendar/calendar.error.xml.h:24
+#, fuzzy
 msgid "Delete calendar '{0}'?"
-msgstr ""
+msgstr "წაშლა კალენდარი?"
 
 #: ../calendar/calendar.error.xml.h:25
+#, fuzzy
 msgid "Delete memo list '{0}'?"
-msgstr ""
+msgstr "წაშლა სია?"
 
 #: ../calendar/calendar.error.xml.h:26
+#, fuzzy
 msgid "Delete task list '{0}'?"
-msgstr ""
+msgstr "წაშლა დრო სია?"
 
 #: ../calendar/calendar.error.xml.h:27
-#, fuzzy
 msgid "Do _not Send"
-msgstr "გაგზავნა"
+msgstr "არ _გააგზავნო"
 
 #: ../calendar/calendar.error.xml.h:28
+#, fuzzy
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr ""
+msgstr "ჩამოტვირთვა - -სკენ შენახვა?"
 
 #: ../calendar/calendar.error.xml.h:29
+#, fuzzy
 msgid "Download in progress. Do you want to save the task?"
-msgstr ""
+msgstr "ჩამოტვირთვა - -სკენ შენახვა დრო?"
 
 #: ../calendar/calendar.error.xml.h:30
 #, fuzzy
 msgid "Editor could not be loaded."
-msgstr "რედაქტორი."
+msgstr "რედაქტორი არა."
 
 #: ../calendar/calendar.error.xml.h:31
 #, fuzzy
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "Email -სკენ და -სკენ მიღება."
+msgstr "ელფოსტა გაგზავნილი -სკენ ყველა და -სკენ მიღება დრო."
 
 #: ../calendar/calendar.error.xml.h:32
 #, fuzzy
 msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Email -სკენ და -სკენ."
+msgstr "ელფოსტა გაგზავნილი -სკენ ყველა და -სკენ."
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
@@ -4226,180 +4502,194 @@ msgstr "შეცდომა კალენდრის ჩატვირთ�
 #: ../calendar/calendar.error.xml.h:34
 #, fuzzy
 msgid "Error loading memo list"
-msgstr "შეცდომა"
+msgstr "შეცდომა სია"
 
 #: ../calendar/calendar.error.xml.h:35
 #, fuzzy
 msgid "Error loading task list"
-msgstr "შეცდომა"
+msgstr "შეცდომა დრო სია"
 
 #: ../calendar/calendar.error.xml.h:36
 #, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
-msgstr "a."
+msgstr "არა a სხვა არა."
 
 #: ../calendar/calendar.error.xml.h:37
 #, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "a."
+msgstr "არა a სხვა არა."
 
 #: ../calendar/calendar.error.xml.h:38
 #, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "a."
+msgstr "არა a სხვა არა დრო."
 
 #: ../calendar/calendar.error.xml.h:39
+#, fuzzy
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
-msgstr ""
+msgstr "გაგზავნა სხვა -სკენ ზემოთ -სკენ თარიღი."
 
 #: ../calendar/calendar.error.xml.h:40
+#, fuzzy
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr ""
+msgstr "გაგზავნა სხვა -სკენ დრო ზემოთ -სკენ თარიღი."
 
 #: ../calendar/calendar.error.xml.h:41
+#, fuzzy
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
-msgstr ""
+msgstr "ვიმახსოვრებ - -."
 
 #: ../calendar/calendar.error.xml.h:42
+#, fuzzy
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
-msgstr ""
+msgstr "ვიმახსოვრებ დრო - -."
 
 #: ../calendar/calendar.error.xml.h:43
+#, fuzzy
 msgid "Some features may not work properly with your current server."
-msgstr ""
+msgstr "არა."
 
 #: ../calendar/calendar.error.xml.h:44
 #, fuzzy
 msgid "The Evolution calendar has quit unexpectedly."
-msgstr "Evolution."
+msgstr "Evolution კალენდარი დასრულება."
 
 #: ../calendar/calendar.error.xml.h:45
 #, fuzzy
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolution."
+msgstr "Evolution ამოცანები დასრულება."
 
 #: ../calendar/calendar.error.xml.h:46
 #, fuzzy
 msgid "The calendar is not marked for offline usage."
-msgstr "კავშირგარეშე რეჟიმი."
+msgstr "კალენდარი არა ხაზიდან გასვლა."
 
 #: ../calendar/calendar.error.xml.h:47
+#, fuzzy
 msgid "The calendar you have selected is read-only"
-msgstr ""
+msgstr "კალენდარი"
 
 #: ../calendar/calendar.error.xml.h:48
 #, fuzzy
 msgid "The memo list is not marked for offline usage"
-msgstr "კავშირგარეშე რეჟიმი"
+msgstr "სია არა ხაზიდან გასვლა"
 
 #: ../calendar/calendar.error.xml.h:49
 #, fuzzy
 msgid "The task list is not marked for offline usage."
-msgstr "კავშირგარეშე რეჟიმი."
+msgstr "დრო სია არა ხაზიდან გასვლა."
 
 #: ../calendar/calendar.error.xml.h:50
+#, fuzzy
 msgid "This calendar will be removed permanently."
-msgstr ""
+msgstr "კალენდარი."
 
 #: ../calendar/calendar.error.xml.h:51
+#, fuzzy
 msgid "This memo list will be removed permanently."
-msgstr ""
+msgstr "სია."
 
 #: ../calendar/calendar.error.xml.h:52
+#, fuzzy
 msgid "This task list will be removed permanently."
-msgstr ""
+msgstr "დრო სია."
 
 #: ../calendar/calendar.error.xml.h:53
+#, fuzzy
 msgid "Would you like to save your changes to this appointment?"
-msgstr ""
+msgstr "-სკენ შენახვა -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:54
 #, fuzzy
 msgid "Would you like to save your changes to this memo?"
-msgstr "-სკენ -სკენ?"
+msgstr "-სკენ შენახვა -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:55
+#, fuzzy
 msgid "Would you like to save your changes to this task?"
-msgstr ""
+msgstr "-სკენ შენახვა -სკენ დრო?"
 
 #: ../calendar/calendar.error.xml.h:56
+#, fuzzy
 msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr ""
+msgstr "-სკენ a ელემენტი?"
 
 #: ../calendar/calendar.error.xml.h:57
 #, fuzzy
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "-სკენ a?"
+msgstr "-სკენ ყველა a?"
 
 #: ../calendar/calendar.error.xml.h:58
+#, fuzzy
 msgid "Would you like to send meeting invitations to participants?"
-msgstr ""
+msgstr "-სკენ -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:59
 #, fuzzy
 msgid "Would you like to send this task to participants?"
-msgstr "-სკენ -სკენ?"
+msgstr "-სკენ დრო -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:60
+#, fuzzy
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
+msgstr "-სკენ -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:61
 #, fuzzy
 msgid "Would you like to send updated task information to participants?"
-msgstr "-სკენ -სკენ?"
+msgstr "-სკენ დრო -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:62
+#, fuzzy
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
-msgstr ""
+msgstr "თქვენ დაკავშირება -სკენ და Evolution -თვის -სკენ a."
 
 #: ../calendar/calendar.error.xml.h:63
 #, fuzzy
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "თქვენ."
+msgstr "თქვენ არა."
 
 #: ../calendar/calendar.error.xml.h:64
 #, fuzzy
 msgid "You have changed this task, but not yet saved it."
-msgstr "თქვენ."
+msgstr "თქვენ დრო არა."
 
 #: ../calendar/calendar.error.xml.h:65
 #, fuzzy
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "თქვენ -სკენ."
+msgstr "თქვენ -სკენ არა."
 
 #: ../calendar/calendar.error.xml.h:66
 #, fuzzy
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Evolution."
+msgstr "არა Evolution."
 
 #: ../calendar/calendar.error.xml.h:67
 #, fuzzy
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Evolution."
+msgstr "ამოცანები არა Evolution."
 
 #: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
-#, fuzzy
 msgid "_Discard Changes"
-msgstr "უარყოფა"
+msgstr "_ცვლილებების უარყოფა"
 
 #: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
@@ -4407,7 +4697,6 @@ msgid "_Save"
 msgstr "_შენახვა"
 
 #: ../calendar/calendar.error.xml.h:70
-#, fuzzy
 msgid "_Save Changes"
 msgstr "ცვლილებების _შენახვა"
 
@@ -4417,9 +4706,8 @@ msgid "_Send"
 msgstr "_გაგზავნა"
 
 #: ../calendar/calendar.error.xml.h:72
-#, fuzzy
 msgid "_Send Notice"
-msgstr "გაგზავნა შენიშვნა"
+msgstr "_შენიშვნის გაგზავნა"
 
 #: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
@@ -4433,7 +4721,7 @@ msgstr "შეიყვანეთ პაროლი"
 #: ../calendar/conduits/calendar/calendar-conduit.c:255
 #, fuzzy
 msgid "Split Multi-Day Events:"
-msgstr "დღე:"
+msgstr "დღე მოვლენები:"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1432
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
@@ -4441,48 +4729,49 @@ msgstr "დღე:"
 #: ../calendar/conduits/memo/memo-conduit.c:855
 #: ../calendar/conduits/todo/todo-conduit.c:1032
 #: ../calendar/conduits/todo/todo-conduit.c:1033
+#, fuzzy
 msgid "Could not start evolution-data-server"
-msgstr ""
+msgstr "არა"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1529
 #: ../calendar/conduits/calendar/calendar-conduit.c:1532
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
-msgstr "კალენდარი"
+msgstr "არა წმ კალენდარი პროგრამა"
 
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 #, fuzzy
 msgid "Could not read pilot's Memo application block"
-msgstr "მისამართი"
+msgstr "არა წმ პროგრამა"
 
 #: ../calendar/conduits/memo/memo-conduit.c:976
 #: ../calendar/conduits/memo/memo-conduit.c:979
 #, fuzzy
 msgid "Could not write pilot's Memo application block"
-msgstr "მისამართი"
+msgstr "არა წმ პროგრამა"
 
 #: ../calendar/conduits/todo/todo-conduit.c:239
-#, fuzzy
 msgid "Default Priority:"
 msgstr "ნაგულისხმევი პრიორიტეტი:"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1112
 #: ../calendar/conduits/todo/todo-conduit.c:1115
+#, fuzzy
 msgid "Could not read pilot's ToDo application block"
-msgstr ""
+msgstr "არა წმ პროგრამა"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1151
 #: ../calendar/conduits/todo/todo-conduit.c:1154
 #, fuzzy
 msgid "Could not write pilot's ToDo application block"
-msgstr "მისამართი"
+msgstr "არა წმ პროგრამა"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:1969
 #, fuzzy
 msgid "Calendar and Tasks"
-msgstr "კალენდარი და დავალებანი"
+msgstr "კალენდარი და ამოცანები"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 #: ../calendar/gui/calendar-component.c:1291
@@ -4492,12 +4781,12 @@ msgstr "კალენდრები"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 #, fuzzy
 msgid "Configure your timezone, Calendar and Task List here "
-msgstr "კონფიგურირება კალენდარი და სია "
+msgstr "გამართვა კალენდარი და ამოცანა სია "
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 #, fuzzy
 msgid "Evolution Calendar and Tasks"
-msgstr "Evolution კალენდარი და დავალებანი"
+msgstr "Evolution კალენდარი და ამოცანები"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 #, fuzzy
@@ -4512,27 +4801,27 @@ msgstr "Evolution კალენდარი"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Calendar/Task editor"
-msgstr "Evolution კალენდარი"
+msgstr "Evolution კალენდარი ამოცანა"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
 msgid "Evolution's Calendar component"
-msgstr "Evolution კალენდარი"
+msgstr "Evolution წმ კალენდარი"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 #, fuzzy
 msgid "Evolution's Memos component"
-msgstr "Evolution"
+msgstr "Evolution წმ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 #, fuzzy
 msgid "Evolution's Tasks component"
-msgstr "Evolution დავალებანი"
+msgstr "Evolution წმ ამოცანები"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 #, fuzzy
 msgid "Memo_s"
-msgstr "წევრები"
+msgstr "წმ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
@@ -4543,7 +4832,7 @@ msgid "Memos"
 msgstr "წევრები"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
@@ -4552,7 +4841,6 @@ msgstr "წევრები"
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-#, fuzzy
 msgid "Tasks"
 msgstr "დავალებანი"
 
@@ -4566,13 +4854,11 @@ msgid "_Tasks"
 msgstr "_დავალებანი"
 
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
 msgid "Evolution Calendar alarm notification service"
-msgstr ""
+msgstr "Evolution კალენდარი"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "წუთი"
@@ -4590,9 +4876,8 @@ msgstr[0] "საათი"
 msgstr[1] "საათი"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
-#, fuzzy
 msgid "Start time"
-msgstr "გაშვება"
+msgstr "დაწყების დრო"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
@@ -4605,7 +4890,6 @@ msgstr "შეხვედრები"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
-#, fuzzy
 msgid "Location:"
 msgstr "მდებარეობა:"
 
@@ -4633,8 +4917,9 @@ msgid "_Snooze"
 msgstr ""
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#, fuzzy
 msgid "location of appointment"
-msgstr ""
+msgstr "-"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1107
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1250
@@ -4646,7 +4931,7 @@ msgstr "არა."
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 #, fuzzy
 msgid "No description available."
-msgstr "აღწერა არ არის"
+msgstr "აღწერილობა მიუწვდომელია."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 #, fuzzy
@@ -4655,8 +4940,9 @@ msgstr "არა."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
+#, fuzzy
 msgid "You have %d alarms"
-msgstr ""
+msgstr "თქვენ"
 
 #. FIXME
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1344
@@ -4665,12 +4951,13 @@ msgid "Warning"
 msgstr "გაფრთხილება"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1348
+#, fuzzy
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
-msgstr ""
+msgstr "Evolution არა სუპორტი კალენდარი -სკენ ელფოსტა Evolution საშუალო დიალოგი."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, fuzzy, c-format
@@ -4682,91 +4969,59 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Evolution კალენდარი -სკენ -სკენ პროგრამა n\n"
-" n -სკენ პროგრამა?"
+"Evolution კალენდარი შესახებ -სკენ -სკენ პროგრამა არა\n"
+" წმ არა -სკენ პროგრამა?"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 #, fuzzy
 msgid "Do not ask me about this program again."
-msgstr "პროგრამა."
+msgstr "არა შესახებ პროგრამა."
 
 #: ../calendar/gui/alarm-notify/notify-main.c:140
+#, fuzzy
 msgid "Could not initialize Bonobo"
-msgstr ""
+msgstr "არა"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
+#, fuzzy
 msgid "Could not create the alarm notify service factory"
-msgstr ""
+msgstr "არა"
 
 #: ../calendar/gui/alarm-notify/util.c:41
+#, fuzzy
 msgid "invalid time"
-msgstr ""
-
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, fuzzy, c-format
-msgid "(%ld seconds)"
-msgstr "წამი"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d·%s·%d·%s)"
+msgstr "მცდარი"
 
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "წამი"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "წამი"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d·%s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u წამი"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u წამი"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u წუთი"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
 #, c-format
-msgid " %u minutes"
-msgstr " %u წუთი"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d საათი"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
 #, c-format
-msgid "%u hour"
-msgstr "%u საათი"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d წუთი"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
 #, c-format
-msgid "%u hours"
-msgstr "%u საათი"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d წამი"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#, fuzzy
 msgid "Alarm programs"
-msgstr ""
+msgstr "პროგრამები"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 #, fuzzy
@@ -4776,12 +5031,12 @@ msgstr "კითხვა"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 #, fuzzy
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ფონი დღეს."
+msgstr "ფონი - ამოცანები დღეს -."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 #, fuzzy
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "ფონი."
+msgstr "ფონი - ამოცანები -."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 #, fuzzy
@@ -4791,25 +5046,27 @@ msgstr "კალენდრები -სკენ"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 #, fuzzy
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "ფერი -სკენ სტრიქონი დრო ნაგულისხმევი."
+msgstr "ფერი -სკენ ხაზი - დრო ნაგულისხმები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 #, fuzzy
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "ფერი -სკენ ხაზი დღე ხედი."
+msgstr "ფერი -სკენ ხაზი - დღე ჩვენება."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#, fuzzy
 msgid "Compress weekends in month view"
-msgstr ""
+msgstr "შეკუნშვა - თვე"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#, fuzzy
 msgid "Confirm expunge"
-msgstr ""
+msgstr "დამოწმება"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 #, fuzzy
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr "დღეები და საათი."
+msgstr "დღეები ჩართულია და - საათი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 #, fuzzy
@@ -4829,7 +5086,7 @@ msgstr "ნაგულისხმევი"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 #, fuzzy
 msgid "Free/busy server URLs"
-msgstr "თავისუფალი"
+msgstr "თავისუფალი ვებმისამართები"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 #, fuzzy
@@ -4839,17 +5096,17 @@ msgstr "თავისუფალი URL"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 #, fuzzy
 msgid "Hide completed tasks"
-msgstr "დამალვა"
+msgstr "დამალვა დასრულებულია ამოცანები"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 #, fuzzy
 msgid "Hide task units"
-msgstr "დამალვა"
+msgstr "დამალვა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 #, fuzzy
 msgid "Hide task value"
-msgstr "დამალვა"
+msgstr "დამალვა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 #, fuzzy
@@ -4859,49 +5116,52 @@ msgstr "ჰორიზონტალური"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 #, fuzzy
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "საათი -სკენ."
+msgstr "საათი ჩართულია - ოთხი საათი -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 #, fuzzy
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "საათი -სკენ."
+msgstr "საათი ჩართულია - ოთხი საათი -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 #, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "დღე და სამსახური წუთი."
+msgstr "- დღე და სამსახური კვირა - წუთი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#, fuzzy
 msgid "Last alarm time"
-msgstr ""
+msgstr "ბოლო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 #, fuzzy
 msgid "List of server URLs for free/busy publishing."
-msgstr "სია."
+msgstr "სია - ვებმისამართები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 #, fuzzy
 msgid "Marcus Bains Line"
-msgstr "სტრიქონი"
+msgstr "ხაზი"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 #, fuzzy
 msgid "Marcus Bains Line Color - Day View"
-msgstr "სტრიქონი ფერი დღე ხედი"
+msgstr "ხაზი ფერი დღე ჩვენება"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 #, fuzzy
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "სტრიქონი ფერი დრო"
+msgstr "ხაზი ფერი დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
 msgid "Minute the workday ends on, 0 to 59."
-msgstr ""
+msgstr "წუთი ჩართულია -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#, fuzzy
 msgid "Minute the workday starts on, 0 to 59."
-msgstr ""
+msgstr "წუთი ჩართულია -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 #, fuzzy
@@ -4916,50 +5176,52 @@ msgstr "თვე ვერტიკალური"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Number of units for determining a default reminder."
-msgstr "a ნაგულისხმევი."
+msgstr "ნომერი - a ნაგულისხმები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#, fuzzy
 msgid "Number of units for determining when to hide tasks."
-msgstr ""
+msgstr "ნომერი - -სკენ ამოცანები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#, fuzzy
 msgid "Overdue tasks color"
-msgstr ""
+msgstr "ამოცანები"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
-msgstr "თანამდებობა ჰორიზონტალური თარიღი და პიქსელი."
+msgstr "პოზიცია - ჰორიზონტალური თარიღი კალენდარი და დრო სია არა - თვე - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr "თანამდებობა ჰორიზონტალური და თარიღი და პიქსელი."
+msgstr "პოზიცია - ჰორიზონტალური და თარიღი კალენდარი და დრო სია - თვე - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
-msgstr "თანამდებობა ვერტიკალური და პიქსელი."
+msgstr "პოზიცია - ვერტიკალური დრო სია და დრო - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr "თანამდებობა ვერტიკალური და თარიღი და პიქსელი."
+msgstr "პოზიცია - ვერტიკალური და თარიღი კალენდარი და დრო სია - თვე - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
-msgstr "თანამდებობა ვერტიკალური და თარიღი და პიქსელი."
+msgstr "პოზიცია - ვერტიკალური და თარიღი კალენდარი და დრო სია არა - თვე - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 #, fuzzy
@@ -4967,87 +5229,96 @@ msgid "Programs that are allowed to be run by alarms."
 msgstr "პროგრამები -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#, fuzzy
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
+msgstr "ჩვენება RSVP ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#, fuzzy
 msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
+msgstr "ჩვენება როლი ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 #, fuzzy
 msgid "Show appointment end times in week and month views"
-msgstr "ანახე და"
+msgstr "ჩვენება - კვირა და თვე"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#, fuzzy
 msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
+msgstr "ჩვენება ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 #, fuzzy
 msgid "Show display alarms in notification tray"
-msgstr "ანახე"
+msgstr "ჩვენება -"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#, fuzzy
 msgid "Show status field in the event/task/meeting editor"
-msgstr ""
+msgstr "ჩვენება ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 #: ../mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Show the \"Preview\" pane"
-msgstr "ანახე წინასწარ ნახვა"
+msgstr "ჩვენება წინასწარ ნახვა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #: ../mail/evolution-mail.schemas.in.in.h:74
 #, fuzzy
 msgid "Show the \"Preview\" pane."
-msgstr "ანახე წინასწარ ნახვა."
+msgstr "ჩვენება წინასწარ ნახვა."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#, fuzzy
 msgid "Show timezone field in the event/meeting editor"
-msgstr ""
+msgstr "ჩვენება ველი - მოვლენა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#, fuzzy
 msgid "Show type field in the event/task/meeting editor"
-msgstr ""
+msgstr "ჩვენება ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 #, fuzzy
 msgid "Show week numbers in date navigator"
-msgstr "ანახე თარიღი"
+msgstr "ჩვენება კვირა - თარიღი"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 #, fuzzy
 msgid "Tasks due today color"
-msgstr "დავალებანი დღეს"
+msgstr "ამოცანები დღეს"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 #, fuzzy
 msgid "Tasks vertical pane position"
-msgstr "დავალებანი ვერტიკალური"
+msgstr "ამოცანები ვერტიკალური"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
+#, fuzzy
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
-msgstr ""
+msgstr "URL -სკენ a u - ფოსტა და."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 #, fuzzy
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
-msgstr "ნაგულისხმევი -სკენ და ახალი."
+msgstr "ნაგულისხმები -სკენ და - კალენდარი ახალი იორქი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#, fuzzy
 msgid "Time divisions"
-msgstr ""
+msgstr "დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#, fuzzy
 msgid "Time the last alarm ran, in time_t."
-msgstr ""
+msgstr "დრო -."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
@@ -5056,102 +5327,109 @@ msgstr "დროის ზონა"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 #, fuzzy
 msgid "Twenty four hour time format"
-msgstr "საათი"
+msgstr "ოთხი საათი"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 #, fuzzy
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "ერთეული a ნაგულისხმევი წუთი საათი დღე."
+msgstr "ერთეული a ნაგულისხმები წუთი საათი ან დღე."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 #, fuzzy
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "ერთეული -სკენ წუთი საათი დღე."
+msgstr "ერთეული -სკენ ამოცანები წუთი საათი ან დღე."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#, fuzzy
 msgid "Week start"
-msgstr ""
+msgstr "კვირა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 #, fuzzy
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "კვირა -სკენ შაბათი."
+msgstr "კვირა ჩართულია კვირა -სკენ შაბათი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 #, fuzzy
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "-სკენ."
+msgstr "ან არა -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "-სკენ."
+msgstr "-სკენ ან დრო."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "-სკენ და."
+msgstr "-სკენ და ამოცანები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 #, fuzzy
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
-msgstr "-სკენ შაბათი და კვირა."
+msgstr "-სკენ - თვე შაბათი და კვირა - -."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "-სკენ და."
+msgstr "-სკენ - - კვირა და თვე."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#, fuzzy
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
+msgstr "-სკენ ხაზი ხაზი ეთ - კალენდარი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr ""
+msgstr "-სკენ დასრულებულია ამოცანები - ამოცანები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
-msgstr "-სკენ a ნაგულისხმევი."
+msgstr "-სკენ a ნაგულისხმები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#, fuzzy
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
+msgstr "-სკენ RSVP ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 #, fuzzy
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "-სკენ"
+msgstr "-სკენ ველი - მოვლენა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#, fuzzy
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
+msgstr "-სკენ ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#, fuzzy
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
+msgstr "-სკენ ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#, fuzzy
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
+msgstr "-სკენ - ოთხი საათი - am pm."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 #, fuzzy
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "-სკენ"
+msgstr "-სკენ ველი - მოვლენა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 #, fuzzy
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "-სკენ ტიპი"
+msgstr "-სკენ ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
-msgstr "-სკენ თარიღი."
+msgstr "-სკენ კვირა - თარიღი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 #, fuzzy
@@ -5181,22 +5459,22 @@ msgstr "წუთი"
 #: ../calendar/gui/cal-search-bar.c:48
 #, fuzzy
 msgid "Summary contains"
-msgstr "ჯამური"
+msgstr "რეზიუმე შეიცავს"
 
 #: ../calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Description contains"
-msgstr "აღწერა"
+msgstr "აღწერა შეიცავს"
 
 #: ../calendar/gui/cal-search-bar.c:51
 #, fuzzy
 msgid "Comment contains"
-msgstr "კომენტარი"
+msgstr "კომენტარი შეიცავს"
 
 #: ../calendar/gui/cal-search-bar.c:52
 #, fuzzy
 msgid "Location contains"
-msgstr "ადგილმდებარეობა"
+msgstr "ადგილმდებარეობა შეიცავს"
 
 #: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
@@ -5229,11 +5507,12 @@ msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr "-სკენ."
+msgstr "ყველა - არა -სკენ."
 
 #: ../calendar/gui/calendar-commands.c:354
+#, fuzzy
 msgid "Purge events older than"
-msgstr ""
+msgstr "გასუფთავება"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
@@ -5254,11 +5533,12 @@ msgstr "დღე"
 #: ../calendar/gui/tasks-component.c:217
 #, fuzzy
 msgid "On The Web"
-msgstr "ჩართ."
+msgstr "ჩართ. ვები"
 
 #: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
+#, fuzzy
 msgid "Birthdays & Anniversaries"
-msgstr ""
+msgstr "დაბადების დღეები"
 
 #. Create the weather group
 #: ../calendar/gui/calendar-component.c:259
@@ -5274,22 +5554,22 @@ msgstr "ახალი კალენდარი"
 #: ../calendar/gui/calendar-component.c:840
 #, fuzzy
 msgid "Failed upgrading calendars."
-msgstr "ოპერაცია ვერ/არ ჩატარდა."
+msgstr "ვერ განხორციელდა."
 
 #: ../calendar/gui/calendar-component.c:1139
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "-სკენ და"
+msgstr "-სკენ გახსნა კალენდარი წმ და"
 
 #: ../calendar/gui/calendar-component.c:1152
 #, fuzzy
 msgid "There is no calendar available for creating events and meetings"
-msgstr "არა და"
+msgstr "არა კალენდარი და"
 
 #: ../calendar/gui/calendar-component.c:1266
 #, fuzzy
 msgid "Calendar Source Selector"
-msgstr "კალენდარი"
+msgstr "კალენდარი წყარო ამრჩევი"
 
 #: ../calendar/gui/calendar-component.c:1457
 #, fuzzy
@@ -5297,13 +5577,14 @@ msgid "New appointment"
 msgstr "ახალი"
 
 #: ../calendar/gui/calendar-component.c:1458
+#, fuzzy
 msgid "_Appointment"
-msgstr ""
+msgstr "შეხვედრა"
 
 #: ../calendar/gui/calendar-component.c:1459
 #, fuzzy
 msgid "Create a new appointment"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი"
 
 #: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
@@ -5317,12 +5598,12 @@ msgstr "M"
 #: ../calendar/gui/calendar-component.c:1467
 #, fuzzy
 msgid "Create a new meeting request"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი"
 
 #: ../calendar/gui/calendar-component.c:1473
 #, fuzzy
 msgid "New all day appointment"
-msgstr "ახალი დღე"
+msgstr "ახალი ყველა დღე"
 
 #: ../calendar/gui/calendar-component.c:1474
 #, fuzzy
@@ -5332,7 +5613,7 @@ msgstr "ყველა დღე A"
 #: ../calendar/gui/calendar-component.c:1475
 #, fuzzy
 msgid "Create a new all-day appointment"
-msgstr "შექმნა a დღე"
+msgstr "შექმნა a ახალი ყველა დღე"
 
 #: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
@@ -5347,38 +5628,37 @@ msgid "Create a new calendar"
 msgstr "შექმენი ახალი კალენდარი"
 
 #: ../calendar/gui/calendar-view-factory.c:109
-#, fuzzy
 msgid "Day View"
-msgstr "დღე ხედი"
+msgstr "დღის ხედი"
 
 #: ../calendar/gui/calendar-view-factory.c:112
 #, fuzzy
 msgid "Work Week View"
-msgstr "სამსახური ხედი"
+msgstr "სამსახური კვირა ჩვენება"
 
 #: ../calendar/gui/calendar-view-factory.c:115
 #, fuzzy
 msgid "Week View"
-msgstr "ხედი"
+msgstr "კვირა ჩვენება"
 
 #: ../calendar/gui/calendar-view-factory.c:118
-#, fuzzy
 msgid "Month View"
-msgstr "თვე ხედი"
+msgstr "თვის ხედი"
 
 #: ../calendar/gui/comp-editor-factory.c:415
 #, fuzzy
 msgid "Error while opening the calendar"
-msgstr "შეცდომა"
+msgstr "შეცდომა კალენდარი"
 
 #: ../calendar/gui/comp-editor-factory.c:421
+#, fuzzy
 msgid "Method not supported when opening the calendar"
-msgstr ""
+msgstr "არა კალენდარი"
 
 #: ../calendar/gui/comp-editor-factory.c:427
 #, fuzzy
 msgid "Permission denied to open the calendar"
-msgstr "-სკენ"
+msgstr "-სკენ გახსნა კალენდარი"
 
 #: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
@@ -5398,8 +5678,9 @@ msgid "<b>Options</b>"
 msgstr "<b>ოფციები</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
 msgid "<b>Repeat</b>"
-msgstr ""
+msgstr "<b> გამეორება</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
@@ -5424,12 +5705,13 @@ msgstr ""
 #: ../calendar/gui/e-alarm-list.c:446
 #, fuzzy
 msgid "Play a sound"
-msgstr "დაკვრა a"
+msgstr "ხმის დაკვრა"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 #: ../calendar/gui/e-alarm-list.c:450
+#, fuzzy
 msgid "Pop up an alert"
-msgstr ""
+msgstr "ზემოთ განგაში"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 #: ../calendar/gui/e-alarm-list.c:458
@@ -5438,7 +5720,6 @@ msgid "Run a program"
 msgstr "გაშვება a პროგრამა"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
-#, fuzzy
 msgid "Send To:"
 msgstr "გაგზავნა ვის:"
 
@@ -5446,7 +5727,7 @@ msgstr "გაგზავნა ვის:"
 #: ../calendar/gui/e-alarm-list.c:454
 #, fuzzy
 msgid "Send an email"
-msgstr "გაგზავნა"
+msgstr "გაგზავნა ელფოსტა"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
@@ -5457,8 +5738,9 @@ msgid "_Program:"
 msgstr "_პროგრამა:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
 msgid "_Repeat the alarm"
-msgstr ""
+msgstr "გამეორება"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
@@ -5480,8 +5762,9 @@ msgid "day(s)"
 msgstr "დღე"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#, fuzzy
 msgid "end of appointment"
-msgstr ""
+msgstr "-"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "extra times every"
@@ -5496,25 +5779,26 @@ msgid "minute(s)"
 msgstr "წუთი"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#, fuzzy
 msgid "start of appointment"
-msgstr ""
+msgstr "-"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 #, fuzzy
 msgid "Action/Trigger"
 msgstr "მოქმედება"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
-#, fuzzy
 msgid "A_dd"
-msgstr "A"
+msgstr "და_მატება"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
+#, fuzzy
 msgid "Alarms"
-msgstr ""
+msgstr "სიგნალები"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
@@ -5523,18 +5807,21 @@ msgstr ""
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
 #: ../widgets/misc/e-attachment.glade.h:6
+#, fuzzy
 msgid "Suggest automatic display of attachment"
-msgstr ""
+msgstr "კარნახი ავტომატური -"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#, fuzzy
 msgid "Attach file(s)"
-msgstr ""
+msgstr "ფაილი წმ"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
+#, fuzzy
 msgid "Attachment Properties"
-msgstr ""
+msgstr "პარამეტრები"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:269
@@ -5560,7 +5847,7 @@ msgstr "MIME ტიპი:"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 #, fuzzy
 msgid "Selected Calendars for Alarms"
-msgstr "კალენდრები"
+msgstr "მონიშნული კალენდრები სიგნალები"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
@@ -5579,7 +5866,7 @@ msgstr ""
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy, no-c-format
 msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i> u და და</i>"
+msgstr "<i> u და და ელფოსტა</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:9
@@ -5600,7 +5887,7 @@ msgstr "<span weight=\"bold\">საერთო</span>"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\"> სია</span>"
+msgstr "<span weight=\"bold\"> ამოცანა სია</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
@@ -5610,14 +5897,13 @@ msgstr "<span weight=\"bold\"> დრო</span>"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\"> სამსახური</span>"
+msgstr "<span weight=\"bold\"> სამსახური კვირა</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "დღე _მთავრდება:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
 msgid "Display"
 msgstr "დისპლეი"
 
@@ -5670,13 +5956,13 @@ msgstr ""
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
 #: ../mail/mail-config.glade.h:106
-#, fuzzy
 msgid "Pick a color"
-msgstr "აირჩიე ფერი"
+msgstr "ფერის ამორჩევა"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#, fuzzy
 msgid "S_un"
-msgstr ""
+msgstr "S"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
@@ -5685,17 +5971,19 @@ msgid "Saturday"
 msgstr "შაბათი"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#, fuzzy
 msgid "Select the calendars for alarm notification"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#, fuzzy
 msgid "Sh_ow a reminder"
-msgstr ""
+msgstr "a"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "Show week _numbers in date navigator"
-msgstr "ანახე თარიღი"
+msgstr "ჩვენება კვირა - თარიღი"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
@@ -5704,15 +5992,16 @@ msgid "Sunday"
 msgstr "კვირა"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
 msgid "T_asks due today:"
-msgstr ""
+msgstr "T დღეს:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#, fuzzy
 msgid "T_hu"
-msgstr ""
+msgstr "T"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#, fuzzy
 msgid "Template:"
 msgstr "შაბლონი:"
 
@@ -5746,8 +6035,9 @@ msgstr "ოთხშაბათი"
 
 #. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
 msgid "Wee_k starts on:"
-msgstr ""
+msgstr "ჩართულია:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
@@ -5768,38 +6058,43 @@ msgid "_Ask for confirmation when deleting items"
 msgstr "კითხვა"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#, fuzzy
 msgid "_Compress weekends in month view"
-msgstr ""
+msgstr "შეკუნშვა - თვე"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_დღე იწყება:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#, fuzzy
 msgid "_Fri"
-msgstr ""
+msgstr "პარ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 #, fuzzy
 msgid "_Hide completed tasks after"
-msgstr "დამალვა"
+msgstr "დამალვა დასრულებულია ამოცანები"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#, fuzzy
 msgid "_Mon"
-msgstr ""
+msgstr "ორშ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#, fuzzy
 msgid "_Overdue tasks:"
-msgstr ""
+msgstr "ამოცანები:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#, fuzzy
 msgid "_Sat"
-msgstr ""
+msgstr "შაბ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 #, fuzzy
 msgid "_Show appointment end times in week and month view"
-msgstr "ანახე და"
+msgstr "ჩვენება - კვირა და თვე"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 #, fuzzy
@@ -5807,12 +6102,14 @@ msgid "_Time divisions:"
 msgstr "დრო:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#, fuzzy
 msgid "_Tue"
-msgstr ""
+msgstr "სამ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#, fuzzy
 msgid "_Wed"
-msgstr ""
+msgstr "ოთხ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
@@ -5821,17 +6118,17 @@ msgstr ""
 #: ../calendar/gui/dialogs/calendar-setup.c:288
 #, fuzzy
 msgid "Copy calendar contents locally for offline operation"
-msgstr "დააკოპირე კავშირგარეშე რეჟიმი"
+msgstr "დააკოპირე კალენდარი ხაზიდან გასვლა"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:291
 #, fuzzy
 msgid "Copy task list contents locally for offline operation"
-msgstr "დააკოპირე კავშირგარეშე რეჟიმი"
+msgstr "დააკოპირე დრო სია ხაზიდან გასვლა"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:293
 #, fuzzy
 msgid "Copy memo list contents locally for offline operation"
-msgstr "დააკოპირე კავშირგარეშე რეჟიმი"
+msgstr "დააკოპირე სია ხაზიდან გასვლა"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
@@ -5841,7 +6138,7 @@ msgstr "_ფერი:"
 #: ../calendar/gui/dialogs/calendar-setup.c:381
 #, fuzzy
 msgid "Tasks List"
-msgstr "დავალებანი სია"
+msgstr "ამოცანები სია"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:392
 #, fuzzy
@@ -5860,7 +6157,7 @@ msgstr "ახალი კალენდარი"
 #: ../calendar/gui/dialogs/calendar-setup.c:529
 #, fuzzy
 msgid "Task List Properties"
-msgstr "სია პარამეტრები"
+msgstr "ამოცანა სია პარამეტრები"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:595
 #: ../calendar/gui/memos-component.c:450
@@ -5876,17 +6173,16 @@ msgstr "დამატება კალენდარი"
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 #, fuzzy
 msgid "Add Task List"
-msgstr "დამატება სია"
+msgstr "დამატება ამოცანა სია"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
 msgid "_Add Calendar"
-msgstr "დამატება კალენდარი"
+msgstr "კალენდარის _დამატება"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Task List"
-msgstr "დამატება სია"
+msgstr "დამატება ამოცანა სია"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
@@ -5907,78 +6203,94 @@ msgid "weeks"
 msgstr ""
 
 #: ../calendar/gui/dialogs/changed-comp.c:60
+#, fuzzy
 msgid "This event has been deleted."
-msgstr ""
+msgstr "მოვლენა."
 
 #: ../calendar/gui/dialogs/changed-comp.c:64
+#, fuzzy
 msgid "This task has been deleted."
-msgstr ""
+msgstr "დრო."
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
+#, fuzzy
 msgid "This journal entry has been deleted."
-msgstr ""
+msgstr "ელემენტი."
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
+#, fuzzy
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
+msgstr "წმ თქვენ და დახურვა?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
+#, fuzzy
 msgid "%s  You have made no changes, close the editor?"
-msgstr ""
+msgstr "წმ თქვენ არა დახურვა?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:84
+#, fuzzy
 msgid "This event has been changed."
-msgstr ""
+msgstr "მოვლენა."
 
 #: ../calendar/gui/dialogs/changed-comp.c:88
+#, fuzzy
 msgid "This task has been changed."
-msgstr ""
+msgstr "დრო."
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
+#, fuzzy
 msgid "This journal entry has been changed."
-msgstr ""
+msgstr "ელემენტი."
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
+#, fuzzy
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
+msgstr "წმ თქვენ და?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
+#, fuzzy
 msgid "%s  You have made no changes, update the editor?"
-msgstr ""
+msgstr "წმ თქვენ არა?"
 
 #: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
+#, fuzzy
 msgid "Validation error: %s"
-msgstr ""
+msgstr "შეცდომა წმ"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
+#, fuzzy
 msgid " to "
-msgstr ""
+msgstr "მდე"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
+#, fuzzy
 msgid " (Completed "
-msgstr ""
+msgstr "დასრულებულია "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "შესრულებულია "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
+#, fuzzy
 msgid " (Due "
-msgstr ""
+msgstr "ვადა "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
+#, fuzzy
 msgid "Due "
-msgstr ""
+msgstr "ვადა "
 
 #: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
+#, fuzzy
 msgid "Attached message - %s"
-msgstr ""
+msgstr "წმ"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
@@ -5986,8 +6298,7 @@ msgstr ""
 #: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] ""
+msgstr ""
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
@@ -6000,31 +6311,31 @@ msgstr "_გადატანა"
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 #, fuzzy
 msgid "Cancel _Drag"
-msgstr "გაუქმება გადათრევა"
+msgstr "შეწყვეტა გადათრევა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
+#, fuzzy
 msgid "Could not update object"
-msgstr ""
+msgstr "არა ობიექტი"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] ""
+msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 #, fuzzy
 msgid "Hide Attachment _Bar"
-msgstr "არა"
+msgstr "დამალვა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 #, fuzzy
 msgid "Show Attachment _Bar"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
@@ -6035,146 +6346,168 @@ msgstr "ანახე"
 msgid "_Remove"
 msgstr "_წაშლა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_პარამეტრები"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3622
 #, fuzzy
 msgid "_Add attachment..."
 msgstr "დამატება."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../calendar/gui/dialogs/comp-editor.c:1468
 #: ../mail/em-format-html-display.c:2065
 #, fuzzy
 msgid "Show Attachments"
-msgstr "ანახე"
+msgstr "ჩვენება დანართები"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
+#, fuzzy
 msgid "Press space key to toggle attachment bar"
-msgstr ""
+msgstr "გასაღები -სკენ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 #, fuzzy
 msgid "Edit Appointment"
-msgstr "რედაქტირება"
+msgstr "რედაქტირება შეხვედრა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
+#, fuzzy
 msgid "Meeting - %s"
-msgstr ""
+msgstr "შეხვედრა წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
+#, fuzzy
 msgid "Appointment - %s"
-msgstr ""
+msgstr "შეხვედრა წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, fuzzy, c-format
 msgid "Assigned Task - %s"
-msgstr "ამოცანა"
+msgstr "მინიჭებული ამოცანა წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, fuzzy, c-format
 msgid "Task - %s"
-msgstr "ამოცანა"
+msgstr "ამოცანა წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
+#, fuzzy
 msgid "Journal entry - %s"
-msgstr ""
+msgstr "ელემენტი წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
+#, fuzzy
 msgid "No summary"
-msgstr ""
+msgstr "არა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
 #: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
+#, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
+msgstr "ცვლილებები -სკენ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
+#, fuzzy
 msgid "Unable to use current version!"
-msgstr ""
+msgstr "-სკენ!"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#, fuzzy
 msgid "Could not open source"
-msgstr ""
+msgstr "არა გახსნა"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#, fuzzy
 msgid "Could not open destination"
-msgstr ""
+msgstr "არა გახსნა"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#, fuzzy
 msgid "Destination is read only"
-msgstr ""
+msgstr "დაშორება"
 
 #: ../calendar/gui/dialogs/delete-error.c:54
+#, fuzzy
 msgid "The event could not be deleted due to a corba error"
-msgstr ""
+msgstr "მოვლენა არა -სკენ a შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:57
+#, fuzzy
 msgid "The task could not be deleted due to a corba error"
-msgstr ""
+msgstr "დრო არა -სკენ a შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
+#, fuzzy
 msgid "The journal entry could not be deleted due to a corba error"
-msgstr ""
+msgstr "ელემენტი არა -სკენ a შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
+#, fuzzy
 msgid "The item could not be deleted due to a corba error"
-msgstr ""
+msgstr "არა -სკენ a შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:70
+#, fuzzy
 msgid "The event could not be deleted because permission was denied"
-msgstr ""
+msgstr "მოვლენა არა"
 
 #: ../calendar/gui/dialogs/delete-error.c:73
+#, fuzzy
 msgid "The task could not be deleted because permission was denied"
-msgstr ""
+msgstr "დრო არა"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
+#, fuzzy
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
+msgstr "ელემენტი არა"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
+#, fuzzy
 msgid "The item could not be deleted because permission was denied"
-msgstr ""
+msgstr "არა"
 
 #: ../calendar/gui/dialogs/delete-error.c:86
+#, fuzzy
 msgid "The event could not be deleted due to an error"
-msgstr ""
+msgstr "მოვლენა არა -სკენ შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:89
+#, fuzzy
 msgid "The task could not be deleted due to an error"
-msgstr ""
+msgstr "დრო არა -სკენ შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
+#, fuzzy
 msgid "The journal entry could not be deleted due to an error"
-msgstr ""
+msgstr "ელემენტი არა -სკენ შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
+#, fuzzy
 msgid "The item could not be deleted due to an error"
-msgstr ""
+msgstr "არა -სკენ შეცდომა"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
@@ -6187,8 +6520,9 @@ msgid "Delegate To:"
 msgstr "ვის:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#, fuzzy
 msgid "Enter Delegate"
-msgstr ""
+msgstr "შეყვანა"
 
 #: ../calendar/gui/dialogs/event-editor.c:547
 #, fuzzy
@@ -6201,110 +6535,114 @@ msgid "Recurrence"
 msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
+#, fuzzy
 msgid "This event has alarms"
-msgstr ""
+msgstr "მოვლენა"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "კალე_ნდარი:"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:446
 msgid "Or_ganizer:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 #, fuzzy
 msgid "_Delegatees"
 msgstr "_წაშალე"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 #, fuzzy
 msgid "Atte_ndees"
 msgstr "სია"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 #, fuzzy
 msgid "Event with no start date"
-msgstr "შემთხვევა არა თარიღი"
+msgstr "მოვლენა არა თარიღი"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 #, fuzzy
 msgid "Event with no end date"
-msgstr "შემთხვევა არა თარიღი"
+msgstr "მოვლენა არა თარიღი"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:852
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "გაშვება თარიღი"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 #, fuzzy
 msgid "End date is wrong"
 msgstr "ბოლოში თარიღი"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
+#, fuzzy
 msgid "Start time is wrong"
-msgstr ""
+msgstr "გაშვება"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
+#, fuzzy
 msgid "End time is wrong"
-msgstr ""
+msgstr "ბოლოში"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:909
 #, fuzzy
 msgid "The organizer selected no longer has an account."
-msgstr "არა."
+msgstr "არა ანგარიში."
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "_დამატება"
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
+#, fuzzy
 msgid "Unable to open the calendar '%s'."
-msgstr ""
+msgstr "-სკენ გახსნა კალენდარი წმ."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
+#, fuzzy
 msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] ""
+msgstr "დღე"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
+#, fuzzy
 msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] ""
+msgstr "საათი"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
+#, fuzzy
 msgid "%d minute before appointement"
-msgid_plural "%d minutes before appointment"
-msgstr[0] ""
+msgstr "წუთი"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 #, fuzzy
 msgid "Customize"
 msgstr "გამართვა"
@@ -6314,7 +6652,7 @@ msgstr "გამართვა"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6329,17 +6667,18 @@ msgstr "გამართვა"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
 #: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
-#, fuzzy
 msgid "None"
 msgstr "არა"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
+#, fuzzy
 msgid "1 day before appointment"
-msgstr ""
+msgstr "დღე"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
 msgid "1 hour before appointment"
-msgstr ""
+msgstr "საათი"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:3
 #, fuzzy
@@ -6364,13 +6703,14 @@ msgstr "სხვა:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
 msgid "D_escription:"
-msgstr ""
+msgstr "D:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #, fuzzy
 msgid "Event Description"
-msgstr "შემთხვევა აღწერა"
+msgstr "მოვლენა აღწერა"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
@@ -6387,9 +6727,8 @@ msgid "_Alarm"
 msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-#, fuzzy
 msgid "_Time:"
-msgstr "დრო:"
+msgstr "_დრო:"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
@@ -6413,7 +6752,7 @@ msgstr "ვის"
 #: ../calendar/gui/dialogs/meeting-page.c:313
 #, fuzzy
 msgid "From:"
-msgstr "ვისგან:"
+msgstr "საიდან:"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -6422,25 +6761,27 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:2
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
 msgid "Click here to add an attendee"
-msgstr ""
+msgstr "-სკენ დამატება"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:3
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
 msgid "Common Name"
-msgstr "სახელი"
+msgstr "ჩვეულებრივი სახელი"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
 msgid "Delegated From"
-msgstr "ვისგან"
+msgstr "-დან"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:5
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+#, fuzzy
 msgid "Delegated To"
-msgstr ""
+msgstr "ვის"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:6
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
@@ -6454,14 +6795,15 @@ msgstr ""
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#, fuzzy
 msgid "RSVP"
-msgstr ""
+msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6477,9 +6819,8 @@ msgid "C_hange Organizer"
 msgstr "C"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#, fuzzy
 msgid "Co_ntacts..."
-msgstr "კონტაქტებ:"
+msgstr "კო_ნტაქტები..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -6497,8 +6838,9 @@ msgstr "ორ"
 
 #: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
+#, fuzzy
 msgid "Unable to open memos in '%s'."
-msgstr ""
+msgstr "-სკენ გახსნა - წმ."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:439
@@ -6509,7 +6851,7 @@ msgstr "_ჯგუფი:"
 #: ../calendar/gui/dialogs/memo-page.glade.h:3
 #, fuzzy
 msgid "_Memo Content:"
-msgstr "მოკ-შე"
+msgstr "შიგთავსი:"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -6529,7 +6871,7 @@ msgstr "კალენდარი ჯგუფი"
 #: ../calendar/gui/dialogs/new-calendar.glade.h:5
 #, fuzzy
 msgid "Calendar Location"
-msgstr "კალენდარი ადგილმდებარეობა"
+msgstr "კალენდარი მდებარეობა"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:6
 #, fuzzy
@@ -6539,38 +6881,42 @@ msgstr "კალენდარი სახელი"
 #: ../calendar/gui/dialogs/new-task-list.glade.h:2
 #, fuzzy
 msgid "<b>Task List Options</b>"
-msgstr "<b> სია ოფციები</b>"
+msgstr "<b> ამოცანა სია ოფციები</b>"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:3
 #, fuzzy
 msgid "Add New Task List"
-msgstr "დამატება ახალი სია"
+msgstr "დამატება ახალი ამოცანა სია"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:4
 #, fuzzy
 msgid "Task List Group"
-msgstr "სია ჯგუფი"
+msgstr "ამოცანა სია ჯგუფი"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:5
 #, fuzzy
 msgid "Task List Name"
-msgstr "სია სახელი"
+msgstr "ამოცანა სია სახელი"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
+#, fuzzy
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
+msgstr "თქვენ a მოვლენა -სკენ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
+#, fuzzy
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr ""
+msgstr "თქვენ a მოვლენა -სკენ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
+#, fuzzy
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr ""
+msgstr "თქვენ a დრო -სკენ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
+#, fuzzy
 msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
+msgstr "თქვენ a ელემენტი -სკენ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 #, fuzzy
@@ -6578,12 +6924,14 @@ msgid "This Instance Only"
 msgstr "Instance მხოლოდ"
 
 #: ../calendar/gui/dialogs/recur-comp.c:94
+#, fuzzy
 msgid "This and Prior Instances"
-msgstr ""
+msgstr "და წინა"
 
 #: ../calendar/gui/dialogs/recur-comp.c:100
+#, fuzzy
 msgid "This and Future Instances"
-msgstr ""
+msgstr "და მომავალი"
 
 #: ../calendar/gui/dialogs/recur-comp.c:105
 #, fuzzy
@@ -6591,35 +6939,48 @@ msgid "All Instances"
 msgstr "ყველა"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
+#, fuzzy
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
+msgstr "შეიცავს Evolution რედაქტირება."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 #, fuzzy
 msgid "Recurrence date is invalid"
-msgstr "თარიღი"
+msgstr "თარიღი მცდარი"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
 #: ../calendar/gui/dialogs/recurrence-page.c:928
+#, fuzzy
 msgid "on"
-msgstr ""
+msgstr "ჩართულია"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:992
+#, fuzzy
 msgid "first"
-msgstr ""
+msgstr "პირველი"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+msgid "second"
+msgstr "წამი"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1003
+#, fuzzy
 msgid "third"
-msgstr ""
+msgstr "მესამე"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
@@ -6648,24 +7009,27 @@ msgstr "სხვა თარიღი"
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
+#, fuzzy
 msgid "1st to 10th"
-msgstr ""
+msgstr "1 -სკენ 10"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1053
+#, fuzzy
 msgid "11th to 20th"
-msgstr ""
+msgstr "11 -სკენ 20"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1059
+#, fuzzy
 msgid "21st to 31st"
-msgstr ""
+msgstr "21 -სკენ 31"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "day"
@@ -6675,8 +7039,9 @@ msgstr "დღე"
 #. * (dropdown menu options are in [square brackets])."
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1219
+#, fuzzy
 msgid "on the"
-msgstr ""
+msgstr "ჩართულია"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1408
 msgid "occurrences"
@@ -6720,24 +7085,27 @@ msgstr ""
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:22
+#, fuzzy
 msgid "month(s)"
-msgstr ""
+msgstr "თვე"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:28
+#, fuzzy
 msgid "week(s)"
-msgstr ""
+msgstr "კვირები"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+#, fuzzy
 msgid "year(s)"
-msgstr ""
+msgstr "წელი"
 
 #: ../calendar/gui/dialogs/task-details-page.c:411
 #: ../calendar/gui/dialogs/task-details-page.c:431
 #, fuzzy
 msgid "Completed date is wrong"
-msgstr "შესრულებულია თარიღი"
+msgstr "დასრულებულია თარიღი"
 
 #: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
@@ -6818,7 +7186,7 @@ msgstr "დაუდგენელი"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #, fuzzy
 msgid "_Date completed:"
-msgstr "თარიღი:"
+msgstr "თარიღი დასრულებულია:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
 #: ../widgets/misc/e-send-options.glade.h:31
@@ -6831,24 +7199,24 @@ msgstr "_ვებ გვერდი:"
 
 #: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
-#, fuzzy
 msgid "_Task"
-msgstr "ამოცანა"
+msgstr "_ამოცანა"
 
 #: ../calendar/gui/dialogs/task-editor.c:430
 #, fuzzy
 msgid "Task Details"
-msgstr "დეტალები"
+msgstr "ამოცანა ცნობები"
 
 #: ../calendar/gui/dialogs/task-page.c:825
 #, fuzzy
 msgid "Due date is wrong"
-msgstr "თარიღი"
+msgstr "ვადა თარიღი"
 
 #: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
+#, fuzzy
 msgid "Unable to open tasks in '%s'."
-msgstr ""
+msgstr "-სკენ გახსნა ამოცანები - წმ."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 #, fuzzy
@@ -6866,14 +7234,13 @@ msgid "Sta_rt date:"
 msgstr "თარიღი:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
 msgid "Time zone:"
-msgstr "დრო:"
+msgstr "დროის სარტყელი:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "_Due date:"
-msgstr "თარიღი:"
+msgstr "ვადა თარიღი:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 #, fuzzy
@@ -6883,26 +7250,26 @@ msgstr "<b> თავისუფალი დაკავებული C</b>"
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 #, fuzzy
 msgid "<b>Publishing Frequency</b>"
-msgstr "<b> სიხშირე</b>"
+msgstr "<b> გამომცემლობა სიხშირე</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
 msgid "<b>Publishing _Location</b>"
-msgstr "<b> ადგილმდებარეობა</b>"
+msgstr "<b> გამომცემლობა მდებარეობა</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
 msgid "Free/Busy Publishing Settings"
-msgstr "თავისუფალი დაკავებული პარამეტრები"
+msgstr "თავისუფალი დაკავებული გამომცემლობა პარამეტრები"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#, fuzzy
 msgid "_Daily"
-msgstr ""
+msgstr "ყოველდღიურად"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#, fuzzy
 msgid "_Manual"
-msgstr "ხელით"
+msgstr "_მანუალური"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
@@ -6921,8 +7288,9 @@ msgid "_Username:"
 msgstr "_მომხმარებელი:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#, fuzzy
 msgid "_Weekly"
-msgstr ""
+msgstr "ყოველკვირეულად"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
@@ -6930,105 +7298,87 @@ msgstr ""
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d დღე"
-msgstr[1] ""
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:402
 #, c-format
+#, fuzzy
 msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] ""
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, fuzzy, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d საათი"
-msgstr[1] ""
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, fuzzy, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d წუთი"
-msgstr[1] ""
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, fuzzy, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d წამი"
-msgstr[1] ""
+msgstr "კვირა"
 
 #: ../calendar/gui/e-alarm-list.c:464
 #, fuzzy
 msgid "Unknown action to be performed"
-msgstr "უცნობი -სკენ"
+msgstr "უცნობი მოქმედება -სკენ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:478
 #, c-format
+#, fuzzy
 msgid "%s %s before the start of the appointment"
-msgstr ""
+msgstr "წმ წმ -"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:483
 #, c-format
+#, fuzzy
 msgid "%s %s after the start of the appointment"
-msgstr ""
+msgstr "წმ წმ -"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:490
 #, c-format
+#, fuzzy
 msgid "%s at the start of the appointment"
-msgstr ""
+msgstr "წმ ეთ -"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:501
 #, c-format
+#, fuzzy
 msgid "%s %s before the end of the appointment"
-msgstr ""
+msgstr "წმ წმ -"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:506
 #, c-format
+#, fuzzy
 msgid "%s %s after the end of the appointment"
-msgstr ""
+msgstr "წმ წმ -"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:513
 #, c-format
+#, fuzzy
 msgid "%s at the end of the appointment"
-msgstr ""
+msgstr "წმ ეთ -"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
 #: ../calendar/gui/e-alarm-list.c:537
 #, c-format
+#, fuzzy
 msgid "%s at %s"
-msgstr ""
+msgstr "წმ ეთ წმ"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
 #: ../calendar/gui/e-alarm-list.c:545
 #, fuzzy, c-format
 msgid "%s for an unknown trigger type"
-msgstr "უცნობი ტიპი"
+msgstr "წმ უცნობი"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, fuzzy, c-format
 msgid "Click to open %s"
-msgstr "-სკენ"
+msgstr "-სკენ გახსნა წმ"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:166
 msgid "Memo:"
@@ -7048,7 +7398,7 @@ msgstr "უსახელო"
 #: ../calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
-msgstr "ჯამური:"
+msgstr "რეზიუმე:"
 
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
@@ -7059,7 +7409,7 @@ msgstr "გაშვება თარიღი:"
 #: ../calendar/gui/e-cal-component-preview.c:217
 #, fuzzy
 msgid "Due Date:"
-msgstr "თარიღი:"
+msgstr "ვადა თარიღი:"
 
 #. write status
 #. Status
@@ -7082,7 +7432,6 @@ msgstr "საზოგადო"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:365
-#, fuzzy
 msgid "Private"
 msgstr "პრივატი"
 
@@ -7094,18 +7443,16 @@ msgstr "კონფიდენციალური"
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "End Date"
-msgstr "ბოლოში თარიღი"
+msgstr "დასასრულის თარიღი"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#, fuzzy
 msgid "Start Date"
-msgstr "გაშვება თარიღი"
+msgstr "გაშვების თარიღი"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
-#, fuzzy
 msgid "Summary"
 msgstr "ჯამური"
 
@@ -7126,7 +7473,7 @@ msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
-msgstr "n"
+msgstr "- არა"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
@@ -7145,7 +7492,7 @@ msgstr "არა"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
@@ -7164,45 +7511,45 @@ msgid "Recurring"
 msgstr ""
 
 #: ../calendar/gui/e-cal-model.c:922
+#, fuzzy
 msgid "Assigned"
-msgstr ""
+msgstr "მინიჭებული"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "შენახვა როგორც..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1913
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 #, fuzzy
 msgid "Select folder to save selected attachments..."
-msgstr "-სკენ."
+msgstr "ამორჩევა -სკენ შენახვა."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, fuzzy, c-format
 msgid "untitled_image.%s"
-msgstr "უსახელო "
+msgstr "უსახელო  ნახატი წმ"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
-#, fuzzy
 msgid "_Save As..."
-msgstr "შენახვა."
+msgstr "_შენახვა როგორც..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 #, fuzzy
 msgid "Set as _Background"
 msgstr "დააყენე როგორც ფონი"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 #, fuzzy
 msgid "_Save Selected"
-msgstr "შენახვა"
+msgstr "შენახვა მონიშნული"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, fuzzy, c-format
 msgid "Open in %s..."
-msgstr "გახსენი."
+msgstr "გახსნა - წმ."
 
 #: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
@@ -7286,7 +7633,7 @@ msgstr "_ბეჭდვა..."
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
-msgstr "C"
+msgstr "ამ_ოჭრა"
 
 #: ../calendar/gui/e-calendar-table.c:1183
 #: ../calendar/gui/e-calendar-view.c:1584
@@ -7300,37 +7647,40 @@ msgstr "_ჩასმა"
 #: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 #, fuzzy
 msgid "_Assign Task"
-msgstr "მიანიჭე"
+msgstr "მიანიჭე ამოცანა"
 
 #: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
+#, fuzzy
 msgid "_Forward as iCalendar"
-msgstr ""
+msgstr "წინ iCalendar"
 
 #: ../calendar/gui/e-calendar-table.c:1189
+#, fuzzy
 msgid "_Mark as Complete"
-msgstr ""
+msgstr "შესრულებულია"
 
 #: ../calendar/gui/e-calendar-table.c:1190
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
-msgstr "დავალებანი შესრულებულია"
+msgstr "მონიშნული ამოცანები შესრულებულია"
 
 #: ../calendar/gui/e-calendar-table.c:1195
 #, fuzzy
 msgid "_Delete Selected Tasks"
-msgstr "წაშლა დავალებანი"
+msgstr "წაშლა მონიშნული ამოცანები"
 
 #: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
 msgid "Click to add a task"
-msgstr "-სკენ a"
+msgstr "-სკენ დამატება a დრო"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
+#, fuzzy
 msgid "% Complete"
-msgstr ""
+msgstr "% დასრულდა"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
@@ -7339,7 +7689,7 @@ msgstr "შესრულებულია"
 #: ../calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
-msgstr "თარიღი"
+msgstr "დასრულება თარიღი"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
@@ -7373,22 +7723,22 @@ msgstr "ვაკოპირებ ელემენტებს"
 #: ../calendar/gui/e-calendar-view.c:1575
 #, fuzzy
 msgid "New _Appointment..."
-msgstr "ახალი."
+msgstr "ახალი შეხვედრა."
 
 #: ../calendar/gui/e-calendar-view.c:1576
 #, fuzzy
 msgid "New All Day _Event"
-msgstr "ახალი ყველა დღე შემთხვევა"
+msgstr "ახალი ყველა დღე მოვლენა"
 
 #: ../calendar/gui/e-calendar-view.c:1577
 #, fuzzy
 msgid "New _Meeting"
-msgstr "ახალი"
+msgstr "ახალი შეხვედრა"
 
 #: ../calendar/gui/e-calendar-view.c:1578
 #, fuzzy
 msgid "New _Task"
-msgstr "ახალი"
+msgstr "ახალი ამოცანა"
 
 #. FIXME: hook in this somehow
 #: ../calendar/gui/e-calendar-view.c:1588
@@ -7398,17 +7748,16 @@ msgstr "_ახლანდელი ხადი"
 #: ../calendar/gui/e-calendar-view.c:1590
 #, fuzzy
 msgid "Select T_oday"
-msgstr "დღეს"
+msgstr "ამორჩევა T"
 
 #: ../calendar/gui/e-calendar-view.c:1591
-#, fuzzy
 msgid "_Select Date..."
-msgstr "თარიღი."
+msgstr "_თარიღის ამორჩევა..."
 
 #: ../calendar/gui/e-calendar-view.c:1607
 #, fuzzy
 msgid "Cop_y to Calendar..."
-msgstr "-სკენ კალენდარი."
+msgstr "y -სკენ კალენდარი."
 
 #: ../calendar/gui/e-calendar-view.c:1608
 #, fuzzy
@@ -7416,22 +7765,23 @@ msgid "Mo_ve to Calendar..."
 msgstr "ორ -სკენ კალენდარი."
 
 #: ../calendar/gui/e-calendar-view.c:1609
+#, fuzzy
 msgid "_Delegate Meeting..."
-msgstr ""
+msgstr "შეხვედრა."
 
 #: ../calendar/gui/e-calendar-view.c:1610
+#, fuzzy
 msgid "_Schedule Meeting..."
-msgstr ""
+msgstr "დაგეგმვა შეხვედრა."
 
 #: ../calendar/gui/e-calendar-view.c:1611
 #, fuzzy
 msgid "_Forward as iCalendar..."
-msgstr "წინ."
+msgstr "წინ iCalendar."
 
 #: ../calendar/gui/e-calendar-view.c:1612
-#, fuzzy
 msgid "_Reply"
-msgstr "პასუხი"
+msgstr "_პასუხი"
 
 #: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
@@ -7442,7 +7792,7 @@ msgstr "პასუხი ყველ_ას"
 #: ../calendar/gui/e-calendar-view.c:1618
 #, fuzzy
 msgid "Make this Occurrence _Movable"
-msgstr "მოვლენა"
+msgstr "Make მოვლენა"
 
 #: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 #, fuzzy
@@ -7457,14 +7807,15 @@ msgstr "წაშლა ყველა"
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
+#, fuzzy
 msgid "Organizer: %s <%s>"
-msgstr ""
+msgstr "წმ წმ"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-view.c:2034
 #, fuzzy, c-format
 msgid "Organizer: %s"
-msgstr "C"
+msgstr "წმ"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
@@ -7494,7 +7845,7 @@ msgid ""
 "The date must be entered in the format: \n"
 "\n"
 "%s"
-msgstr "თარიღი n n"
+msgstr "თარიღი - არა არა წმ"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar day view, e.g.
@@ -7531,7 +7882,7 @@ msgstr "pm"
 #: ../calendar/gui/e-itip-control.c:759
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
-msgstr "კი"
+msgstr "დიახ"
 
 #: ../calendar/gui/e-itip-control.c:770
 #, c-format
@@ -7542,15 +7893,15 @@ msgstr[1] "ყოველი მე-%d-ე დღე"
 
 #: ../calendar/gui/e-itip-control.c:775
 #, c-format
+#, fuzzy
 msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] ""
+msgstr "კვირა"
 
 #: ../calendar/gui/e-itip-control.c:777
 #, c-format
+#, fuzzy
 msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] ""
+msgstr "კვირა ჩართულია "
 
 #: ../calendar/gui/e-itip-control.c:785
 msgid " and "
@@ -7559,39 +7910,41 @@ msgstr " და "
 #: ../calendar/gui/e-itip-control.c:792
 #, fuzzy, c-format
 msgid "The %s day of "
-msgstr "დღე "
+msgstr "წმ დღე - "
 
 #: ../calendar/gui/e-itip-control.c:805
 #, c-format
+#, fuzzy
 msgid "The %s %s of "
-msgstr ""
+msgstr "წმ წმ - "
 
 #: ../calendar/gui/e-itip-control.c:812
 #, c-format
+#, fuzzy
 msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] ""
+msgstr "თვე"
 
 #: ../calendar/gui/e-itip-control.c:816
 #, c-format
+#, fuzzy
 msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] ""
+msgstr "წელი"
 
 #: ../calendar/gui/e-itip-control.c:827
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
-msgstr[0] "a"
-msgstr[1] ""
+msgstr[0] "a -"
 
 #: ../calendar/gui/e-itip-control.c:836
+#, fuzzy
 msgid ", ending on "
-msgstr ""
+msgstr "ჩართულია "
 
 #: ../calendar/gui/e-itip-control.c:857
+#, fuzzy
 msgid "Starts"
-msgstr ""
+msgstr "იწყება"
 
 #: ../calendar/gui/e-itip-control.c:870
 msgid "Ends"
@@ -7599,18 +7952,20 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
+#, fuzzy
 msgid "Due"
-msgstr ""
+msgstr "ვადა"
 
 #: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 #, fuzzy
 msgid "iCalendar Information"
-msgstr "ინფორმაცია"
+msgstr "iCalendar ინფორმაცია"
 
 #. Title
 #: ../calendar/gui/e-itip-control.c:961
+#, fuzzy
 msgid "iCalendar Error"
-msgstr ""
+msgstr "iCalendar შეცდომა"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
@@ -7620,14 +7975,15 @@ msgstr ""
 #: ../plugins/itip-formatter/itip-view.c:407
 #, fuzzy
 msgid "An unknown person"
-msgstr "უცნობი"
+msgstr "უცნობი პირადი ფორმა"
 
 #. Describe what the user can do
 #: ../calendar/gui/e-itip-control.c:1084
+#, fuzzy
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr ""
+msgstr "<br> და მოქმედება მენიუ."
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
@@ -7651,109 +8007,116 @@ msgid "Declined"
 msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1224
+#, fuzzy
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
+msgstr "არა -"
 
 #: ../calendar/gui/e-itip-control.c:1226
+#, fuzzy
 msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr ""
+msgstr "დრო არა - დრო"
 
 #: ../calendar/gui/e-itip-control.c:1305
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published meeting information."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../calendar/gui/e-itip-control.c:1306
 #, fuzzy
 msgid "Meeting Information"
-msgstr "ინფორმაცია"
+msgstr "შეხვედრა ინფორმაცია"
 
 #: ../calendar/gui/e-itip-control.c:1312
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> - წმ ეთ a."
 
 #: ../calendar/gui/e-itip-control.c:1314
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> ეთ a."
 
 #: ../calendar/gui/e-itip-control.c:1315
+#, fuzzy
 msgid "Meeting Proposal"
-msgstr ""
+msgstr "შეხვედრა"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1321
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b></b> -სკენ -სკენ."
+msgstr "<b> წმ</b> -სკენ დამატება -სკენ."
 
 #: ../calendar/gui/e-itip-control.c:1322
 #, fuzzy
 msgid "Meeting Update"
-msgstr "განახლება"
+msgstr "შეხვედრა განახლება"
 
 #: ../calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b></b> -სკენ."
+msgstr "<b> წმ</b> -სკენ."
 
 #: ../calendar/gui/e-itip-control.c:1327
 #, fuzzy
 msgid "Meeting Update Request"
-msgstr "განახლება"
+msgstr "შეხვედრა განახლება"
 
 #: ../calendar/gui/e-itip-control.c:1334
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b></b> -სკენ a."
+msgstr "<b> წმ</b> -სკენ a."
 
 #: ../calendar/gui/e-itip-control.c:1335
+#, fuzzy
 msgid "Meeting Reply"
-msgstr ""
+msgstr "შეხვედრა პასუხი"
 
 #: ../calendar/gui/e-itip-control.c:1342
 #, fuzzy, c-format
 msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> a."
 
 #: ../calendar/gui/e-itip-control.c:1343
 #, fuzzy
 msgid "Meeting Cancelation"
-msgstr "ინფორმაცია"
+msgstr "შეხვედრა"
 
 #: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
 #: ../calendar/gui/e-itip-control.c:1470
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgstr "<b> წმ</b> გაგზავნილი."
 
 #: ../calendar/gui/e-itip-control.c:1354
 #, fuzzy
 msgid "Bad Meeting Message"
-msgstr "შეტყობინება"
+msgstr "შეხვედრა შეტყობინება"
 
 #: ../calendar/gui/e-itip-control.c:1381
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published task information."
-msgstr ""
+msgstr "<b> წმ</b> დრო."
 
 #: ../calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "Task Information"
-msgstr "ინფორმაცია"
+msgstr "ამოცანა ინფორმაცია"
 
 #: ../calendar/gui/e-itip-control.c:1389
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b></b> -სკენ a."
+msgstr "<b> წმ</b> წმ -სკენ a დრო."
 
 #: ../calendar/gui/e-itip-control.c:1391
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> a დრო."
 
 #: ../calendar/gui/e-itip-control.c:1392
 #, fuzzy
@@ -7764,37 +8127,37 @@ msgstr "ამოცანა"
 #: ../calendar/gui/e-itip-control.c:1398
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b></b> -სკენ -სკენ."
+msgstr "<b> წმ</b> -სკენ დამატება -სკენ დრო."
 
 #: ../calendar/gui/e-itip-control.c:1399
 #, fuzzy
 msgid "Task Update"
-msgstr "განახლება"
+msgstr "ამოცანა განახლება"
 
 #: ../calendar/gui/e-itip-control.c:1403
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b></b> -სკენ."
+msgstr "<b> წმ</b> -სკენ დრო."
 
 #: ../calendar/gui/e-itip-control.c:1404
 #, fuzzy
 msgid "Task Update Request"
-msgstr "განახლება"
+msgstr "ამოცანა განახლება"
 
 #: ../calendar/gui/e-itip-control.c:1411
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b></b> -სკენ a."
+msgstr "<b> წმ</b> -სკენ a დრო."
 
 #: ../calendar/gui/e-itip-control.c:1412
 #, fuzzy
 msgid "Task Reply"
-msgstr "პასუხი"
+msgstr "ამოცანა პასუხი"
 
 #: ../calendar/gui/e-itip-control.c:1419
 #, fuzzy, c-format
 msgid "<b>%s</b> has canceled a task."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> a დრო."
 
 #: ../calendar/gui/e-itip-control.c:1420
 #, fuzzy
@@ -7804,12 +8167,13 @@ msgstr "ამოცანა"
 #: ../calendar/gui/e-itip-control.c:1431
 #, fuzzy
 msgid "Bad Task Message"
-msgstr "შეტყობინება"
+msgstr "ამოცანა შეტყობინება"
 
 #: ../calendar/gui/e-itip-control.c:1455
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published free/busy information."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../calendar/gui/e-itip-control.c:1456
 #, fuzzy
@@ -7818,8 +8182,9 @@ msgstr "თავისუფალი დაკავებული ინფ�
 
 #: ../calendar/gui/e-itip-control.c:1460
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../calendar/gui/e-itip-control.c:1461
 #, fuzzy
@@ -7829,7 +8194,7 @@ msgstr "თავისუფალი დაკავებული"
 #: ../calendar/gui/e-itip-control.c:1465
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b></b> -სკენ a."
+msgstr "<b> წმ</b> -სკენ a."
 
 #: ../calendar/gui/e-itip-control.c:1466
 #, fuzzy
@@ -7844,67 +8209,70 @@ msgstr "თავისუფალი დაკავებული შეტ�
 #: ../calendar/gui/e-itip-control.c:1546
 #, fuzzy
 msgid "The message does not appear to be properly formed"
-msgstr "-სკენ"
+msgstr "არა -სკენ"
 
 #: ../calendar/gui/e-itip-control.c:1605
+#, fuzzy
 msgid "The message contains only unsupported requests."
-msgstr ""
+msgstr "შეიცავს."
 
 #: ../calendar/gui/e-itip-control.c:1638
 #, fuzzy
 msgid "The attachment does not contain a valid calendar message"
-msgstr "a"
+msgstr "არა შეიცავს a კალენდარი"
 
 #: ../calendar/gui/e-itip-control.c:1670
+#, fuzzy
 msgid "The attachment has no viewable calendar items"
-msgstr ""
+msgstr "არა კალენდარი"
 
 #: ../calendar/gui/e-itip-control.c:1904
 #, fuzzy
 msgid "Update complete\n"
-msgstr "განახლება n"
+msgstr "განახლება არა"
 
 #: ../calendar/gui/e-itip-control.c:1932
 #, fuzzy
 msgid "Object is invalid and cannot be updated\n"
-msgstr "და n"
+msgstr "ობიექტი მცდარი და არა"
 
 #: ../calendar/gui/e-itip-control.c:1942
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "a დამატება?"
+msgstr "არა a დამატება?"
 
 #: ../calendar/gui/e-itip-control.c:1954
 #, fuzzy
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "n"
+msgstr "არა - მცდარი არა"
 
 #: ../calendar/gui/e-itip-control.c:1971
 #, fuzzy
 msgid "Attendee status updated\n"
-msgstr "n"
+msgstr "არა"
 
 #: ../calendar/gui/e-itip-control.c:1974
 #: ../plugins/itip-formatter/itip-formatter.c:1029
 #, fuzzy
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "არა"
+msgstr "არა არა"
 
 #: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
+#, fuzzy
 msgid "Item sent!\n"
-msgstr ""
+msgstr "ელემენტი გაგზავნილი არა"
 
 #: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
+#, fuzzy
 msgid "The item could not be sent!\n"
-msgstr ""
+msgstr "არა გაგზავნილი არა"
 
 #: ../calendar/gui/e-itip-control.c:2130
 #, fuzzy
 msgid "Choose an action:"
-msgstr "არჩევა:"
+msgstr "მოქმედება:"
 
 #: ../calendar/gui/e-itip-control.c:2202
-#, fuzzy
 msgid "Update"
 msgstr "განახლება"
 
@@ -7914,13 +8282,15 @@ msgid "Accept"
 msgstr "მიიღე"
 
 #: ../calendar/gui/e-itip-control.c:2231
+#, fuzzy
 msgid "Tentatively accept"
-msgstr ""
+msgstr "მიღება"
 
 #: ../calendar/gui/e-itip-control.c:2232
 #: ../plugins/groupwise-features/process-meeting.c:50
+#, fuzzy
 msgid "Decline"
-msgstr ""
+msgstr "უარი"
 
 #: ../calendar/gui/e-itip-control.c:2261
 #, fuzzy
@@ -7935,7 +8305,7 @@ msgstr "განახლება"
 #: ../calendar/gui/e-itip-control.c:2317
 #, fuzzy
 msgid "Send Latest Information"
-msgstr "გაგზავნა ინფორმაცია"
+msgstr "გაგზავნა უახლესი ინფორმაცია"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
 #: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
@@ -7949,8 +8319,9 @@ msgid "%P %%"
 msgstr ""
 
 #: ../calendar/gui/e-itip-control.glade.h:3
+#, fuzzy
 msgid "--to--"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
@@ -7964,11 +8335,12 @@ msgstr "თარიღი:"
 #: ../calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
 msgid "Loading Calendar"
-msgstr "კალენდარი"
+msgstr "ჩატვირვა კალენდარი"
 
 #: ../calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
 msgid "Loading calendar..."
-msgstr ""
+msgstr "ჩატვირვა კალენდარი."
 
 #: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
@@ -7991,8 +8363,9 @@ msgstr "სკამი"
 
 #: ../calendar/gui/e-meeting-list-view.c:71
 #: ../calendar/gui/e-meeting-list-view.c:154
+#, fuzzy
 msgid "Required Participants"
-msgstr ""
+msgstr "აუცილებელია"
 
 #: ../calendar/gui/e-meeting-list-view.c:72
 #, fuzzy
@@ -8034,8 +8407,9 @@ msgstr "სკამი"
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/e-meeting-store.c:767
+#, fuzzy
 msgid "Required Participant"
-msgstr ""
+msgstr "აუცილებელია"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
@@ -8069,7 +8443,7 @@ msgid "Delegated"
 msgstr ""
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr ""
 
@@ -8096,13 +8470,14 @@ msgstr "%a·%m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:450
+#, fuzzy
 msgid "%m/%d/%Y"
-msgstr ""
+msgstr "Y"
 
 #: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 #, fuzzy
 msgid "Out of Office"
-msgstr "ოფისი"
+msgstr "- ოფისი"
 
 #: ../calendar/gui/e-meeting-time-sel.c:413
 #, fuzzy
@@ -8115,18 +8490,19 @@ msgid "A_ttendees..."
 msgstr "A."
 
 #: ../calendar/gui/e-meeting-time-sel.c:444
+#, fuzzy
 msgid "O_ptions"
-msgstr ""
+msgstr "O"
 
 #: ../calendar/gui/e-meeting-time-sel.c:461
 #, fuzzy
 msgid "Show _only working hours"
-msgstr "ანახე საათი"
+msgstr "ჩვენება საათი"
 
 #: ../calendar/gui/e-meeting-time-sel.c:471
 #, fuzzy
 msgid "Show _zoomed out"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../calendar/gui/e-meeting-time-sel.c:486
 #, fuzzy
@@ -8153,16 +8529,17 @@ msgstr "ყველა და"
 #: ../calendar/gui/e-meeting-time-sel.c:560
 #, fuzzy
 msgid "All _people and one resource"
-msgstr "ყველა და"
+msgstr "ყველა და რესურსი"
 
 #: ../calendar/gui/e-meeting-time-sel.c:569
+#, fuzzy
 msgid "_Required people"
-msgstr ""
+msgstr "აუცილებელია"
 
 #: ../calendar/gui/e-meeting-time-sel.c:578
 #, fuzzy
 msgid "Required people and _one resource"
-msgstr "და"
+msgstr "აუცილებელია და რესურსი"
 
 #: ../calendar/gui/e-meeting-time-sel.c:614
 #, fuzzy
@@ -8177,72 +8554,81 @@ msgstr "ბოლოში:"
 #: ../calendar/gui/e-memo-table.c:870
 #, fuzzy
 msgid "_Delete Selected Memos"
-msgstr "წაშლა"
+msgstr "წაშლა მონიშნული"
 
 #: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 #, fuzzy
 msgid "Click to add a memo"
-msgstr "-სკენ a"
+msgstr "-სკენ დამატება a"
 
 #: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Memo sort"
 msgstr ""
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
+#, fuzzy
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
+"შეცდომა ჩართულია წმ\n"
+" წმ"
 
 #: ../calendar/gui/e-memos.c:772
 #, fuzzy
 msgid "Loading memos"
-msgstr "გადატანის პროცესში"
+msgstr "ჩატვირვა"
 
 #: ../calendar/gui/e-memos.c:853
 #, fuzzy, c-format
 msgid "Opening memos at %s"
-msgstr "გახსნა %s"
+msgstr "ეთ წმ"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
+#, fuzzy
 msgid "Deleting selected objects..."
-msgstr ""
+msgstr "ვშლი."
 
 #: ../calendar/gui/e-pub-utils.c:322
 #, c-format
+#, fuzzy
 msgid "Enter the password for %s"
-msgstr ""
+msgstr "შეყვანა წმ"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
+#, fuzzy
 msgid "Loading tasks"
-msgstr ""
+msgstr "ჩატვირვა ამოცანები"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
+#, fuzzy
 msgid "Opening tasks at %s"
-msgstr ""
+msgstr "ამოცანები ეთ წმ"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
+#, fuzzy
 msgid "Completing tasks..."
-msgstr ""
+msgstr "ამოცანები."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr ""
 
 #: ../calendar/gui/e-timezone-entry.c:133
 #, fuzzy
 msgid "Select Timezone"
-msgstr "დროის ზონა"
+msgstr "ამორჩევა დროის ზონა"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
+#, fuzzy
 msgid "%d %B"
-msgstr ""
+msgstr "B"
 
 #: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
@@ -8251,12 +8637,12 @@ msgstr ""
 #: ../calendar/gui/gnome-cal.c:2234
 #, fuzzy
 msgid "_Custom View"
-msgstr "სხვა ხედი"
+msgstr "სხვა ჩვენება"
 
 #: ../calendar/gui/gnome-cal.c:2235
 #, fuzzy
 msgid "_Save Custom View"
-msgstr "შენახვა სხვა ხედი"
+msgstr "შენახვა სხვა ჩვენება"
 
 #: ../calendar/gui/gnome-cal.c:2240
 #, fuzzy
@@ -8265,13 +8651,15 @@ msgstr "ხედები."
 
 #: ../calendar/gui/gnome-cal.c:2402
 #, c-format
+#, fuzzy
 msgid "Loading appointments at %s"
-msgstr ""
+msgstr "ჩატვირვა ეთ წმ"
 
 #: ../calendar/gui/gnome-cal.c:2421
 #, c-format
+#, fuzzy
 msgid "Loading tasks at %s"
-msgstr ""
+msgstr "ჩატვირვა ამოცანები ეთ წმ"
 
 #: ../calendar/gui/gnome-cal.c:2525
 #, fuzzy, c-format
@@ -8327,9 +8715,8 @@ msgid "October"
 msgstr "ოქტომბერი"
 
 #: ../calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
 msgid "Select Date"
-msgstr "თარიღი"
+msgstr "თარიღის ამორჩევა"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
@@ -8338,7 +8725,7 @@ msgstr "სექტემბერი"
 #: ../calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
 msgid "_Select Today"
-msgstr "დღეს"
+msgstr "ამორჩევა დღეს"
 
 #: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
 #: ../calendar/gui/itip-utils.c:563
@@ -8352,7 +8739,7 @@ msgstr ""
 #: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
 #, fuzzy
 msgid "Event information"
-msgstr "შემთხვევა"
+msgstr "მოვლენა"
 
 #: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
 #, fuzzy
@@ -8378,9 +8765,8 @@ msgid "Updated"
 msgstr ""
 
 #: ../calendar/gui/itip-utils.c:696
-#, fuzzy
 msgid "Refresh"
-msgstr "განაახლე"
+msgstr "განახლება"
 
 #: ../calendar/gui/itip-utils.c:700
 msgid "Counter-proposal"
@@ -8389,15 +8775,17 @@ msgstr ""
 #: ../calendar/gui/itip-utils.c:772
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "თავისუფალი დაკავებული -სკენ"
+msgstr "თავისუფალი დაკავებული წმ -სკენ წმ"
 
 #: ../calendar/gui/itip-utils.c:782
+#, fuzzy
 msgid "iCalendar information"
-msgstr ""
+msgstr "iCalendar"
 
 #: ../calendar/gui/itip-utils.c:937
+#, fuzzy
 msgid "You must be an attendee of the event."
-msgstr ""
+msgstr "თქვენ - მოვლენა."
 
 #: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
 #: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
@@ -8427,28 +8815,27 @@ msgstr[1] "%d წუთი"
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ""
+msgstr ""
 
 #: ../calendar/gui/memos-component.c:575
 #, fuzzy
 msgid "Failed upgrading memos."
-msgstr "ოპერაცია ვერ/არ ჩატარდა."
+msgstr "ვერ განხორციელდა."
 
 #: ../calendar/gui/memos-component.c:871
 #, fuzzy, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "-სკენ და"
+msgstr "-სკენ გახსნა სია წმ და"
 
 #: ../calendar/gui/memos-component.c:884
 #, fuzzy
 msgid "There is no calendar available for creating memos"
-msgstr "არა"
+msgstr "არა კალენდარი"
 
 #: ../calendar/gui/memos-component.c:972
 #, fuzzy
 msgid "Memo Source Selector"
-msgstr "ამოცანა"
+msgstr "წყარო ამრჩევი"
 
 #: ../calendar/gui/memos-component.c:1155
 #, fuzzy
@@ -8456,19 +8843,18 @@ msgid "New memo"
 msgstr "ახალი"
 
 #: ../calendar/gui/memos-component.c:1156
-#, fuzzy
 msgid "_Memo"
 msgstr "_წაშლა"
 
 #: ../calendar/gui/memos-component.c:1157
 #, fuzzy
 msgid "Create a new memo"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი"
 
 #: ../calendar/gui/memos-component.c:1163
 #, fuzzy
 msgid "New memo list"
-msgstr "ახალი"
+msgstr "ახალი სია"
 
 #: ../calendar/gui/memos-component.c:1164
 #, fuzzy
@@ -8478,7 +8864,7 @@ msgstr "ამოცანა"
 #: ../calendar/gui/memos-component.c:1165
 #, fuzzy
 msgid "Create a new memo list"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი სია"
 
 #: ../calendar/gui/memos-control.c:340
 #, fuzzy
@@ -8486,12 +8872,13 @@ msgid "Print Memos"
 msgstr "ბეჭდვა"
 
 #: ../calendar/gui/migration.c:162
+#, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr ""
+msgstr "და - Evolution დრო Evolution x არა Evolution."
 
 #: ../calendar/gui/migration.c:166
 #, fuzzy
@@ -8500,154 +8887,182 @@ msgid ""
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "და Evolution Evolution n Evolution."
+msgstr "და - Evolution კალენდარი Evolution x არა Evolution."
 
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
+#, fuzzy
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
+msgstr "-სკენ"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:794
 #, c-format
+#, fuzzy
 msgid "Unable to migrate calendar `%s'"
-msgstr ""
+msgstr "-სკენ კალენდარი წმ"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:962
 #, c-format
+#, fuzzy
 msgid "Unable to migrate tasks `%s'"
-msgstr ""
-
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, fuzzy, c-format
-msgid "(%d seconds)"
-msgstr "წამი"
+msgstr "-სკენ ამოცანები წმ"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "1st"
-msgstr ""
+msgstr "1"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "2nd"
-msgstr ""
+msgstr "2"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "3rd"
-msgstr ""
+msgstr "3"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "4th"
-msgstr ""
+msgstr "4"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "5th"
-msgstr ""
+msgstr "5"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "6th"
-msgstr ""
+msgstr "6"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "7th"
-msgstr ""
+msgstr "7"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "8th"
-msgstr ""
+msgstr "8"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "9th"
-msgstr ""
+msgstr "9"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "10th"
-msgstr ""
+msgstr "10"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "11th"
-msgstr ""
+msgstr "11"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "12th"
-msgstr ""
+msgstr "12"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "13th"
-msgstr ""
+msgstr "13"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "14th"
-msgstr ""
+msgstr "14"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "15th"
-msgstr ""
+msgstr "15"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "16th"
-msgstr ""
+msgstr "16"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "17th"
-msgstr ""
+msgstr "17"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "18th"
-msgstr ""
+msgstr "18"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "19th"
-msgstr ""
+msgstr "19"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "20th"
-msgstr ""
+msgstr "20"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "21st"
-msgstr ""
+msgstr "21"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "22nd"
-msgstr ""
+msgstr "22"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "23rd"
-msgstr ""
+msgstr "23"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "24th"
-msgstr ""
+msgstr "24"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "25th"
-msgstr ""
+msgstr "25"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "26th"
-msgstr ""
+msgstr "26"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "27th"
-msgstr ""
+msgstr "27"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "28th"
-msgstr ""
+msgstr "28"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "29th"
-msgstr ""
+msgstr "29"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "30th"
-msgstr ""
+msgstr "30"
 
 #: ../calendar/gui/print.c:499
+#, fuzzy
 msgid "31st"
-msgstr ""
+msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
 #: ../calendar/gui/print.c:574
@@ -8682,7 +9097,7 @@ msgstr "შა"
 #: ../calendar/gui/print.c:1923
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
-msgstr "დღე a"
+msgstr "მონიშნული დღე a Y"
 
 #: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
@@ -8700,33 +9115,33 @@ msgstr "%a %b %d %Y"
 #: ../calendar/gui/print.c:1960
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
-msgstr "მონიშნულია"
+msgstr "მონიშნული კვირა წმ წმ"
 
 #. Month
 #: ../calendar/gui/print.c:1968
 #, fuzzy
 msgid "Selected month (%b %Y)"
-msgstr "მონიშნულია"
+msgstr "მონიშნული თვე Y"
 
 #. Year
 #: ../calendar/gui/print.c:1975
 #, fuzzy
 msgid "Selected year (%Y)"
-msgstr "მონიშნულია"
+msgstr "მონიშნული წელი Y"
 
 #: ../calendar/gui/print.c:2304
+#, fuzzy
 msgid "Appointment"
-msgstr ""
+msgstr "შეხვედრა"
 
 #: ../calendar/gui/print.c:2306
-#, fuzzy
 msgid "Task"
 msgstr "ამოცანა"
 
 #: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
+#, c-format
 msgid "Summary: %s"
-msgstr "ჯამური"
+msgstr "ჯამური: %s"
 
 #: ../calendar/gui/print.c:2379
 #, c-format
@@ -8754,8 +9169,9 @@ msgid "Categories: %s"
 msgstr "კატეგორიები: %s"
 
 #: ../calendar/gui/print.c:2445
+#, fuzzy
 msgid "Contacts: "
-msgstr ""
+msgstr "მეგობრები "
 
 #: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
 #: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
@@ -8766,53 +9182,53 @@ msgstr "ბეჭდვა წინასწარ ნახვა"
 #: ../calendar/gui/print.c:2620
 #, fuzzy
 msgid "Print Item"
-msgstr "ბეჭდვა"
+msgstr "ბეჭდვა ელემენტი"
 
 #: ../calendar/gui/tasks-component.c:441
 #, fuzzy
 msgid "_New Task List"
-msgstr "ახალი სია"
+msgstr "ახალი ამოცანა სია"
 
 #: ../calendar/gui/tasks-component.c:517
 #, c-format
+#, fuzzy
 msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] ""
+msgstr "დრო"
 
 #: ../calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "Failed upgrading tasks."
-msgstr "ოპერაცია ვერ/არ ჩატარდა."
+msgstr "ვერ განხორციელდა ამოცანები."
 
 #: ../calendar/gui/tasks-component.c:877
 #, fuzzy, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "-სკენ და"
+msgstr "-სკენ გახსნა დრო სია წმ და"
 
 #: ../calendar/gui/tasks-component.c:890
 #, fuzzy
 msgid "There is no calendar available for creating tasks"
-msgstr "არა"
+msgstr "არა კალენდარი ამოცანები"
 
 #: ../calendar/gui/tasks-component.c:987
 #, fuzzy
 msgid "Task Source Selector"
-msgstr "ამოცანა"
+msgstr "ამოცანა წყარო ამრჩევი"
 
 #: ../calendar/gui/tasks-component.c:1170
 #, fuzzy
 msgid "New task"
-msgstr "ახალი"
+msgstr "ახალი დრო"
 
 #: ../calendar/gui/tasks-component.c:1172
 #, fuzzy
 msgid "Create a new task"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი დრო"
 
 #: ../calendar/gui/tasks-component.c:1178
 #, fuzzy
 msgid "New assigned task"
-msgstr "ახალი"
+msgstr "ახალი დრო"
 
 #: ../calendar/gui/tasks-component.c:1179
 #, fuzzy
@@ -8822,34 +9238,35 @@ msgstr "ამოცანა"
 #: ../calendar/gui/tasks-component.c:1180
 #, fuzzy
 msgid "Create a new assigned task"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი დრო"
 
 #: ../calendar/gui/tasks-component.c:1186
 #, fuzzy
 msgid "New task list"
-msgstr "ახალი"
+msgstr "ახალი დრო სია"
 
 #: ../calendar/gui/tasks-component.c:1187
-#, fuzzy
 msgid "Task l_ist"
-msgstr "ამოცანა"
+msgstr "ამოცანათა ს_ია"
 
 #: ../calendar/gui/tasks-component.c:1188
 #, fuzzy
 msgid "Create a new task list"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი დრო სია"
 
 #: ../calendar/gui/tasks-control.c:438
+#, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
-msgstr ""
+msgstr "ყველა ამოცანები დასრულებულია არა -სკენ ამოცანები არა ამოცანები?"
 
 #: ../calendar/gui/tasks-control.c:441
+#, fuzzy
 msgid "Do not ask me again."
-msgstr ""
+msgstr "არა."
 
 #: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
@@ -8867,12 +9284,14 @@ msgstr "შეხვედრები და"
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
+#, fuzzy
 msgid "Opening calendar"
-msgstr ""
+msgstr "კალენდარი"
 
 #: ../calendar/importers/icalendar-importer.c:444
+#, fuzzy
 msgid "iCalendar files (.ics)"
-msgstr ""
+msgstr "iCalendar ფაილი"
 
 #: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
@@ -8881,11 +9300,12 @@ msgstr "ევოლუშენ iCalendar იმპორტერი"
 #: ../calendar/importers/icalendar-importer.c:521
 #, fuzzy
 msgid "Reminder!"
-msgstr "შენიშვნები"
+msgstr "შემხსენებელი!"
 
 #: ../calendar/importers/icalendar-importer.c:573
+#, fuzzy
 msgid "vCalendar files (.vcf)"
-msgstr ""
+msgstr "vCalendar ფაილი"
 
 #: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
@@ -8894,7 +9314,7 @@ msgstr "ევოლუშენ vCalendar იმპორტერი"
 #: ../calendar/importers/icalendar-importer.c:736
 #, fuzzy
 msgid "Calendar Events"
-msgstr "კალენდარი"
+msgstr "კალენდარი მოვლენები"
 
 #: ../calendar/importers/icalendar-importer.c:773
 #, fuzzy
@@ -8907,7 +9327,6 @@ msgstr "Evolution კალენდარი"
 #. * Don't include in any C files.
 #.
 #: ../calendar/zones.h:7
-#, fuzzy
 msgid "Africa/Abidjan"
 msgstr "აფრიკა/აბიჯანი"
 
@@ -8916,7 +9335,6 @@ msgid "Africa/Accra"
 msgstr "აფრიკა/აკრა"
 
 #: ../calendar/zones.h:9
-#, fuzzy
 msgid "Africa/Addis_Ababa"
 msgstr "აფრიკა/ადის-აბება"
 
@@ -8933,7 +9351,6 @@ msgid "Africa/Bamako"
 msgstr "აფრიკა/ბამაკო"
 
 #: ../calendar/zones.h:13
-#, fuzzy
 msgid "Africa/Bangui"
 msgstr "აფრიკა/ბანგი"
 
@@ -8946,7 +9363,6 @@ msgid "Africa/Bissau"
 msgstr "აფრიკა/ბისაუ"
 
 #: ../calendar/zones.h:16
-#, fuzzy
 msgid "Africa/Blantyre"
 msgstr "აფრიკა/ბლანტირი"
 
@@ -8979,7 +9395,6 @@ msgid "Africa/Dakar"
 msgstr "აფრიკა/დაკარი"
 
 #: ../calendar/zones.h:24
-#, fuzzy
 msgid "Africa/Dar_es_Salaam"
 msgstr "აფრიკა/დარ_ეს_სალამი"
 
@@ -8992,7 +9407,6 @@ msgid "Africa/Douala"
 msgstr "აფრიკა/დუალა"
 
 #: ../calendar/zones.h:27
-#, fuzzy
 msgid "Africa/El_Aaiun"
 msgstr "აფრიკა/ელ_აიუნი"
 
@@ -9009,17 +9423,14 @@ msgid "Africa/Harare"
 msgstr "აფრიკა/ჰარარე"
 
 #: ../calendar/zones.h:31
-#, fuzzy
 msgid "Africa/Johannesburg"
 msgstr "აფრიკა/იოჰანესბურგი"
 
 #: ../calendar/zones.h:32
-#, fuzzy
 msgid "Africa/Kampala"
-msgstr "აფრიკა/კამპარა"
+msgstr "აფრიკა/კამპალა"
 
 #: ../calendar/zones.h:33
-#, fuzzy
 msgid "Africa/Khartoum"
 msgstr "აფრიკა/ხართუმი"
 
@@ -9028,7 +9439,6 @@ msgid "Africa/Kigali"
 msgstr "აფრიკა/კიგალი"
 
 #: ../calendar/zones.h:35
-#, fuzzy
 msgid "Africa/Kinshasa"
 msgstr "აფრიკა/კინშასა"
 
@@ -9037,7 +9447,6 @@ msgid "Africa/Lagos"
 msgstr "აფრიკა/ლაგოსი"
 
 #: ../calendar/zones.h:37
-#, fuzzy
 msgid "Africa/Libreville"
 msgstr "აფრიკა/ლიბრევილი"
 
@@ -9050,7 +9459,6 @@ msgid "Africa/Luanda"
 msgstr "აფრიკა/ლუანდა"
 
 #: ../calendar/zones.h:40
-#, fuzzy
 msgid "Africa/Lubumbashi"
 msgstr "აფრიკა/ლუბუმბაში"
 
@@ -9071,17 +9479,14 @@ msgid "Africa/Maseru"
 msgstr "აფრიკა/მასერუ"
 
 #: ../calendar/zones.h:45
-#, fuzzy
 msgid "Africa/Mbabane"
 msgstr "აფრიკა/მაბაბანე"
 
 #: ../calendar/zones.h:46
-#, fuzzy
 msgid "Africa/Mogadishu"
 msgstr "აფრიკა/მოდადიშუ"
 
 #: ../calendar/zones.h:47
-#, fuzzy
 msgid "Africa/Monrovia"
 msgstr "აფრიკა/მონროვია"
 
@@ -9090,22 +9495,18 @@ msgid "Africa/Nairobi"
 msgstr "აფრიკა/ნაირობი"
 
 #: ../calendar/zones.h:49
-#, fuzzy
 msgid "Africa/Ndjamena"
-msgstr "აფრიკა/ნჯამენა"
+msgstr "აფრიკა/ნჯამენი"
 
 #: ../calendar/zones.h:50
-#, fuzzy
 msgid "Africa/Niamey"
 msgstr "აფრიკა/ნიამეი"
 
 #: ../calendar/zones.h:51
-#, fuzzy
 msgid "Africa/Nouakchott"
 msgstr "აფრიკა/ნოუაკჩთი"
 
 #: ../calendar/zones.h:52
-#, fuzzy
 msgid "Africa/Ouagadougou"
 msgstr "აფრიკა/ოუაგადოუგოუ"
 
@@ -9114,12 +9515,10 @@ msgid "Africa/Porto-Novo"
 msgstr "აფრიკა/პოტო-ნოვო"
 
 #: ../calendar/zones.h:54
-#, fuzzy
 msgid "Africa/Sao_Tome"
 msgstr "აფრიკა/საო-თომე"
 
 #: ../calendar/zones.h:55
-#, fuzzy
 msgid "Africa/Timbuktu"
 msgstr "აფრიკა/ტიმბუქტუ"
 
@@ -9132,7 +9531,6 @@ msgid "Africa/Tunis"
 msgstr "აფრიკა/ტუნისი"
 
 #: ../calendar/zones.h:58
-#, fuzzy
 msgid "Africa/Windhoek"
 msgstr "აფრიკა/ვინდუკი"
 
@@ -9141,22 +9539,18 @@ msgid "America/Adak"
 msgstr "ამერიკა/ადაკი"
 
 #: ../calendar/zones.h:60
-#, fuzzy
 msgid "America/Anchorage"
 msgstr "ამერიკა/ანკორიჯი"
 
 #: ../calendar/zones.h:61
-#, fuzzy
 msgid "America/Anguilla"
 msgstr "ამერიკა/ანგილა"
 
 #: ../calendar/zones.h:62
-#, fuzzy
 msgid "America/Antigua"
 msgstr "ამერიკა/ანტიგა"
 
 #: ../calendar/zones.h:63
-#, fuzzy
 msgid "America/Araguaina"
 msgstr "ამერიკა/არაგვიანა"
 
@@ -9165,7 +9559,6 @@ msgid "America/Aruba"
 msgstr "ამერიკა/არუბა"
 
 #: ../calendar/zones.h:65
-#, fuzzy
 msgid "America/Asuncion"
 msgstr "ამერიკა/ასუნსიონი"
 
@@ -9182,7 +9575,6 @@ msgid "America/Belize"
 msgstr "ამერიკა/ბელიზი"
 
 #: ../calendar/zones.h:69
-#, fuzzy
 msgid "America/Boa_Vista"
 msgstr "ამერიკა/ბოა_ვიშტა"
 
@@ -9191,12 +9583,10 @@ msgid "America/Bogota"
 msgstr "ამერიკა/ბოგოტა"
 
 #: ../calendar/zones.h:71
-#, fuzzy
 msgid "America/Boise"
 msgstr "ამერიკა/ბოისე"
 
 #: ../calendar/zones.h:72
-#, fuzzy
 msgid "America/Buenos_Aires"
 msgstr "ამერიკა/ბუენოს_აირესი"
 
@@ -9205,7 +9595,6 @@ msgid "America/Cambridge_Bay"
 msgstr "ამერიკა/კემბრიჯ-ბეი"
 
 #: ../calendar/zones.h:74
-#, fuzzy
 msgid "America/Cancun"
 msgstr "ამერიკა/კანკუნი"
 
@@ -9214,17 +9603,14 @@ msgid "America/Caracas"
 msgstr "ამერიკა/კარაკასი"
 
 #: ../calendar/zones.h:76
-#, fuzzy
 msgid "America/Catamarca"
 msgstr "ამერიკა/კატამარკა"
 
 #: ../calendar/zones.h:77
-#, fuzzy
 msgid "America/Cayenne"
 msgstr "ამერიკა/კეიენი"
 
 #: ../calendar/zones.h:78
-#, fuzzy
 msgid "America/Cayman"
 msgstr "ამერიკა/კაიმანი"
 
@@ -9233,12 +9619,10 @@ msgid "America/Chicago"
 msgstr "ამერიკა/ჩიკაგო"
 
 #: ../calendar/zones.h:80
-#, fuzzy
 msgid "America/Chihuahua"
 msgstr "ამერიკა/ჩიხუახუა"
 
 #: ../calendar/zones.h:81
-#, fuzzy
 msgid "America/Cordoba"
 msgstr "ამერიკა/კორდობა"
 
@@ -9247,27 +9631,22 @@ msgid "America/Costa_Rica"
 msgstr "ამერიკა/კოსტა_რიკა"
 
 #: ../calendar/zones.h:83
-#, fuzzy
 msgid "America/Cuiaba"
 msgstr "ამერიკა/კუიაბა"
 
 #: ../calendar/zones.h:84
-#, fuzzy
 msgid "America/Curacao"
 msgstr "ამერიკა/კიურასაო"
 
 #: ../calendar/zones.h:85
-#, fuzzy
 msgid "America/Danmarkshavn"
 msgstr "ამერიკა/დენმარკშავნი"
 
 #: ../calendar/zones.h:86
-#, fuzzy
 msgid "America/Dawson"
 msgstr "ამერიკა/დოუსონი"
 
 #: ../calendar/zones.h:87
-#, fuzzy
 msgid "America/Dawson_Creek"
 msgstr "ამერიკა/დოუსონ_კრიკი"
 
@@ -9280,47 +9659,38 @@ msgid "America/Detroit"
 msgstr "ამერიკა/დეტროიტი"
 
 #: ../calendar/zones.h:90
-#, fuzzy
 msgid "America/Dominica"
 msgstr "ამერიკა/დომინიკა"
 
 #: ../calendar/zones.h:91
-#, fuzzy
 msgid "America/Edmonton"
 msgstr "ამერიკა/ედმონტონი"
 
 #: ../calendar/zones.h:92
-#, fuzzy
 msgid "America/Eirunepe"
 msgstr "ამერიკა/ეირუნეპა"
 
 #: ../calendar/zones.h:93
-#, fuzzy
 msgid "America/El_Salvador"
 msgstr "ამერიკა/ელ_სალვადორი"
 
 #: ../calendar/zones.h:94
-#, fuzzy
 msgid "America/Fortaleza"
 msgstr "ამერიკა/ფორტალეზა"
 
 #: ../calendar/zones.h:95
-#, fuzzy
 msgid "America/Glace_Bay"
 msgstr "ამერიკა/გლას_ბეი"
 
 #: ../calendar/zones.h:96
-#, fuzzy
 msgid "America/Godthab"
 msgstr "ამერიკა/გოდსაბი"
 
 #: ../calendar/zones.h:97
-#, fuzzy
 msgid "America/Goose_Bay"
 msgstr "ამერიკა/გოს_-ბაი"
 
 #: ../calendar/zones.h:98
-#, fuzzy
 msgid "America/Grand_Turk"
 msgstr "ამერიკა/გრანდ-ტურკი"
 
@@ -9337,17 +9707,14 @@ msgid "America/Guatemala"
 msgstr "ამერიკა/გვატემალა"
 
 #: ../calendar/zones.h:102
-#, fuzzy
 msgid "America/Guayaquil"
 msgstr "ამერიკა/გუაიაკილი"
 
 #: ../calendar/zones.h:103
-#, fuzzy
 msgid "America/Guyana"
 msgstr "ამერიკა/გუიანა"
 
 #: ../calendar/zones.h:104
-#, fuzzy
 msgid "America/Halifax"
 msgstr "ამერიკა/ჰალიფაქსი"
 
@@ -9356,7 +9723,6 @@ msgid "America/Havana"
 msgstr "ამერიკა/ჰავანა"
 
 #: ../calendar/zones.h:106
-#, fuzzy
 msgid "America/Hermosillo"
 msgstr "ამერიკა/ჰერმოსილო"
 
@@ -9365,17 +9731,14 @@ msgid "America/Indiana/Indianapolis"
 msgstr "ამერიკა/ინდიანა/ინდიანაპოლისი"
 
 #: ../calendar/zones.h:108
-#, fuzzy
 msgid "America/Indiana/Knox"
 msgstr "ამერიკა/ინდიანა/ნოკსი"
 
 #: ../calendar/zones.h:109
-#, fuzzy
 msgid "America/Indiana/Marengo"
 msgstr "ამერიკა/ინდიანა/მარენგო"
 
 #: ../calendar/zones.h:110
-#, fuzzy
 msgid "America/Indiana/Vevay"
 msgstr "ამერიკა/ინდიანა/ვევაი"
 
@@ -9384,42 +9747,34 @@ msgid "America/Indianapolis"
 msgstr "ამერიკა/ინდიანაპოლისი"
 
 #: ../calendar/zones.h:112
-#, fuzzy
 msgid "America/Inuvik"
 msgstr "ამერიკა/ინუიკი"
 
 #: ../calendar/zones.h:113
-#, fuzzy
 msgid "America/Iqaluit"
 msgstr "ამერიკა/იქალუიტი"
 
 #: ../calendar/zones.h:114
-#, fuzzy
 msgid "America/Jamaica"
 msgstr "ამერიკა/იამაიკა"
 
 #: ../calendar/zones.h:115
-#, fuzzy
 msgid "America/Jujuy"
 msgstr "ამერიკა/იუიუი"
 
 #: ../calendar/zones.h:116
-#, fuzzy
 msgid "America/Juneau"
 msgstr "ამერიკა/იუნო"
 
 #: ../calendar/zones.h:117
-#, fuzzy
 msgid "America/Kentucky/Louisville"
 msgstr "ამერიკა/კენტუკი/ლუიზვილი"
 
 #: ../calendar/zones.h:118
-#, fuzzy
 msgid "America/Kentucky/Monticello"
 msgstr "ამერიკა/კენტუკი/მონტიჩელო"
 
 #: ../calendar/zones.h:119
-#, fuzzy
 msgid "America/La_Paz"
 msgstr "ამერიკა/ლა-პაზი"
 
@@ -9428,72 +9783,58 @@ msgid "America/Lima"
 msgstr "ამერიკა/ლიმა"
 
 #: ../calendar/zones.h:121
-#, fuzzy
 msgid "America/Los_Angeles"
 msgstr "ამერიკა/ლოს_ანჯელესი"
 
 #: ../calendar/zones.h:122
-#, fuzzy
 msgid "America/Louisville"
 msgstr "ამერიკა/ლუიზვიილ"
 
 #: ../calendar/zones.h:123
-#, fuzzy
 msgid "America/Maceio"
 msgstr "ამერიკა/მასეიო"
 
 #: ../calendar/zones.h:124
-#, fuzzy
 msgid "America/Managua"
 msgstr "ამერიკა/მანაგუა"
 
 #: ../calendar/zones.h:125
-#, fuzzy
 msgid "America/Manaus"
 msgstr "ამერიკა/მანაუსი"
 
 #: ../calendar/zones.h:126
-#, fuzzy
 msgid "America/Martinique"
 msgstr "ამერიკა/მარტინიკე"
 
 #: ../calendar/zones.h:127
-#, fuzzy
 msgid "America/Mazatlan"
 msgstr "ამერიკა/მაზატლანი"
 
 #: ../calendar/zones.h:128
-#, fuzzy
 msgid "America/Mendoza"
 msgstr "ამერიკა/მენდოზა"
 
 #: ../calendar/zones.h:129
-#, fuzzy
 msgid "America/Menominee"
 msgstr "ამერიკა/მენომინე"
 
 #: ../calendar/zones.h:130
-#, fuzzy
 msgid "America/Merida"
 msgstr "ამერიკა/მერიდა"
 
 #: ../calendar/zones.h:131
-#, fuzzy
 msgid "America/Mexico_City"
-msgstr "ამერიკა/მეხიკო"
+msgstr "ამერიკა/მეხიკო _სითი"
 
 #: ../calendar/zones.h:132
-#, fuzzy
 msgid "America/Miquelon"
 msgstr "ამერიკა/მიქელონი"
 
 #: ../calendar/zones.h:133
-#, fuzzy
 msgid "America/Monterrey"
 msgstr "ამერიკა/მონტერეი"
 
 #: ../calendar/zones.h:134
-#, fuzzy
 msgid "America/Montevideo"
 msgstr "ამერიკა/მონტევიდეო"
 
@@ -9502,12 +9843,10 @@ msgid "America/Montreal"
 msgstr "ამერიკა/მონრეალი"
 
 #: ../calendar/zones.h:136
-#, fuzzy
 msgid "America/Montserrat"
 msgstr "ამერიკა/მონტსერატი"
 
 #: ../calendar/zones.h:137
-#, fuzzy
 msgid "America/Nassau"
 msgstr "ამერიკა/ნასაუ"
 
@@ -9517,7 +9856,6 @@ msgid "America/New_York"
 msgstr "ამერიკა/ნიუ_იორკი"
 
 #: ../calendar/zones.h:139
-#, fuzzy
 msgid "America/Nipigon"
 msgstr "ამერიკა/ნიპიგონი"
 
@@ -9526,12 +9864,10 @@ msgid "America/Nome"
 msgstr "ამერიკა/ნომე"
 
 #: ../calendar/zones.h:141
-#, fuzzy
 msgid "America/Noronha"
 msgstr "ამერიკა/ნორონჰა"
 
 #: ../calendar/zones.h:142
-#, fuzzy
 msgid "America/North_Dakota/Center"
 msgstr "ამერიკა/ჩრდ_დაკოტა/ცენტრი"
 
@@ -9540,127 +9876,102 @@ msgid "America/Panama"
 msgstr "ამერიკა/პანამა"
 
 #: ../calendar/zones.h:144
-#, fuzzy
 msgid "America/Pangnirtung"
 msgstr "ამერიკა/პანგრინტუნი"
 
 #: ../calendar/zones.h:145
-#, fuzzy
 msgid "America/Paramaribo"
 msgstr "ამერიკა/პარამარიბო"
 
 #: ../calendar/zones.h:146
-#, fuzzy
 msgid "America/Phoenix"
 msgstr "ამერიკა/ფენიქსი"
 
 #: ../calendar/zones.h:147
-#, fuzzy
 msgid "America/Port-au-Prince"
 msgstr "ამერიკა/პორტ-ო-პრინსი"
 
 #: ../calendar/zones.h:148
-#, fuzzy
 msgid "America/Port_of_Spain"
 msgstr "ამერიკა/სპეინ_პორტი"
 
 #: ../calendar/zones.h:149
-#, fuzzy
 msgid "America/Porto_Velho"
 msgstr "ამერიკა/პორტო_ველჰო"
 
 #: ../calendar/zones.h:150
-#, fuzzy
 msgid "America/Puerto_Rico"
 msgstr "ამერიკა/პუერტო_რიკო"
 
 #: ../calendar/zones.h:151
-#, fuzzy
 msgid "America/Rainy_River"
 msgstr "ამერიკა/რეინი_რივერი"
 
 #: ../calendar/zones.h:152
-#, fuzzy
 msgid "America/Rankin_Inlet"
 msgstr "ამერიკა/რანკინ_ინლეტი"
 
 #: ../calendar/zones.h:153
-#, fuzzy
 msgid "America/Recife"
 msgstr "ამერიკა/რესიფე"
 
 #: ../calendar/zones.h:154
-#, fuzzy
 msgid "America/Regina"
 msgstr "ამერიკა/რეჯინა"
 
 #: ../calendar/zones.h:155
-#, fuzzy
 msgid "America/Rio_Branco"
 msgstr "ამერიკა/რიო_ბრანკო"
 
 #: ../calendar/zones.h:156
-#, fuzzy
 msgid "America/Rosario"
 msgstr "ამერიკა/როსარიო"
 
 #: ../calendar/zones.h:157
-#, fuzzy
 msgid "America/Santiago"
 msgstr "ამერიკა/სანტიაგო"
 
 #: ../calendar/zones.h:158
-#, fuzzy
 msgid "America/Santo_Domingo"
 msgstr "ამერიკა/სანტო_დომინგო"
 
 #: ../calendar/zones.h:159
-#, fuzzy
 msgid "America/Sao_Paulo"
 msgstr "ამერიკა/სანპაულო"
 
 #: ../calendar/zones.h:160
-#, fuzzy
 msgid "America/Scoresbysund"
 msgstr "ამერიკა/სკორესბისუნდი"
 
 #: ../calendar/zones.h:161
-#, fuzzy
 msgid "America/Shiprock"
 msgstr "ამერიკა/სიპროკი"
 
 #: ../calendar/zones.h:162
-#, fuzzy
 msgid "America/St_Johns"
 msgstr "ამერიკა/სენტ_ჯონსი"
 
 #: ../calendar/zones.h:163
-#, fuzzy
 msgid "America/St_Kitts"
 msgstr "ამერიკა/სენტ_კიდსი"
 
 #: ../calendar/zones.h:164
-#, fuzzy
 msgid "America/St_Lucia"
 msgstr "ამერიკა/სენტ_ლუისი"
 
 #: ../calendar/zones.h:165
-#, fuzzy
 msgid "America/St_Thomas"
 msgstr "ამერიკა/სენტ_ტომასი"
 
 #: ../calendar/zones.h:166
-#, fuzzy
 msgid "America/St_Vincent"
-msgstr "ამერიკა/სენტ_ვისენტი"
+msgstr "ამერიკა/სენტ_ვინსენტი"
 
 #: ../calendar/zones.h:167
-#, fuzzy
 msgid "America/Swift_Current"
 msgstr "ამერიკა/სვიფტ_ქარენთი"
 
 #: ../calendar/zones.h:168
-#, fuzzy
 msgid "America/Tegucigalpa"
 msgstr "ამერიკა/ტეგუსიგალპა"
 
@@ -9669,47 +9980,38 @@ msgid "America/Thule"
 msgstr "ამერიკა/ტულე"
 
 #: ../calendar/zones.h:170
-#, fuzzy
 msgid "America/Thunder_Bay"
 msgstr "ამერიკა/სანდერ_ბეი"
 
 #: ../calendar/zones.h:171
-#, fuzzy
 msgid "America/Tijuana"
 msgstr "ამერიკა/ტიხუანა"
 
 #: ../calendar/zones.h:172
-#, fuzzy
 msgid "America/Tortola"
 msgstr "ამერიკა/ტორტოლა"
 
 #: ../calendar/zones.h:173
-#, fuzzy
 msgid "America/Vancouver"
 msgstr "ამერიკა/ვანკუვერი"
 
 #: ../calendar/zones.h:174
-#, fuzzy
 msgid "America/Whitehorse"
 msgstr "ამერიკა/ვიტჰორს"
 
 #: ../calendar/zones.h:175
-#, fuzzy
 msgid "America/Winnipeg"
 msgstr "ამერიკა/ვინიპეგი"
 
 #: ../calendar/zones.h:176
-#, fuzzy
 msgid "America/Yakutat"
 msgstr "ამერიკა/იაკუტა"
 
 #: ../calendar/zones.h:177
-#, fuzzy
 msgid "America/Yellowknife"
-msgstr "ამერიკა/იელოკნფტი"
+msgstr "ამერიკა/იელოუნაიფი"
 
 #: ../calendar/zones.h:178
-#, fuzzy
 msgid "Antarctica/Casey"
 msgstr "ანტარქტიდა/კეისი"
 
@@ -9718,42 +10020,34 @@ msgid "Antarctica/Davis"
 msgstr "ანტარქტიდა/დეივისი"
 
 #: ../calendar/zones.h:180
-#, fuzzy
 msgid "Antarctica/DumontDUrville"
-msgstr "ანტარქტიდა/დუმონტდურვილე"
+msgstr "ანტარქტიდა/დუმონტდურვილი"
 
 #: ../calendar/zones.h:181
-#, fuzzy
 msgid "Antarctica/Mawson"
 msgstr "ანტარქტიდა/მოუსონი"
 
 #: ../calendar/zones.h:182
-#, fuzzy
 msgid "Antarctica/McMurdo"
 msgstr "ანტარქტიდა/მაკმურდო"
 
 #: ../calendar/zones.h:183
-#, fuzzy
 msgid "Antarctica/Palmer"
 msgstr "ანტარქტიდა/პალმერი"
 
 #: ../calendar/zones.h:184
-#, fuzzy
 msgid "Antarctica/South_Pole"
 msgstr "ანტარქტიდა/სამხრეთ_პოლუსი"
 
 #: ../calendar/zones.h:185
-#, fuzzy
 msgid "Antarctica/Syowa"
 msgstr "ანტარქტიდა/სიოვა"
 
 #: ../calendar/zones.h:186
-#, fuzzy
 msgid "Antarctica/Vostok"
 msgstr "ანტარქტიდა/ვოსტოკი"
 
 #: ../calendar/zones.h:187
-#, fuzzy
 msgid "Arctic/Longyearbyen"
 msgstr "აცტეკი/ლონგიერბიენი"
 
@@ -9762,27 +10056,22 @@ msgid "Asia/Aden"
 msgstr "აზია/ადენი"
 
 #: ../calendar/zones.h:189
-#, fuzzy
 msgid "Asia/Almaty"
 msgstr "აზია/ალმაატა"
 
 #: ../calendar/zones.h:190
-#, fuzzy
 msgid "Asia/Amman"
 msgstr "აზია/ამანი"
 
 #: ../calendar/zones.h:191
-#, fuzzy
 msgid "Asia/Anadyr"
-msgstr "აზია/ანადირ"
+msgstr "აზია/ანადირი"
 
 #: ../calendar/zones.h:192
-#, fuzzy
 msgid "Asia/Aqtau"
 msgstr "აზია/აქტაუ"
 
 #: ../calendar/zones.h:193
-#, fuzzy
 msgid "Asia/Aqtobe"
 msgstr "აზია/აქტობა"
 
@@ -9795,7 +10084,6 @@ msgid "Asia/Baghdad"
 msgstr "აზია/ბაღდადი"
 
 #: ../calendar/zones.h:196
-#, fuzzy
 msgid "Asia/Bahrain"
 msgstr "აზია/ბაჰრეინი"
 
@@ -9816,7 +10104,6 @@ msgid "Asia/Bishkek"
 msgstr "აზია/ბიშკეკი"
 
 #: ../calendar/zones.h:201
-#, fuzzy
 msgid "Asia/Brunei"
 msgstr "აზია/ბრუნეი"
 
@@ -9825,12 +10112,10 @@ msgid "Asia/Calcutta"
 msgstr "აზია/კალკუტა"
 
 #: ../calendar/zones.h:203
-#, fuzzy
 msgid "Asia/Choibalsan"
 msgstr "აზია/ჩოიბალსანი"
 
 #: ../calendar/zones.h:204
-#, fuzzy
 msgid "Asia/Chongqing"
 msgstr "აზია/ჩუცინი"
 
@@ -9839,12 +10124,10 @@ msgid "Asia/Colombo"
 msgstr "აზია/კოლომბო"
 
 #: ../calendar/zones.h:206
-#, fuzzy
 msgid "Asia/Damascus"
 msgstr "აზია/დამასკო"
 
 #: ../calendar/zones.h:207
-#, fuzzy
 msgid "Asia/Dhaka"
 msgstr "აზია/დაკა"
 
@@ -9861,12 +10144,10 @@ msgid "Asia/Dushanbe"
 msgstr "აზია/დუშანბე"
 
 #: ../calendar/zones.h:211
-#, fuzzy
 msgid "Asia/Gaza"
 msgstr "აზია/ღაზა"
 
 #: ../calendar/zones.h:212
-#, fuzzy
 msgid "Asia/Harbin"
 msgstr "აზია/ჰარბინი"
 
@@ -9875,7 +10156,6 @@ msgid "Asia/Hong_Kong"
 msgstr "აზია/ჰონგ_კონგი"
 
 #: ../calendar/zones.h:214
-#, fuzzy
 msgid "Asia/Hovd"
 msgstr "აზია/ჰოვდი"
 
@@ -9892,7 +10172,6 @@ msgid "Asia/Jakarta"
 msgstr "აზია/ჯაკარტა"
 
 #: ../calendar/zones.h:218
-#, fuzzy
 msgid "Asia/Jayapura"
 msgstr "აზია/ჯაიაპურა"
 
@@ -9909,32 +10188,26 @@ msgid "Asia/Kamchatka"
 msgstr "აზია/კამჩატკა"
 
 #: ../calendar/zones.h:222
-#, fuzzy
 msgid "Asia/Karachi"
 msgstr "აზია/კარაჩი"
 
 #: ../calendar/zones.h:223
-#, fuzzy
 msgid "Asia/Kashgar"
 msgstr "აზია/ყაშგარი"
 
 #: ../calendar/zones.h:224
-#, fuzzy
 msgid "Asia/Katmandu"
 msgstr "აზია/კატმანდუ"
 
 #: ../calendar/zones.h:225
-#, fuzzy
 msgid "Asia/Krasnoyarsk"
 msgstr "აზია/კრასნოიარსკი"
 
 #: ../calendar/zones.h:226
-#, fuzzy
 msgid "Asia/Kuala_Lumpur"
 msgstr "აზია/კუალა_ლიმპური"
 
 #: ../calendar/zones.h:227
-#, fuzzy
 msgid "Asia/Kuching"
 msgstr "აზია/კუჩინი"
 
@@ -9955,7 +10228,6 @@ msgid "Asia/Magadan"
 msgstr "აზია/მაგადანი"
 
 #: ../calendar/zones.h:232
-#, fuzzy
 msgid "Asia/Makassar"
 msgstr "აზია/მაქასარი"
 
@@ -9964,7 +10236,6 @@ msgid "Asia/Manila"
 msgstr "აზია/მანილა"
 
 #: ../calendar/zones.h:234
-#, fuzzy
 msgid "Asia/Muscat"
 msgstr "აზია/მუსკატი"
 
@@ -9985,37 +10256,30 @@ msgid "Asia/Oral"
 msgstr "აზია/ორალი"
 
 #: ../calendar/zones.h:239
-#, fuzzy
 msgid "Asia/Phnom_Penh"
 msgstr "აზია/პნომპენი"
 
 #: ../calendar/zones.h:240
-#, fuzzy
 msgid "Asia/Pontianak"
 msgstr "აზია/პონტიანაკი"
 
 #: ../calendar/zones.h:241
-#, fuzzy
 msgid "Asia/Pyongyang"
 msgstr "აზია/პიონგიანგი"
 
 #: ../calendar/zones.h:242
-#, fuzzy
 msgid "Asia/Qatar"
-msgstr "აზია/კატარი"
+msgstr "აზია/ქატარი"
 
 #: ../calendar/zones.h:243
-#, fuzzy
 msgid "Asia/Qyzylorda"
 msgstr "აზია/ყიზილორდა"
 
 #: ../calendar/zones.h:244
-#, fuzzy
 msgid "Asia/Rangoon"
 msgstr "აზია/რანგონი"
 
 #: ../calendar/zones.h:245
-#, fuzzy
 msgid "Asia/Riyadh"
 msgstr "აზია/ერრიადი"
 
@@ -10028,12 +10292,10 @@ msgid "Asia/Sakhalin"
 msgstr "აზია/სახალინი"
 
 #: ../calendar/zones.h:248
-#, fuzzy
 msgid "Asia/Samarkand"
 msgstr "აზია/სამარყანდი"
 
 #: ../calendar/zones.h:249
-#, fuzzy
 msgid "Asia/Seoul"
 msgstr "აზია/სეული"
 
@@ -10058,12 +10320,10 @@ msgid "Asia/Tbilisi"
 msgstr "აზია/თბილისი"
 
 #: ../calendar/zones.h:255
-#, fuzzy
 msgid "Asia/Tehran"
 msgstr "აზია/თეირანი"
 
 #: ../calendar/zones.h:256
-#, fuzzy
 msgid "Asia/Thimphu"
 msgstr "აზია/ტიმფუ"
 
@@ -10072,22 +10332,18 @@ msgid "Asia/Tokyo"
 msgstr "აზია/ტოკიო"
 
 #: ../calendar/zones.h:258
-#, fuzzy
 msgid "Asia/Ujung_Pandang"
 msgstr "აზია/უჯუნ_პანდანგი"
 
 #: ../calendar/zones.h:259
-#, fuzzy
 msgid "Asia/Ulaanbaatar"
 msgstr "აზია/ულანბატორი"
 
 #: ../calendar/zones.h:260
-#, fuzzy
 msgid "Asia/Urumqi"
 msgstr "აზია/ურუმქი"
 
 #: ../calendar/zones.h:261
-#, fuzzy
 msgid "Asia/Vientiane"
 msgstr "აზია/ვიენტიანა"
 
@@ -10100,7 +10356,6 @@ msgid "Asia/Yakutsk"
 msgstr "აზია/იაკუტსკი"
 
 #: ../calendar/zones.h:264
-#, fuzzy
 msgid "Asia/Yekaterinburg"
 msgstr "აზია/ეკატერინბურგი"
 
@@ -10109,32 +10364,26 @@ msgid "Asia/Yerevan"
 msgstr "აზია/ერევანი"
 
 #: ../calendar/zones.h:266
-#, fuzzy
 msgid "Atlantic/Azores"
 msgstr "ატლანტიკა/აზორები"
 
 #: ../calendar/zones.h:267
-#, fuzzy
 msgid "Atlantic/Bermuda"
-msgstr "ატლანტიკა/ბერმუდი"
+msgstr "ატლანტიკა/ბერმუდა"
 
 #: ../calendar/zones.h:268
-#, fuzzy
 msgid "Atlantic/Canary"
 msgstr "ატლანტიკა/კანარი"
 
 #: ../calendar/zones.h:269
-#, fuzzy
 msgid "Atlantic/Cape_Verde"
-msgstr "ატლანტიკა/კაპე-ვერდე"
+msgstr "ატლანტიკა/მწვანე-კონცხი"
 
 #: ../calendar/zones.h:270
-#, fuzzy
 msgid "Atlantic/Faeroe"
 msgstr "ატლანტიკა/ფარერები"
 
 #: ../calendar/zones.h:271
-#, fuzzy
 msgid "Atlantic/Jan_Mayen"
 msgstr "ატლანტიკა/იან_მაიენი"
 
@@ -10143,7 +10392,6 @@ msgid "Atlantic/Madeira"
 msgstr "ატლანტიკა/მედეირა"
 
 #: ../calendar/zones.h:273
-#, fuzzy
 msgid "Atlantic/Reykjavik"
 msgstr "ატლანტიკა/რეიკიავიკი"
 
@@ -10152,57 +10400,46 @@ msgid "Atlantic/South_Georgia"
 msgstr "ატლანტიკა/სამხრეთ ჯორჯია"
 
 #: ../calendar/zones.h:275
-#, fuzzy
 msgid "Atlantic/St_Helena"
-msgstr "ატლანტიკა/წმ.ელენე"
+msgstr "ატლანტიკა/წმ._ელენე"
 
 #: ../calendar/zones.h:276
-#, fuzzy
 msgid "Atlantic/Stanley"
 msgstr "ატლანტიკა/სტენლი"
 
 #: ../calendar/zones.h:277
-#, fuzzy
 msgid "Australia/Adelaide"
 msgstr "ავსტრალია/ადელაიდა"
 
 #: ../calendar/zones.h:278
-#, fuzzy
 msgid "Australia/Brisbane"
 msgstr "ავსტრალია/ბრისბენი"
 
 #: ../calendar/zones.h:279
-#, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "ავსტრალია/ბროკენ-ჰილი"
 
 #: ../calendar/zones.h:280
-#, fuzzy
 msgid "Australia/Darwin"
 msgstr "ავსტრალია/დარვინი"
 
 #: ../calendar/zones.h:281
-#, fuzzy
 msgid "Australia/Hobart"
 msgstr "ავსტრალია/ჰაბარტო"
 
 #: ../calendar/zones.h:282
-#, fuzzy
 msgid "Australia/Lindeman"
 msgstr "ავსტრალია/ლინდემანი"
 
 #: ../calendar/zones.h:283
-#, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "ავსტრალია/ლორდ-ჰოვე"
 
 #: ../calendar/zones.h:284
-#, fuzzy
 msgid "Australia/Melbourne"
 msgstr "ავსტრალია/მელბურნი"
 
 #: ../calendar/zones.h:285
-#, fuzzy
 msgid "Australia/Perth"
 msgstr "ავსტრალია/პერტი"
 
@@ -10223,7 +10460,6 @@ msgid "Europe/Athens"
 msgstr "ევრობა/ათენი"
 
 #: ../calendar/zones.h:290
-#, fuzzy
 msgid "Europe/Belfast"
 msgstr "ევროპა/ბელფასტი"
 
@@ -10252,7 +10488,6 @@ msgid "Europe/Budapest"
 msgstr "ევროპა/ბუდაპეშტი"
 
 #: ../calendar/zones.h:297
-#, fuzzy
 msgid "Europe/Chisinau"
 msgstr "ევროპა/ნიკოსია"
 
@@ -10289,7 +10524,6 @@ msgid "Europe/Lisbon"
 msgstr "ევროპა/ლისაბონი"
 
 #: ../calendar/zones.h:306
-#, fuzzy
 msgid "Europe/Ljubljana"
 msgstr "ევროპა/ლიუბლიანა"
 
@@ -10358,12 +10592,10 @@ msgid "Europe/Sarajevo"
 msgstr "ევროპა/სარაევო"
 
 #: ../calendar/zones.h:323
-#, fuzzy
 msgid "Europe/Simferopol"
 msgstr "ევროპა/სიმფეროპოლი"
 
 #: ../calendar/zones.h:324
-#, fuzzy
 msgid "Europe/Skopje"
 msgstr "ევროპა/სკოპლე"
 
@@ -10380,17 +10612,14 @@ msgid "Europe/Tallinn"
 msgstr "ევროპა/ტალინი"
 
 #: ../calendar/zones.h:328
-#, fuzzy
 msgid "Europe/Tirane"
 msgstr "ევროპა/ტირანე"
 
 #: ../calendar/zones.h:329
-#, fuzzy
 msgid "Europe/Uzhgorod"
 msgstr "ევროპა/უჟგოროდი"
 
 #: ../calendar/zones.h:330
-#, fuzzy
 msgid "Europe/Vaduz"
 msgstr "ევროპა/ვადუცი"
 
@@ -10403,7 +10632,6 @@ msgid "Europe/Vienna"
 msgstr "ევროპა/ვენა"
 
 #: ../calendar/zones.h:333
-#, fuzzy
 msgid "Europe/Vilnius"
 msgstr "ევროპა/ვილნიუსი"
 
@@ -10412,7 +10640,6 @@ msgid "Europe/Warsaw"
 msgstr "ევროპა/ვარშავა"
 
 #: ../calendar/zones.h:335
-#, fuzzy
 msgid "Europe/Zagreb"
 msgstr "ევროპა/ზაგრები"
 
@@ -10425,90 +10652,76 @@ msgid "Europe/Zurich"
 msgstr "ევროპა/ციურიხი"
 
 #: ../calendar/zones.h:338
+#, fuzzy
 msgid "Indian/Antananarivo"
-msgstr ""
+msgstr "ინდოეთის ოკიანე/ანტანანარივო"
 
 #: ../calendar/zones.h:339
-#, fuzzy
 msgid "Indian/Chagos"
 msgstr "ინდოეთის ოკიანე/ჩაგოსი"
 
 #: ../calendar/zones.h:340
+#, fuzzy
 msgid "Indian/Christmas"
-msgstr ""
+msgstr "ინდოეთის ოკიანე/შობა"
 
 #: ../calendar/zones.h:341
-#, fuzzy
 msgid "Indian/Cocos"
 msgstr "ინდოეთის ოკიანე/ქოქოსი"
 
 #: ../calendar/zones.h:342
-#, fuzzy
 msgid "Indian/Comoro"
 msgstr "ინდოეთის ოკიანე/კომორო"
 
 #: ../calendar/zones.h:343
-#, fuzzy
 msgid "Indian/Kerguelen"
 msgstr "ინდოეთის ოკიანე/კერგუელენი"
 
 #: ../calendar/zones.h:344
-#, fuzzy
 msgid "Indian/Mahe"
 msgstr "ინდოეთის ოკიანე/მაჰე"
 
 #: ../calendar/zones.h:345
-#, fuzzy
 msgid "Indian/Maldives"
 msgstr "ინდოეთის ოკიანე/მალდივები"
 
 #: ../calendar/zones.h:346
-#, fuzzy
 msgid "Indian/Mauritius"
 msgstr "ინდოეთის ოკიანე/მაურიციუსი"
 
 #: ../calendar/zones.h:347
-#, fuzzy
 msgid "Indian/Mayotte"
 msgstr "ინდოეთის ოკიანე/მაიოტტა"
 
 #: ../calendar/zones.h:348
-#, fuzzy
 msgid "Indian/Reunion"
 msgstr "ინდოეთის ოკიანე/რეუნიონი"
 
 #: ../calendar/zones.h:349
-#, fuzzy
 msgid "Pacific/Apia"
 msgstr "წყნარი ოკეანე/აპია"
 
 #: ../calendar/zones.h:350
-#, fuzzy
 msgid "Pacific/Auckland"
 msgstr "წყნარი ოკეანე/ოკლენდი"
 
 #: ../calendar/zones.h:351
-#, fuzzy
 msgid "Pacific/Chatham"
 msgstr "წყნარი ოკეანე/ჩათამი"
 
 #: ../calendar/zones.h:352
-#, fuzzy
 msgid "Pacific/Easter"
 msgstr "წყნარი ოკეანე/ისტერი"
 
 #: ../calendar/zones.h:353
-#, fuzzy
 msgid "Pacific/Efate"
 msgstr "წყნარი ოკეანე/ეფატე"
 
 #: ../calendar/zones.h:354
-#, fuzzy
 msgid "Pacific/Enderbury"
 msgstr "წყნარი ოკეანე/ენდერბარი"
 
 #: ../calendar/zones.h:355
-#, fuzzy
 msgid "Pacific/Fakaofo"
 msgstr "წყნარი ოკეანე/ფაკაოფო"
 
@@ -10517,7 +10730,6 @@ msgid "Pacific/Fiji"
 msgstr "წყნარი ოკეანე/ფიჯი"
 
 #: ../calendar/zones.h:357
-#, fuzzy
 msgid "Pacific/Funafuti"
 msgstr "წყნარი ოკეანე/ფუნაფუტი"
 
@@ -10526,12 +10738,10 @@ msgid "Pacific/Galapagos"
 msgstr "წყნარი ოკეანე/გალაპაგოსი"
 
 #: ../calendar/zones.h:359
-#, fuzzy
 msgid "Pacific/Gambier"
 msgstr "წყნარი ოკეანე/გამბიერი"
 
 #: ../calendar/zones.h:360
-#, fuzzy
 msgid "Pacific/Guadalcanal"
 msgstr "წყნარი ოკეანე/გუადალკანალი"
 
@@ -10540,132 +10750,106 @@ msgid "Pacific/Guam"
 msgstr "წყნარი ოკეანე/გუამი"
 
 #: ../calendar/zones.h:362
-#, fuzzy
 msgid "Pacific/Honolulu"
 msgstr "წყნარი ოკეანე/ჰონოლულუ"
 
 #: ../calendar/zones.h:363
-#, fuzzy
 msgid "Pacific/Johnston"
 msgstr "წყნარი ოკეანე/ჯონსტონი"
 
 #: ../calendar/zones.h:364
-#, fuzzy
 msgid "Pacific/Kiritimati"
 msgstr "წყნარი ოკეანე/კირიტიმატი"
 
 #: ../calendar/zones.h:365
-#, fuzzy
 msgid "Pacific/Kosrae"
 msgstr "წყნარი ოკეანე/კოსრე"
 
 #: ../calendar/zones.h:366
-#, fuzzy
 msgid "Pacific/Kwajalein"
 msgstr "წყნარი ოკეანე/კაჯალეინ"
 
 #: ../calendar/zones.h:367
-#, fuzzy
 msgid "Pacific/Majuro"
 msgstr "წყნარი ოკეანე/მაჯურო"
 
 #: ../calendar/zones.h:368
-#, fuzzy
 msgid "Pacific/Marquesas"
 msgstr "წყნარი ოკეანე/მარკიზები"
 
 #: ../calendar/zones.h:369
-#, fuzzy
 msgid "Pacific/Midway"
 msgstr "წყნარი ოკეანე/მიდვეი"
 
 #: ../calendar/zones.h:370
-#, fuzzy
 msgid "Pacific/Nauru"
 msgstr "წყნარი ოკეანე/ნაურუ"
 
 #: ../calendar/zones.h:371
-#, fuzzy
 msgid "Pacific/Niue"
 msgstr "წყნარი ოკეანე/ნიუე"
 
 #: ../calendar/zones.h:372
-#, fuzzy
 msgid "Pacific/Norfolk"
 msgstr "წყნარი ოკეანე/ნორფოლკი"
 
 #: ../calendar/zones.h:373
-#, fuzzy
 msgid "Pacific/Noumea"
 msgstr "წყნარი ოკეანე/ნოუმეა"
 
 #: ../calendar/zones.h:374
-#, fuzzy
 msgid "Pacific/Pago_Pago"
 msgstr "წყნარი ოკეანე/პაგო_პაგო"
 
 #: ../calendar/zones.h:375
-#, fuzzy
 msgid "Pacific/Palau"
-msgstr "წყნარი ოკეანე/პალა"
+msgstr "წყნარი ოკეანე/პალაუ"
 
 #: ../calendar/zones.h:376
-#, fuzzy
 msgid "Pacific/Pitcairn"
 msgstr "წყნარი ოკეანე/პიტკერნი"
 
 #: ../calendar/zones.h:377
-#, fuzzy
 msgid "Pacific/Ponape"
 msgstr "წყნარი ოკეანე/პანაპე"
 
 #: ../calendar/zones.h:378
-#, fuzzy
 msgid "Pacific/Port_Moresby"
-msgstr "წყნარი ოკეანე/პორტ_მორესბი"
+msgstr "წყნარი ოკეანე/პორტ_მორესბი "
 
 #: ../calendar/zones.h:379
-#, fuzzy
 msgid "Pacific/Rarotonga"
 msgstr "წყნარი ოკეანე/რაროტონგა"
 
 #: ../calendar/zones.h:380
-#, fuzzy
 msgid "Pacific/Saipan"
 msgstr "წყნარი ოკეანე/საიპანი"
 
 #: ../calendar/zones.h:381
-#, fuzzy
 msgid "Pacific/Tahiti"
 msgstr "წყნარი ოკეანე/ტაიტი"
 
 #: ../calendar/zones.h:382
-#, fuzzy
 msgid "Pacific/Tarawa"
 msgstr "წყნარი ოკეანე/ტარავა"
 
 #: ../calendar/zones.h:383
-#, fuzzy
 msgid "Pacific/Tongatapu"
 msgstr "წყნარი ოკეანე/ტონგატაბუ"
 
 #: ../calendar/zones.h:384
-#, fuzzy
 msgid "Pacific/Truk"
 msgstr "წყნარი ოკეანე/ტრუკი"
 
 #: ../calendar/zones.h:385
-#, fuzzy
 msgid "Pacific/Wake"
-msgstr "წყნარი ოკეანე/ვაკე"
+msgstr "წყნარი ოკეანე/ვეიქი"
 
 #: ../calendar/zones.h:386
-#, fuzzy
 msgid "Pacific/Wallis"
 msgstr "წყნარი ოკეანე/ვალისი"
 
 #: ../calendar/zones.h:387
-#, fuzzy
 msgid "Pacific/Yap"
 msgstr "წყნარი ოკეანე/იაპი"
 
@@ -10688,7 +10872,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr ""
 
@@ -10699,15 +10883,17 @@ msgstr ""
 #: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
 #: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
+#, fuzzy
 msgid "Cannot attach file %s: %s"
-msgstr ""
+msgstr "მიმაგრება ფაილი წმ წმ"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
 #: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
+#, fuzzy
 msgid "Cannot attach file %s: not a regular file"
-msgstr ""
+msgstr "მიმაგრება ფაილი წმ არა a წესიერი ფაილი"
 
 #: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
@@ -10716,7 +10902,7 @@ msgstr ""
 #: ../composer/e-msg-composer-hdrs.c:558
 #, fuzzy
 msgid "Choose folders to post the message to."
-msgstr "არჩევა -სკენ -სკენ."
+msgstr "-სკენ -სკენ."
 
 #: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
@@ -10730,9 +10916,8 @@ msgstr ""
 #. * expects the reply_to fields to be initialized.
 #.
 #: ../composer/e-msg-composer-hdrs.c:619
-#, fuzzy
 msgid "_Reply-To:"
-msgstr "პასუხი ვის:"
+msgstr "პ_ასუხი ვის:"
 
 #.
 #. * From
@@ -10755,28 +10940,31 @@ msgid "_To:"
 msgstr "_ვის:"
 
 #: ../composer/e-msg-composer-hdrs.c:643
+#, fuzzy
 msgid "Enter the recipients of the message"
-msgstr ""
+msgstr "შეყვანა -"
 
 #: ../composer/e-msg-composer-hdrs.c:646
+#, fuzzy
 msgid "_Cc:"
-msgstr ""
+msgstr "ასლი:"
 
 #: ../composer/e-msg-composer-hdrs.c:647
 #, fuzzy
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "a კოპია"
+msgstr "შეყვანა a კოპირება -"
 
 #: ../composer/e-msg-composer-hdrs.c:650
+#, fuzzy
 msgid "_Bcc:"
-msgstr ""
+msgstr "უხილავი ასლი:"
 
 #: ../composer/e-msg-composer-hdrs.c:651
 #, fuzzy
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr "a კოპია."
+msgstr "შეყვანა a კოპირება - - სია -."
 
 #.
 #. * Post-To
@@ -10797,34 +10985,37 @@ msgid "Post To:"
 msgstr "ვის:"
 
 #: ../composer/e-msg-composer-select-file.c:82
+#, fuzzy
 msgid "A_ttach"
-msgstr ""
+msgstr "A"
 
 #: ../composer/e-msg-composer-select-file.c:239
 #, fuzzy
 msgid "Insert Attachment"
-msgstr "არა"
+msgstr "ჩამატება"
 
 #: ../composer/e-msg-composer.c:828
+#, fuzzy
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
+msgstr "გამავალი არა ანგარიში"
 
 #: ../composer/e-msg-composer.c:835
+#, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr ""
+msgstr "გამავალი არა ანგარიში"
 
 #: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 #, fuzzy
 msgid "Hide _Attachment Bar"
-msgstr "არა"
+msgstr "დამალვა"
 
 #: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
 #: ../composer/e-msg-composer.c:3865
 #, fuzzy
 msgid "Show _Attachment Bar"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
@@ -10832,12 +11023,14 @@ msgid "Unknown reason"
 msgstr "უცნობი მიზეზი"
 
 #: ../composer/e-msg-composer.c:1402
+#, fuzzy
 msgid "Could not open file"
-msgstr ""
+msgstr "არა გახსნა ფაილი"
 
 #: ../composer/e-msg-composer.c:1410
+#, fuzzy
 msgid "Unable to retrieve message from editor"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
@@ -10861,34 +11054,38 @@ msgstr ""
 #: ../composer/e-msg-composer.c:3750
 #, fuzzy
 msgid "Compose Message"
-msgstr "შეტყობინება"
+msgstr "შექმნა შეტყობინება"
 
 #: ../composer/e-msg-composer.c:4974
+#, fuzzy
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr ""
+msgstr "<b> შეიცავს a ტექსტი<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
 #, fuzzy
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
-msgstr "აგზავნის -სკენ "
+msgstr "გაგზავნა ფოსტა ფოსტა -სკენ გაგზავნილი "
 
 #: ../composer/mail-composer.error.xml.h:2
+#, fuzzy
 msgid "All accounts have been removed."
-msgstr ""
+msgstr "ყველა ანგარიშები."
 
 #: ../composer/mail-composer.error.xml.h:3
+#, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
+msgstr "-სკენ?"
 
 #: ../composer/mail-composer.error.xml.h:4
+#, fuzzy
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
+msgstr "&quot;&quot; -სკენ ფოსტა."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:19
@@ -10896,75 +11093,90 @@ msgid "Because &quot;{1}&quot;."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:6
+#, fuzzy
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
-msgstr ""
+msgstr "ფანჯარა -სკენ შენახვა - -სკენ ეთ a თარიღი."
 
 #: ../composer/mail-composer.error.xml.h:7
+#, fuzzy
 msgid "Could not create composer window."
-msgstr ""
+msgstr "არა ფანჯარა."
 
 #: ../composer/mail-composer.error.xml.h:8
+#, fuzzy
 msgid "Could not create message."
-msgstr ""
+msgstr "არა."
 
 #: ../composer/mail-composer.error.xml.h:9
+#, fuzzy
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr ""
+msgstr "არა ფაილი&quot;&quot;."
 
 #: ../composer/mail-composer.error.xml.h:10
+#, fuzzy
 msgid "Could not retrieve messages to attach from {0}."
-msgstr ""
+msgstr "არა -სკენ მიმაგრება."
 
 #: ../composer/mail-composer.error.xml.h:11
+#, fuzzy
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr ""
+msgstr "არა შენახვა -სკენ ფაილი&quot;&quot;."
 
 #: ../composer/mail-composer.error.xml.h:12
+#, fuzzy
 msgid "Directories can not be attached to Messages."
-msgstr ""
+msgstr "დირექტორიები არა -სკენ შეტყობინებები."
 
 #: ../composer/mail-composer.error.xml.h:13
+#, fuzzy
 msgid "Do you want to recover unfinished messages?"
-msgstr ""
+msgstr "-სკენ?"
 
 #: ../composer/mail-composer.error.xml.h:14
+#, fuzzy
 msgid "Download in progress. Do you want to send the mail?"
-msgstr ""
+msgstr "ჩამოტვირთვა - -სკენ ფოსტა?"
 
 #: ../composer/mail-composer.error.xml.h:15
+#, fuzzy
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr ""
+msgstr "შეცდომა -სკენ&quot;&quot;."
 
 #: ../composer/mail-composer.error.xml.h:16
+#, fuzzy
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
-msgstr ""
+msgstr "Evolution დასრულება a ახალი -სკენ მარცხენა გამორთულია."
 
 #: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+msgstr "ფაილი არა a წესიერი ფაილი და გაგზავნილი - a."
 
 #: ../composer/mail-composer.error.xml.h:18
+#, fuzzy
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
-msgstr ""
+msgstr "ვის მიმაგრება - მიმაგრება ფაილი - ან - და მიმაგრება."
 
 #: ../composer/mail-composer.error.xml.h:19
+#, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
-msgstr ""
+msgstr "-სკენ HTML არა - და."
 
 #: ../composer/mail-composer.error.xml.h:22
+#, fuzzy
 msgid "Unable to activate the address selector control."
-msgstr ""
+msgstr "-სკენ ამრჩევი."
 
 #: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
@@ -10973,20 +11185,22 @@ msgstr ""
 #: ../composer/mail-composer.error.xml.h:24
 #, fuzzy
 msgid "Warning: Modified Message"
-msgstr "გაფრთხილება შეცვლილია შეტყობინება"
+msgstr "გაფრთხილება ჩასწორებულია შეტყობინება"
 
 #: ../composer/mail-composer.error.xml.h:25
+#, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
-msgstr ""
+msgstr "თქვენ მიმაგრება ფაილი -სკენ."
 
 #: ../composer/mail-composer.error.xml.h:26
+#, fuzzy
 msgid "You need to configure an account before you can compose mail."
-msgstr ""
+msgstr "თქვენ -სკენ ანგარიში ფოსტა."
 
 #: ../composer/mail-composer.error.xml.h:28
 #, fuzzy
 msgid "_Do not Recover"
-msgstr "წაშლა"
+msgstr "არა"
 
 #: ../composer/mail-composer.error.xml.h:29
 #, fuzzy
@@ -10994,48 +11208,50 @@ msgid "_Recover"
 msgstr "_წაშლა"
 
 #: ../composer/mail-composer.error.xml.h:30
-#, fuzzy
 msgid "_Save Message"
-msgstr "შენახვა შეტყობინება"
+msgstr "_შეტყობინების შენახვა"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
 #: ../shell/main.c:514
 msgid "Evolution"
-msgstr "ევოლუშენ"
+msgstr "ევოლუშენი"
 
 #: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
 msgid "Groupware Suite"
 msgstr ""
 
 #: ../data/evolution.desktop.in.in.h:3
+#, fuzzy
 msgid "The Evolution PIM and Email Client"
-msgstr ""
+msgstr "Evolution და ელფოსტა კლიენტი"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr ""
 
 #: ../data/evolution.keys.in.in.h:2
+#, fuzzy
 msgid "calendar information"
-msgstr ""
+msgstr "კალენდარი"
 
 #: ../designs/OOA/ooa.glade.h:1
+#, fuzzy
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
 "Would you like to change your status to \"In the Office\"? "
-msgstr ""
+msgstr "<b> - ოფისი</b> არა -სკენ -სკენ ოფისი "
 
 #: ../designs/OOA/ooa.glade.h:4
 #, fuzzy
 msgid "<b>Out of Office Message:</b>"
-msgstr "<b> ოფისი შეტყობინება</b>"
+msgstr "<b> - ოფისი შეტყობინება</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
 #, fuzzy
 msgid "<b>Status:</b>"
-msgstr "<b>სტატუსი:</b>"
+msgstr "<b> სტატუსი</b>"
 
 #: ../designs/OOA/ooa.glade.h:6
 #, fuzzy
@@ -11043,31 +11259,32 @@ msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
 "mail to you while you are out of the office.</small>"
-msgstr "<small> -სკენ -სკენ</small>"
+msgstr "<small> გაგზავნილი -სკენ პირადი ფორმა ვინ -სკენ -</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
 #, fuzzy
 msgid "I am currently in the office"
-msgstr "I am"
+msgstr "I am -"
 
 #: ../designs/OOA/ooa.glade.h:9
 #, fuzzy
 msgid "I am currently out of the office"
-msgstr "I am"
+msgstr "I am -"
 
 #: ../designs/OOA/ooa.glade.h:10
+#, fuzzy
 msgid "No, Do not Change Status"
-msgstr ""
+msgstr "არა არა შეცვლა სტატუსი"
 
 #: ../designs/OOA/ooa.glade.h:12
 #, fuzzy
 msgid "Out of Office Assistant"
-msgstr "ოფისი ასისტენტი"
+msgstr "- ოფისი ასისტენტი"
 
 #: ../designs/OOA/ooa.glade.h:13
 #, fuzzy
 msgid "Yes, Change Status"
-msgstr "კი, შეცვალე სტატუსი"
+msgstr "დიახ შეცვლა სტატუსი"
 
 #: ../designs/read_receipts/read.glade.h:1
 #, fuzzy
@@ -11077,57 +11294,65 @@ msgstr "    "
 #: ../designs/read_receipts/read.glade.h:2
 #, fuzzy
 msgid "<b>Receiving Email</b>"
-msgstr "<b> ღებულობს Email</b>"
+msgstr "<b> მიღება ელფოსტა</b>"
 
 #: ../designs/read_receipts/read.glade.h:3
 #, fuzzy
 msgid "<b>Sending Email:</b>"
-msgstr "<b> აგზავნის Email</b>"
+msgstr "<b> გაგზავნა ელფოსტა</b>"
 
 #: ../designs/read_receipts/read.glade.h:4
+#, fuzzy
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
-msgstr ""
+msgstr "<small> პანელი -სკენ -სკენ a a და -სკენ Evolution a</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
+#, fuzzy
 msgid "Always send back a read receipt"
-msgstr ""
+msgstr "ყოველთვის a"
 
 #: ../designs/read_receipts/read.glade.h:7
+#, fuzzy
 msgid "Ask me if I want to send back a read receipt"
-msgstr ""
+msgstr "კითხვა I -სკენ a"
 
 #: ../designs/read_receipts/read.glade.h:8
+#, fuzzy
 msgid "Never send back a read receipt"
-msgstr ""
+msgstr "არასოდეს a"
 
 #: ../designs/read_receipts/read.glade.h:9
 #, fuzzy
 msgid "Read Receipts"
-msgstr "წაკითხული"
+msgstr "წაკითხვა"
 
 #: ../designs/read_receipts/read.glade.h:10
+#, fuzzy
 msgid "Request a read receipt for all messages I send"
-msgstr ""
+msgstr "a ყველა I"
 
 #: ../designs/read_receipts/read.glade.h:11
+#, fuzzy
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr ""
+msgstr "გაგზავნილი -სკენ a სია და არა -სკენ"
 
 #: ../designs/read_receipts/read.glade.h:12
+#, fuzzy
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr ""
+msgstr "ელფოსტა a Evolution?"
 
 #: ../e-util/e-dialog-utils.c:281
+#, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
-msgstr ""
+msgstr "A ფაილი სახელი?"
 
 #: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 #, fuzzy
@@ -11149,29 +11374,32 @@ msgstr "ევოლუშენ ინფორმაცია"
 #: ../e-util/e-error.c:126
 #, fuzzy
 msgid "Evolution Query"
-msgstr "Evolution"
+msgstr "Evolution გამოკითხვა"
 
 #. setup a dummy error
 #: ../e-util/e-error.c:443
 #, fuzzy, c-format
 msgid "Internal error, unknown error '%s' requested"
-msgstr "შეცდომა უცნობი შეცდომა"
+msgstr "შეცდომა უცნობი შეცდომა წმ მოთხოვნილი"
 
 #: ../e-util/e-system.error.xml.h:2
+#, fuzzy
 msgid "Cannot open file &quot;{0}&quot;."
-msgstr ""
+msgstr "გახსნა ფაილი&quot;&quot;."
 
 #: ../e-util/e-system.error.xml.h:3
+#, fuzzy
 msgid "Cannot save file &quot;{0}&quot;."
-msgstr ""
+msgstr "შენახვა ფაილი&quot;&quot;."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "გსურთ გადააწეროთ ზემოდან ?"
 
 #: ../e-util/e-system.error.xml.h:5
+#, fuzzy
 msgid "File exists &quot;{0}&quot;."
-msgstr ""
+msgstr "ფაილი&quot;&quot;."
 
 #: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 #, fuzzy
@@ -11239,12 +11467,14 @@ msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
 #: ../filter/filter-datespec.c:415
+#, fuzzy
 msgid "Select a time to compare against"
-msgstr ""
+msgstr "ამორჩევა a -სკენ"
 
 #: ../filter/filter-file.c:289
+#, fuzzy
 msgid "Choose a file"
-msgstr ""
+msgstr "a ფაილი"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
 #: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
@@ -11270,24 +11500,27 @@ msgstr "ტესტი"
 #: ../filter/filter-rule.c:799
 #, fuzzy
 msgid "_Search name:"
-msgstr "ძებნა:"
+msgstr "ძებნა სახელი:"
 
 #: ../filter/filter-rule.c:827
+#, fuzzy
 msgid "Find items that meet the following criteria"
-msgstr ""
+msgstr "ძიება"
 
 #: ../filter/filter-rule.c:866
+#, fuzzy
 msgid "If all criteria are met"
-msgstr ""
+msgstr "ყველა"
 
 #: ../filter/filter-rule.c:866
+#, fuzzy
 msgid "If any criteria are met"
-msgstr ""
+msgstr "ნებისმიერი"
 
 #: ../filter/filter-rule.c:868
 #, fuzzy
 msgid "Find items:"
-msgstr "ძებნა:"
+msgstr "ძიება:"
 
 #: ../filter/filter-rule.c:889
 #, fuzzy
@@ -11304,8 +11537,9 @@ msgid "Replies and parents"
 msgstr "და"
 
 #: ../filter/filter-rule.c:889
+#, fuzzy
 msgid "No reply or parent"
-msgstr ""
+msgstr "არა ან"
 
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
@@ -11328,12 +11562,12 @@ msgstr "წესიერი&quot;&quot;."
 #: ../filter/filter.error.xml.h:2
 #, fuzzy
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "წესიერი&quot;&quot;."
+msgstr "არა წესიერი&quot;&quot;."
 
 #: ../filter/filter.error.xml.h:3
 #, fuzzy
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "ფაილი&quot;&quot; a წესიერი."
+msgstr "ფაილი&quot;&quot; არა ან არა a წესიერი ფაილი."
 
 #: ../filter/filter.error.xml.h:4
 #, fuzzy
@@ -11343,12 +11577,12 @@ msgstr "თარიღი."
 #: ../filter/filter.error.xml.h:5
 #, fuzzy
 msgid "Missing file name."
-msgstr "არ არის."
+msgstr "ფაილი სახელი."
 
 #: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 #, fuzzy
 msgid "Missing name."
-msgstr "არ არის."
+msgstr "სახელი."
 
 #: ../filter/filter.error.xml.h:7
 #, fuzzy
@@ -11356,8 +11590,9 @@ msgid "Name &quot;{0}&quot; already used."
 msgstr "სახელი&quot;&quot;."
 
 #: ../filter/filter.error.xml.h:8
+#, fuzzy
 msgid "Please choose another name."
-msgstr ""
+msgstr "სახელი."
 
 #: ../filter/filter.error.xml.h:9
 #, fuzzy
@@ -11365,12 +11600,14 @@ msgid "You must choose a date."
 msgstr "თქვენ a თარიღი."
 
 #: ../filter/filter.error.xml.h:10
+#, fuzzy
 msgid "You must name this filter."
-msgstr ""
+msgstr "თქვენ სახელი."
 
 #: ../filter/filter.error.xml.h:11
+#, fuzzy
 msgid "You must specify a file name."
-msgstr ""
+msgstr "თქვენ a ფაილი სახელი."
 
 #: ../filter/filter.glade.h:1
 #, fuzzy
@@ -11378,34 +11615,35 @@ msgid "<b>_Filter Rules</b>"
 msgstr "<b> ფილტრი</b>"
 
 #: ../filter/filter.glade.h:2
+#, fuzzy
 msgid "Compare against"
-msgstr ""
+msgstr "შედარება"
 
 #: ../filter/filter.glade.h:4
 #, fuzzy
 msgid "Show filters for mail:"
-msgstr "ანახე:"
+msgstr "ჩვენება ფოსტა:"
 
 #: ../filter/filter.glade.h:5
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
-msgstr "თარიღი თარიღი."
+msgstr "წმ თარიღი - თარიღი."
 
 #: ../filter/filter.glade.h:7
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
-msgstr "თარიღი -სკენ."
+msgstr "წმ თარიღი -სკენ."
 
 #: ../filter/filter.glade.h:9
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
-msgstr "თარიღი."
+msgstr "წმ თარიღი."
 
 #: ../filter/filter.glade.h:12
 #, fuzzy
@@ -11420,6 +11658,10 @@ msgstr ""
 msgid "months"
 msgstr "თვე"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "წამი"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr ""
@@ -11435,16 +11677,17 @@ msgstr "წელი"
 #: ../filter/rule-editor.c:378
 #, fuzzy
 msgid "Add Rule"
-msgstr "დამატება"
+msgstr "დამატება წესი"
 
 #: ../filter/rule-editor.c:454
 #, fuzzy
 msgid "Edit Rule"
-msgstr "რედაქტირება"
+msgstr "რედაქტირება წესი"
 
 #: ../filter/rule-editor.c:732
+#, fuzzy
 msgid "Rule name"
-msgstr ""
+msgstr "წესი სახელი"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 #, fuzzy
@@ -11452,18 +11695,19 @@ msgid "Composer Preferences"
 msgstr "პარამეტრები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#, fuzzy
 msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
+msgstr "გამართვა ფოსტა პარამეტრები და"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 #, fuzzy
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "კონფიგურირება და"
+msgstr "გამართვა და"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure your email accounts here"
-msgstr "კონფიგურირება ანგარიშები"
+msgstr "გამართვა ელფოსტა ანგარიშები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
@@ -11472,26 +11716,27 @@ msgstr "Evolution Mail"
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
 msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution ანგარიშები"
+msgstr "Evolution ფოსტა ანგარიშები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Mail component"
-msgstr "Evolution"
+msgstr "Evolution ფოსტა"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
 msgid "Evolution Mail composer"
-msgstr "Evolution"
+msgstr "Evolution ფოსტა"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
 msgid "Evolution Mail composer configuration control"
-msgstr "Evolution"
+msgstr "Evolution ფოსტა"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
 msgid "Evolution Mail preferences control"
-msgstr ""
+msgstr "Evolution ფოსტა პარამეტრები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
@@ -11499,8 +11744,9 @@ msgstr ""
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
 #: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+#, fuzzy
 msgid "Mail"
-msgstr ""
+msgstr "ფოსტა"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: ../mail/em-account-prefs.c:531
@@ -11513,13 +11759,15 @@ msgid "Mail Preferences"
 msgstr "ფოსტის პარამეტრები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
 msgid "_Mail"
-msgstr ""
+msgstr "ფოსტა"
 
 #: ../mail/em-account-editor.c:403
 #, c-format
+#, fuzzy
 msgid "%s License Agreement"
-msgstr ""
+msgstr "წმ ლიცენზია"
 
 #: ../mail/em-account-editor.c:410
 #, fuzzy, c-format
@@ -11528,7 +11776,7 @@ msgid ""
 "Please read carefully the license agreement\n"
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
-msgstr "n"
+msgstr "წმ არა"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:496
@@ -11542,7 +11790,6 @@ msgid "Ask for each message"
 msgstr "კითხვა"
 
 #: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
-#, fuzzy
 msgid "Identity"
 msgstr "იდენტურობა"
 
@@ -11551,8 +11798,9 @@ msgid "Receiving Email"
 msgstr "ფოსტის მიღება"
 
 #: ../mail/em-account-editor.c:2013
+#, fuzzy
 msgid "Automatically check for _new mail every"
-msgstr ""
+msgstr "ავრომატურად ახალი ფოსტა"
 
 #: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
@@ -11577,7 +11825,7 @@ msgstr "მიღების ოფციები"
 #: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 #, fuzzy
 msgid "Checking for New Mail"
-msgstr "ახალი"
+msgstr "ახალი ფოსტა"
 
 #: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 #, fuzzy
@@ -11590,25 +11838,24 @@ msgstr "ევოლუშენ ანგარიშების ასის�
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:409
-#, fuzzy
 msgid "Disable"
 msgstr "გამორთე"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:411
+#, fuzzy
 msgid "Enable"
-msgstr ""
+msgstr "ჩართვა"
 
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:466
-#, fuzzy
 msgid "[Default]"
-msgstr "ნაგულისხმევი"
+msgstr "[ნაგულისხმევი]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "აქტიური"
 
@@ -11628,7 +11875,7 @@ msgstr "უსახელო"
 #: ../mail/em-composer-prefs.c:936
 #, fuzzy
 msgid "Language(s)"
-msgstr "ენა"
+msgstr "ენა წმ"
 
 #: ../mail/em-composer-prefs.c:979
 #, fuzzy
@@ -11638,7 +11885,7 @@ msgstr "დამატება"
 #: ../mail/em-composer-prefs.c:999
 #, fuzzy
 msgid "Signature(s)"
-msgstr "ხელმოწერა"
+msgstr "ხელმოწერა წმ"
 
 #: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
@@ -11653,19 +11900,22 @@ msgstr "უცნობი"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: ../mail/em-composer-utils.c:1713
+#, fuzzy
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
-msgstr ""
+msgstr "ჩართ. წელი თვე დღე ეთ წუთი გამგზავნი:"
 
 #: ../mail/em-filter-editor.c:155
+#, fuzzy
 msgid "_Filter Rules"
-msgstr ""
+msgstr "ფილტრი"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
+#, fuzzy
 msgid "Adjust Score"
-msgstr ""
+msgstr "ქულა"
 
 #: ../mail/em-filter-i18n.h:3
 #, fuzzy
@@ -11673,20 +11923,23 @@ msgid "Assign Color"
 msgstr "მიანიჭე ფერი"
 
 #: ../mail/em-filter-i18n.h:4
+#, fuzzy
 msgid "Assign Score"
-msgstr ""
+msgstr "მიანიჭე ქულა"
 
 #: ../mail/em-filter-i18n.h:5
+#, fuzzy
 msgid "Attachments"
-msgstr ""
+msgstr "დანართები"
 
 #: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:7
+#, fuzzy
 msgid "contains"
-msgstr ""
+msgstr "შეიცავს"
 
 #: ../mail/em-filter-i18n.h:8
 #, fuzzy
@@ -11701,35 +11954,41 @@ msgstr "თარიღი"
 #: ../mail/em-filter-i18n.h:10
 #, fuzzy
 msgid "Date sent"
-msgstr "თარიღი"
+msgstr "თარიღი გაგზავნილი"
 
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:13
+#, fuzzy
 msgid "does not contain"
-msgstr ""
+msgstr "არა შეიცავს"
 
 #: ../mail/em-filter-i18n.h:14
+#, fuzzy
 msgid "does not end with"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:15
+#, fuzzy
 msgid "does not exist"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:16
+#, fuzzy
 msgid "does not return"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:17
+#, fuzzy
 msgid "does not sound like"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:18
+#, fuzzy
 msgid "does not start with"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
@@ -11752,11 +12011,11 @@ msgid "exists"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:24
+#, fuzzy
 msgid "Expression"
-msgstr ""
+msgstr "გამოხატვა"
 
 #: ../mail/em-filter-i18n.h:25
-#, fuzzy
 msgid "Follow Up"
 msgstr "მიყოლა ზემოთ"
 
@@ -11781,16 +12040,19 @@ msgid "is greater than"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:32
+#, fuzzy
 msgid "is less than"
-msgstr ""
+msgstr "ნაკლები"
 
 #: ../mail/em-filter-i18n.h:33
+#, fuzzy
 msgid "is not"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:34
+#, fuzzy
 msgid "is not Flagged"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
@@ -11803,13 +12065,13 @@ msgid "Junk Test"
 msgstr "ტესტი"
 
 #: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
-#, fuzzy
 msgid "Label"
 msgstr "სათაური"
 
 #: ../mail/em-filter-i18n.h:38
+#, fuzzy
 msgid "Mailing list"
-msgstr ""
+msgstr "სია"
 
 #: ../mail/em-filter-i18n.h:39
 #, fuzzy
@@ -11819,12 +12081,12 @@ msgstr "ყველა"
 #: ../mail/em-filter-i18n.h:40
 #, fuzzy
 msgid "Message Body"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება ტანი"
 
 #: ../mail/em-filter-i18n.h:41
 #, fuzzy
 msgid "Message Header"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება ზედა კოლონტიტული"
 
 #: ../mail/em-filter-i18n.h:42
 #, fuzzy
@@ -11834,12 +12096,12 @@ msgstr "შეტყობინება"
 #: ../mail/em-filter-i18n.h:43
 #, fuzzy
 msgid "Message is not Junk"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება არა"
 
 #: ../mail/em-filter-i18n.h:44
 #, fuzzy
 msgid "Move to Folder"
-msgstr "-სკენ საქაღალდე"
+msgstr "გადატანა -სკენ საქაღალდე"
 
 #: ../mail/em-filter-i18n.h:45
 #, fuzzy
@@ -11860,8 +12122,9 @@ msgid "Recipients"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:49
+#, fuzzy
 msgid "Regex Match"
-msgstr ""
+msgstr "Regex"
 
 #: ../mail/em-filter-i18n.h:50
 #, fuzzy
@@ -11877,8 +12140,9 @@ msgid "returns greater than"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:53
+#, fuzzy
 msgid "returns less than"
-msgstr ""
+msgstr "ნაკლები"
 
 #: ../mail/em-filter-i18n.h:54
 #, fuzzy
@@ -11886,12 +12150,14 @@ msgid "Run Program"
 msgstr "გაშვება პროგრამა"
 
 #: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#, fuzzy
 msgid "Score"
-msgstr ""
+msgstr "ქულა"
 
 #: ../mail/em-filter-i18n.h:56
+#, fuzzy
 msgid "Sender"
-msgstr ""
+msgstr "გამგზავნი"
 
 #: ../mail/em-filter-i18n.h:57
 #, fuzzy
@@ -11901,7 +12167,7 @@ msgstr "სტატუსი"
 #: ../mail/em-filter-i18n.h:58
 #, fuzzy
 msgid "Size (kB)"
-msgstr "ზომა"
+msgstr "ზომა კბ"
 
 #: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
@@ -11910,11 +12176,12 @@ msgstr ""
 #: ../mail/em-filter-i18n.h:60
 #, fuzzy
 msgid "Source Account"
-msgstr "ანგარიში"
+msgstr "წყარო ანგარიში"
 
 #: ../mail/em-filter-i18n.h:61
+#, fuzzy
 msgid "Specific header"
-msgstr ""
+msgstr "თავსართი"
 
 #: ../mail/em-filter-i18n.h:62
 msgid "starts with"
@@ -11947,7 +12214,7 @@ msgstr ""
 #: ../mail/em-folder-browser.c:144
 #, fuzzy
 msgid "C_reate Search Folder From Search..."
-msgstr "C ძებნა საქაღალდე ვისგან ძებნა."
+msgstr "C ძებნა საქაღალდე -დან ძებნა."
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
@@ -11956,15 +12223,13 @@ msgstr "C ძებნა საქაღალდე ვისგან ძე�
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "სულ:"
-msgstr[1] ""
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:163
 #, fuzzy
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "შემდეგი შეტყობინება"
-msgstr[1] "შემდეგი შეტყობინება"
+msgstr[0] "წაუკითხავად:"
 
 #: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:3
@@ -11977,14 +12242,13 @@ msgid "<click here to select a folder>"
 msgstr ""
 
 #: ../mail/em-folder-selector.c:261
-#, fuzzy
 msgid "Create"
 msgstr "შექმნა"
 
 #: ../mail/em-folder-selector.c:265
 #, fuzzy
 msgid "Folder _name:"
-msgstr "საქაღალდე:"
+msgstr "საქაღალდე სახელი:"
 
 #: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
 #: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
@@ -12012,8 +12276,9 @@ msgid "Outbox"
 msgstr ""
 
 #: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
+#, fuzzy
 msgid "Sent"
-msgstr ""
+msgstr "გაგზავნა"
 
 #: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
@@ -12022,31 +12287,32 @@ msgstr "იტვირთება...."
 #: ../mail/em-folder-tree.c:694
 #, fuzzy
 msgid "Mail Folder Tree"
-msgstr "საქაღალდე განშტოება"
+msgstr "ფოსტა საქაღალდე განშტოება"
 
 #: ../mail/em-folder-tree.c:854
 #, fuzzy, c-format
 msgid "Moving folder %s"
-msgstr "გადატანის პროცესში"
+msgstr "გადატანის პროცესში წმ"
 
 #: ../mail/em-folder-tree.c:856
 #, fuzzy, c-format
 msgid "Copying folder %s"
-msgstr "ვაკოპირებ"
+msgstr "ვაკოპირებ წმ"
 
 #: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
-msgstr "გადატანის პროცესში"
+msgstr "გადატანის პროცესში წმ"
 
 #: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
-msgstr "ვაკოპირებ"
+msgstr "ვაკოპირებ წმ"
 
 #: ../mail/em-folder-tree.c:881
+#, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 #, fuzzy
@@ -12056,12 +12322,12 @@ msgstr "დააკოპირე -სკენ საქაღალდე"
 #: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 #, fuzzy
 msgid "_Move to Folder"
-msgstr "-სკენ საქაღალდე"
+msgstr "გადატანა -სკენ საქაღალდე"
 
 #: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "სკანირება"
+msgstr "სკანირება - წმ"
 
 #: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
@@ -12074,52 +12340,54 @@ msgstr "_ხედი"
 #: ../mail/em-folder-tree.c:2043
 #, fuzzy
 msgid "Open in _New Window"
-msgstr "გახსენი ახალი ფანჯარა"
+msgstr "გახსნა - ახალი ფანჯარა"
 
 #: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_დააკოპირე..."
 
 #: ../mail/em-folder-tree.c:2048
-#, fuzzy
 msgid "_Move..."
-msgstr "გადატანა."
+msgstr "_გადატანა..."
 
 #. FIXME: need to disable for nochildren folders
 #: ../mail/em-folder-tree.c:2052
 #, fuzzy
 msgid "_New Folder..."
-msgstr "_ახალი საქაღალდე..."
+msgstr "ახალი საქაღალდე."
 
 #: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_გადარქმევა..."
 
 #: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
-#, fuzzy
 msgid "_Empty Trash"
 msgstr "_სანაგვე ყუთის დაცარიელება"
 
 #: ../mail/em-folder-utils.c:104
 #, c-format
+#, fuzzy
 msgid "Copying `%s' to `%s'"
-msgstr ""
+msgstr "ვაკოპირებ წმ -სკენ წმ"
 
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
 #: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
+#, fuzzy
 msgid "Select folder"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
+#, fuzzy
 msgid "C_opy"
-msgstr ""
+msgstr "C"
 
 #: ../mail/em-folder-utils.c:581
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
+#, fuzzy
 msgid "Creating folder `%s'"
-msgstr ""
+msgstr "შექმნა წმ"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
@@ -12131,12 +12399,14 @@ msgstr "შექმნა"
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:388
+#, fuzzy
 msgid "Specify where to create the folder:"
-msgstr ""
+msgstr "-სკენ:"
 
 #: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
+#, fuzzy
 msgid "_Reply to Sender"
-msgstr ""
+msgstr "პასუხი -სკენ გამგზავნი"
 
 #: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
@@ -12152,8 +12422,9 @@ msgid "U_ndelete"
 msgstr ""
 
 #: ../mail/em-folder-view.c:1093
+#, fuzzy
 msgid "_Move to Folder..."
-msgstr ""
+msgstr "გადატანა -სკენ საქაღალდე."
 
 #: ../mail/em-folder-view.c:1094
 #, fuzzy
@@ -12163,11 +12434,12 @@ msgstr "დააკოპირე -სკენ საქაღალდე."
 #: ../mail/em-folder-view.c:1097
 #, fuzzy
 msgid "Mar_k as Read"
-msgstr "წაკითხული"
+msgstr "მარ წაკითხვა"
 
 #: ../mail/em-folder-view.c:1098
+#, fuzzy
 msgid "Mark as _Unread"
-msgstr ""
+msgstr "წაუკითხავად"
 
 #: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
@@ -12192,19 +12464,17 @@ msgid "Mark for Follo_w Up..."
 msgstr "ზემოთ."
 
 #: ../mail/em-folder-view.c:1105
-#, fuzzy
 msgid "_Label"
-msgstr "სათაური"
+msgstr "_სათაური"
 
 #: ../mail/em-folder-view.c:1106
-#, fuzzy
 msgid "_None"
-msgstr "არა"
+msgstr "_არა"
 
 #: ../mail/em-folder-view.c:1111
 #, fuzzy
 msgid "Fla_g Completed"
-msgstr "შესრულებულია"
+msgstr "დასრულებულია"
 
 #: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
@@ -12213,11 +12483,12 @@ msgstr ""
 #: ../mail/em-folder-view.c:1115
 #, fuzzy
 msgid "Crea_te Rule From Message"
-msgstr "ვისგან შეტყობინება"
+msgstr "წესი -დან შეტყობინება"
 
 #: ../mail/em-folder-view.c:1116
+#, fuzzy
 msgid "Search Folder from _Subject"
-msgstr ""
+msgstr "ძებნა საქაღალდე თემა"
 
 #: ../mail/em-folder-view.c:1117
 #, fuzzy
@@ -12237,22 +12508,22 @@ msgstr "ძებნა საქაღალდე სია"
 #: ../mail/em-folder-view.c:1123
 #, fuzzy
 msgid "Filter on Sub_ject"
-msgstr "ფილტრი"
+msgstr "ფილტრი ჩართულია"
 
 #: ../mail/em-folder-view.c:1124
 #, fuzzy
 msgid "Filter on Sen_der"
-msgstr "ფილტრი"
+msgstr "ფილტრი ჩართულია"
 
 #: ../mail/em-folder-view.c:1125
 #, fuzzy
 msgid "Filter on Re_cipients"
-msgstr "ფილტრი"
+msgstr "ფილტრი ჩართულია"
 
 #: ../mail/em-folder-view.c:1126
 #, fuzzy
 msgid "Filter on _Mailing List"
-msgstr "ფილტრი სია"
+msgstr "ფილტრი ჩართულია სია"
 
 #. default charset used in mail view
 #: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
@@ -12284,7 +12555,7 @@ msgstr "შექმნა ძებნა საქაღალდე"
 #: ../mail/em-folder-view.c:2463
 #, fuzzy
 msgid "_From this Address"
-msgstr "ვისგან მისამართი"
+msgstr "-დან მისამართი"
 
 #: ../mail/em-folder-view.c:2464
 #, fuzzy
@@ -12294,13 +12565,14 @@ msgstr "ვის მისამართი"
 #: ../mail/em-folder-view.c:2818
 #, fuzzy, c-format
 msgid "Click to mail %s"
-msgstr "-სკენ"
+msgstr "-სკენ ფოსტა წმ"
 
 #. message-search popup match count string
 #: ../mail/em-format-html-display.c:496
 #, c-format
+#, fuzzy
 msgid "Matches: %d"
-msgstr ""
+msgstr "ემთხვევა"
 
 #: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
@@ -12311,11 +12583,12 @@ msgstr ""
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "არა."
+msgstr "არა არა."
 
 #: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
+#, fuzzy
 msgid "Valid signature"
-msgstr ""
+msgstr "დამოწმებული"
 
 #: ../mail/em-format-html-display.c:757
 #, fuzzy
@@ -12330,21 +12603,23 @@ msgid "Invalid signature"
 msgstr "არასწორი"
 
 #: ../mail/em-format-html-display.c:758
+#, fuzzy
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr ""
+msgstr "- -."
 
 #: ../mail/em-format-html-display.c:759
+#, fuzzy
 msgid "Valid signature, cannot verify sender"
-msgstr ""
+msgstr "დამოწმებული"
 
 #: ../mail/em-format-html-display.c:759
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr "a."
+msgstr "a -."
 
 #: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
@@ -12355,11 +12630,12 @@ msgstr ""
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr "ინტერნეტი."
+msgstr "არა - ინტერნეტი."
 
 #: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
+#, fuzzy
 msgid "Encrypted, weak"
-msgstr ""
+msgstr "დაშიფრული"
 
 #: ../mail/em-format-html-display.c:766
 #, fuzzy
@@ -12367,22 +12643,24 @@ msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
-msgstr "a -სკენ a."
+msgstr "a არა -სკენ - - a -."
 
 #: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
+#, fuzzy
 msgid "Encrypted"
-msgstr ""
+msgstr "დაშიფრული"
 
 #: ../mail/em-format-html-display.c:767
 #, fuzzy
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "-სკენ."
+msgstr "-სკენ -."
 
 #: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
+#, fuzzy
 msgid "Encrypted, strong"
-msgstr ""
+msgstr "დაშიფრული"
 
 #: ../mail/em-format-html-display.c:768
 #, fuzzy
@@ -12390,47 +12668,50 @@ msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
-msgstr "a -სკენ a."
+msgstr "a -სკენ - - a -."
 
 #: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 #, fuzzy
 msgid "_View Certificate"
-msgstr "ხედი"
+msgstr "ჩვენება სერთიფიკატი"
 
 #: ../mail/em-format-html-display.c:884
+#, fuzzy
 msgid "This certificate is not viewable"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-format-html-display.c:1174
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "შესრულებულია B M"
+msgstr "დასრულებულია ჩართულია B Y M"
 
 #: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr ""
 
 #: ../mail/em-format-html-display.c:1185
+#, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr ""
+msgstr "B Y M"
 
 #: ../mail/em-format-html-display.c:1245
 #, fuzzy
 msgid "_View Inline"
-msgstr "ხედი"
+msgstr "ჩვენება"
 
 #: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_დამალვა"
 
 #: ../mail/em-format-html-display.c:1247
+#, fuzzy
 msgid "_Fit to Width"
-msgstr ""
+msgstr "-სკენ სიგანე"
 
 #: ../mail/em-format-html-display.c:1248
 #, fuzzy
 msgid "Show _Original Size"
-msgstr "ანახე ზომა"
+msgstr "ჩვენება ორიგინალი ზომა"
 
 #: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
@@ -12440,30 +12721,26 @@ msgstr ""
 #: ../mail/em-format-html-display.c:1874
 #, fuzzy
 msgid "Select folder to save all attachments..."
-msgstr "-სკენ."
+msgstr "ამორჩევა -სკენ შენახვა ყველა."
 
 #: ../mail/em-format-html-display.c:1921
-#, fuzzy
 msgid "_Save Selected..."
-msgstr "შენახვა."
+msgstr "მონიშნულის _შენახვა..."
 
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:1988
 #, fuzzy, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
-msgstr[0] "ჩამატება."
-msgstr[1] "ჩამატება."
+msgstr[0] "nt"
 
 #: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
-#, fuzzy
 msgid "S_ave"
-msgstr "S"
+msgstr "და_მახსოვრება"
 
 #: ../mail/em-format-html-display.c:2006
-#, fuzzy
 msgid "S_ave All"
-msgstr "S ყველა"
+msgstr "ყველას დამ_ახსოვრება"
 
 #: ../mail/em-format-html-display.c:2067
 #, fuzzy
@@ -12473,16 +12750,18 @@ msgstr "არა"
 #: ../mail/em-format-html-print.c:130
 #, fuzzy, c-format
 msgid "Page %d of %d"
-msgstr "გვერდი"
+msgstr "გვერდი -"
 
 #: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
+#, fuzzy
 msgid "Retrieving `%s'"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/em-format-html.c:610
+#, fuzzy
 msgid "Valid signature but cannot verify sender"
-msgstr ""
+msgstr "დამოწმებული"
 
 #: ../mail/em-format-html.c:881
 #, fuzzy
@@ -12492,32 +12771,32 @@ msgstr "უვარგისი."
 #: ../mail/em-format-html.c:911
 #, fuzzy, c-format
 msgid "Pointer to FTP site (%s)"
-msgstr "-სკენ FTP"
+msgstr "მიმთითებელი -სკენ FTP წმ"
 
 #: ../mail/em-format-html.c:922
 #, fuzzy, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "-სკენ"
+msgstr "მიმთითებელი -სკენ ფაილი წმ ეთ წმ"
 
 #: ../mail/em-format-html.c:924
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
-msgstr "-სკენ"
+msgstr "მიმთითებელი -სკენ ფაილი წმ"
 
 #: ../mail/em-format-html.c:945
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
-msgstr "-სკენ"
+msgstr "მიმთითებელი -სკენ წმ"
 
 #: ../mail/em-format-html.c:956
 #, fuzzy, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "-სკენ უცნობი ტიპი"
+msgstr "მიმთითებელი -სკენ უცნობი წმ"
 
 #: ../mail/em-format-html.c:1183
 #, fuzzy
 msgid "Formatting message"
-msgstr "მიმდინარეობს ფორმატირება"
+msgstr "ფორმატირება"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
@@ -12527,31 +12806,34 @@ msgstr "ვისგან"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
+#, fuzzy
 msgid "Reply-To"
-msgstr ""
+msgstr "პასუხი ვის"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
-#, fuzzy
 msgid "To"
 msgstr "ვის"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
+#, fuzzy
 msgid "Cc"
-msgstr ""
+msgstr "ასლი"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
+#, fuzzy
 msgid "Bcc"
-msgstr ""
+msgstr "უხილავი ასლი"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:1001
+#, fuzzy
 msgid "Mailer"
-msgstr ""
+msgstr "გამომგზავნი"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
 #: ../mail/em-format-html.c:1615
@@ -12579,17 +12861,19 @@ msgstr ""
 
 #: ../mail/em-format.c:1102
 #, c-format
+#, fuzzy
 msgid "%s attachment"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S უცნობი შეცდომა"
+msgstr "არა S უცნობი შეცდომა"
 
 #: ../mail/em-format.c:1271 ../mail/em-format.c:1427
+#, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
+msgstr "არა."
 
 #: ../mail/em-format.c:1279
 #, fuzzy
@@ -12619,75 +12903,88 @@ msgid "Once per day"
 msgstr "დღეში ერთხელ"
 
 #: ../mail/em-mailer-prefs.c:105
+#, fuzzy
 msgid "Once per week"
-msgstr ""
+msgstr "კვირა"
 
 #: ../mail/em-mailer-prefs.c:106
+#, fuzzy
 msgid "Once per month"
-msgstr ""
+msgstr "თვე"
 
 #: ../mail/em-migrate.c:1209
+#, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr ""
+msgstr "და - Evolution საფოსტო ყუთი Evolution x არა Evolution."
 
 #: ../mail/em-migrate.c:1648
 #, c-format
+#, fuzzy
 msgid "Unable to create new folder `%s': %s"
-msgstr ""
+msgstr "-სკენ ახალი წმ წმ"
 
 #: ../mail/em-migrate.c:1674
 #, c-format
+#, fuzzy
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr ""
+msgstr "-სკენ კოპირება წმ -სკენ წმ წმ"
 
 #: ../mail/em-migrate.c:1859
 #, c-format
+#, fuzzy
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr ""
+msgstr "-სკენ ეთ წმ წმ"
 
 #: ../mail/em-migrate.c:2063
 #, c-format
+#, fuzzy
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr ""
+msgstr "-სკენ გახსნა POP ჩართულია წმ წმ"
 
 #: ../mail/em-migrate.c:2077
 #, c-format
+#, fuzzy
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
+msgstr "-სკენ ჩართულია წმ წმ"
 
 #: ../mail/em-migrate.c:2106
 #, c-format
+#, fuzzy
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr ""
+msgstr "-სკენ კოპირება ჩართულია წმ წმ"
 
 #: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ"
+msgstr "ვერ განხორციელდა -სკენ ფოსტა წმ წმ"
 
 #: ../mail/em-migrate.c:2712
 #, c-format
+#, fuzzy
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr ""
+msgstr "-სკენ ფოსტა ეთ წმ წმ"
 
 #: ../mail/em-migrate.c:2731
+#, fuzzy
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr ""
+msgstr "-სკენ Evolution არა ან."
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#, fuzzy
 msgid "_Reply to sender"
-msgstr ""
+msgstr "პასუხი -სკენ"
 
 #: ../mail/em-popup.c:558 ../mail/em-popup.c:569
 #: ../ui/evolution-mail-message.xml.h:83
+#, fuzzy
 msgid "Reply to _List"
-msgstr ""
+msgstr "პასუხი -სკენ სია"
 
 #: ../mail/em-popup.c:620
 msgid "_Open Link in Browser"
@@ -12706,7 +13003,7 @@ msgstr "დამატება -სკენ მისამართი"
 #: ../mail/em-subscribe-editor.c:615
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "სუპორტი ჩართული."
+msgstr "არა სუპორტი ან არა ჩართული."
 
 #: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
@@ -12719,42 +13016,44 @@ msgstr "საქაღალდე"
 
 #. FIXME: This is just to get the shadow, is there a better way?
 #: ../mail/em-subscribe-editor.c:869
+#, fuzzy
 msgid "Please select a server."
-msgstr ""
+msgstr "a."
 
 #: ../mail/em-subscribe-editor.c:890
+#, fuzzy
 msgid "No server has been selected"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-utils.c:124
 #, fuzzy
 msgid "Do not show this message again."
-msgstr "პროგრამა."
+msgstr "არა."
 
 #: ../mail/em-utils.c:319
 #, fuzzy
 msgid "Message Filters"
-msgstr "შეტყობინება ფილტრები"
+msgstr "შეტყობინების ფილტრები"
 
 #: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr ""
 
 #: ../mail/em-utils.c:634
-#, fuzzy
 msgid "Save Message..."
-msgstr "შენახვა შეტყობინება."
+msgstr "შეტყობინების შენახვა..."
 
 #: ../mail/em-utils.c:683
 #, fuzzy
 msgid "Add address"
-msgstr "დამატება"
+msgstr "მისამართის დამატება"
 
 #. Drop filename for messages from a mailbox
 #: ../mail/em-utils.c:1167
 #, c-format
+#, fuzzy
 msgid "Messages from %s"
-msgstr ""
+msgstr "შეტყობინებები წმ"
 
 #: ../mail/em-vfolder-editor.c:112
 #, fuzzy
@@ -12779,7 +13078,7 @@ msgstr "ავტომატური"
 #: ../mail/evolution-mail.schemas.in.in.h:3
 #, fuzzy
 msgid "Check incoming mail being junk"
-msgstr "შემოწმება"
+msgstr "შემოწმება შემომავალი ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
@@ -12792,32 +13091,32 @@ msgstr ""
 #: ../mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
 msgid "Composer Window default height"
-msgstr "ფანჯარა ნაგულისხმევი"
+msgstr "ფანჯარა ნაგულისხმები სიმაღლე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
 msgid "Composer Window default width"
-msgstr "ფანჯარა ნაგულისხმევი"
+msgstr "ფანჯარა ნაგულისხმები სიგანე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
-msgstr "ნაგულისხმევი -სკენ"
+msgstr "ნაგულისხმევი - -სკენ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
-msgstr "ნაგულისხმევი -სკენ."
+msgstr "ნაგულისხმევი - -სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
-msgstr "ნაგულისხმევი -სკენ"
+msgstr "ნაგულისხმევი - -სკენ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
-msgstr "ნაგულისხმევი -სკენ."
+msgstr "ნაგულისხმევი - -სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
@@ -12827,17 +13126,17 @@ msgstr "ნაგულისხმევი"
 #: ../mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
 msgid "Default height of the Composer Window"
-msgstr "ნაგულისხმევი ფანჯარა"
+msgstr "ნაგულისხმევი სიმაღლე - ფანჯარა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
-msgstr "ნაგულისხმევი შეტყობინება ფანჯარა"
+msgstr "ნაგულისხმევი სიმაღლე - შეტყობინება ფანჯარა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default height of the Subscribe dialog"
-msgstr "ნაგულისხმევი"
+msgstr "ნაგულისხმევი სიმაღლე - ხელის მოწერა დიალოგი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:16
 #, fuzzy
@@ -12847,116 +13146,121 @@ msgstr "ნაგულისხმევი"
 #: ../mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
-msgstr "ნაგულისხმევი ფანჯარა"
+msgstr "ნაგულისხმევი სიგანე - ფანჯარა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
-msgstr "ნაგულისხმევი შეტყობინება ფანჯარა"
+msgstr "ნაგულისხმევი სიგანე - შეტყობინება ფანჯარა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Default width of the Subscribe dialog"
-msgstr "ნაგულისხმევი"
+msgstr "ნაგულისხმევი სიგანე - ხელის მოწერა დიალოგი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Draw spelling error indicators on words as you type."
-msgstr "შეცდომა ტიპი."
+msgstr "ასახვა შეცდომა ჩართულია."
 
 #: ../mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
-msgstr "ცარიელი სანაგვე ყუთი"
+msgstr "ცარიელი სანაგვე ყუთი ჩართულია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "ცარიელი სანაგვე ყუთი Evolution."
+msgstr "ცარიელი ყველა სანაგვე ყუთი Evolution."
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "a."
+msgstr "ჩართვა რეჟიმი a ფოსტა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
+#, fuzzy
 msgid "Enable/disable caret mode"
-msgstr ""
+msgstr "ჩართვა გამორთვა რეჟიმი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:25
 #, fuzzy
 msgid "Height of the message-list pane"
-msgstr "სიმაღლე"
+msgstr "სიმაღლე - სია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:26
 #, fuzzy
 msgid "Height of the message-list pane."
-msgstr "სიმაღლე."
+msgstr "სიმაღლე - სია."
 
 #: ../mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
-msgstr "a -სკენ -სკენ."
+msgstr "a -სკენ გახსნა ან მეტი ეთ -სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
-msgstr ""
+msgstr "a a Evolution ნებისმიერი - სია -სკენ a - GNOME წმ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
 msgid "Last time empty trash was run"
-msgstr ""
+msgstr "ბოლო ურნა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of Labels and their associated colors"
-msgstr "სია და"
+msgstr "სია - და"
 
 #: ../mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
 msgid "List of accepted licenses"
-msgstr ""
+msgstr "სია -"
 
 #: ../mail/evolution-mail.schemas.in.in.h:32
+#, fuzzy
 msgid "List of accounts"
-msgstr ""
+msgstr "სია - ანგარიშები"
 
 #: ../mail/evolution-mail.schemas.in.in.h:33
 #, fuzzy
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr "სია ანგარიშები -სკენ Evolution -სკენ ანგარიშები."
+msgstr "სია - ანგარიშები -სკენ ფოსტა - Evolution სია შეიცავს -სკენ ფოსტა ანგარიშები."
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "List of custom headers and whether they are enabled."
-msgstr "სია და ჩართული."
+msgstr "სია - და ჩართული."
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
-msgstr "სია -სკენ Evolution hex."
+msgstr "სია - -სკენ ფოსტა - Evolution სია შეიცავს სახელი HTML."
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "List of mime types to check for bonobo component viewers"
-msgstr "სია -სკენ"
+msgstr "სია - -სკენ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "List of protocol names whose license has been accepted."
-msgstr "სია."
+msgstr "სია - ვისი."
 
 #: ../mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "Load images for HTML messages over http"
-msgstr "ჩატვირთვა http"
+msgstr "ჩატვირთვა HTML"
 
 #: ../mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
@@ -12964,167 +13268,184 @@ msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
-msgstr "ჩატვირთვა http არასოდეს ჩატვირთვა ყოველთვის"
+msgstr "ჩატვირთვა HTML წმ არასოდეს გამორთულია ჩატვირთვა - ფოსტა ყოველთვის გამორთულია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
+#, fuzzy
 msgid "Log filter actions"
-msgstr ""
+msgstr "ჟურნალი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:41
+#, fuzzy
 msgid "Log filter actions to the specified log file."
-msgstr ""
+msgstr "ჟურნალი -სკენ ფაილი."
 
 #: ../mail/evolution-mail.schemas.in.in.h:42
+#, fuzzy
 msgid "Logfile to log filter actions"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
 msgid "Logfile to log filter actions."
-msgstr ""
+msgstr "-სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
 msgid "Mark as Seen after specified timeout"
-msgstr ""
+msgstr "დაყოვნების დრო"
 
 #: ../mail/evolution-mail.schemas.in.in.h:45
+#, fuzzy
 msgid "Mark as Seen after specified timeout."
-msgstr ""
+msgstr "დაყოვნების დრო."
 
 #: ../mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "Mark citations in the message \"Preview\""
-msgstr "წინასწარ ნახვა"
+msgstr "- წინასწარ ნახვა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Mark citations in the message \"Preview\"."
-msgstr "წინასწარ ნახვა."
+msgstr "- წინასწარ ნახვა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:48
 #, fuzzy
 msgid "Message Window default height"
-msgstr "შეტყობინება ფანჯარა ნაგულისხმევი"
+msgstr "შეტყობინება ფანჯარა ნაგულისხმები სიმაღლე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:49
 #, fuzzy
 msgid "Message Window default width"
-msgstr "შეტყობინება ფანჯარა ნაგულისხმევი"
+msgstr "შეტყობინება ფანჯარა ნაგულისხმები სიგანე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება საშუალო"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "Minimum days between emptying the trash on exit"
-msgstr "დღე"
+msgstr "დღე ურნა ჩართულია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "დღე."
+msgstr "ურნა ჩართულია - დღე."
 
 #: ../mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify sound file"
-msgstr "ახალი"
+msgstr "ახალი ფოსტა შეტყობინება ფაილი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:54
 #, fuzzy
 msgid "New Mail Notify type"
-msgstr "ახალი ტიპი"
+msgstr "ახალი ფოსტა შეტყობინება"
 
 #: ../mail/evolution-mail.schemas.in.in.h:55
+#, fuzzy
 msgid "Prompt on empty subject"
-msgstr ""
+msgstr "მოთხოვნა ჩართულია თემა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
+msgstr "მოთხოვნა ან -სკენ a."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
 msgid "Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
+msgstr "მოთხოვნა ან -სკენ a a თემა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
+#, fuzzy
 msgid "Prompt when user expunges"
-msgstr ""
+msgstr "მოთხოვნა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
 msgid "Prompt when user only fills Bcc"
-msgstr ""
+msgstr "მოთხოვნა უხილავი ასლი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:60
+#, fuzzy
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
+msgstr "მოთხოვნა -სკენ გახსნა ან მეტი ეთ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr ""
+msgstr "მოთხოვნა -სკენ HTML ფოსტა -სკენ არა -სკენ HTML ფოსტა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
+msgstr "მოთხოვნა -სკენ a არა ვის ან ასლი."
 
 #: ../mail/evolution-mail.schemas.in.in.h:63
+#, fuzzy
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
+msgstr "მოთხოვნა -სკენ HTML"
 
 #: ../mail/evolution-mail.schemas.in.in.h:64
 #, fuzzy
 msgid "Recognize links in text and replace them."
-msgstr "და."
+msgstr "- ტექსტი და."
 
 #: ../mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Recognize smileys in text and replace them with images."
-msgstr "და."
+msgstr "- ტექსტი და."
 
 #: ../mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
 msgid "Run junk test on incoming mail"
-msgstr ""
+msgstr "გაშვება ჩართულია შემომავალი ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Send HTML mail by default"
-msgstr "გაგზავნა ნაგულისხმევი"
+msgstr "გაგზავნა HTML ფოსტა ნაგულისხმები"
 
 #: ../mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Send HTML mail by default."
-msgstr "გაგზავნა ნაგულისხმევი."
+msgstr "გაგზავნა HTML ფოსტა ნაგულისხმები."
 
 #: ../mail/evolution-mail.schemas.in.in.h:69
 #, fuzzy
 msgid "Show Animations"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show animated images as animations."
-msgstr "ანახე."
+msgstr "ჩვენება."
 
 #: ../mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "ანახე a."
+msgstr "ჩვენება a - სია."
 
 #: ../mail/evolution-mail.schemas.in.in.h:72
 #, fuzzy
 msgid "Show deleted messages in the message-list"
-msgstr "ანახე"
+msgstr "ჩვენება - სია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:75
+#, fuzzy
 msgid "Sound file to play when new mail arrives."
-msgstr ""
+msgstr "ხმა ფაილი -სკენ ახალი ფოსტა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "ტიპი ახალი შეტყობინება -სკენ."
+msgstr "- ახალი ფოსტა ნოიფიკაცია -სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
@@ -13133,29 +13454,32 @@ msgstr ""
 #: ../mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Subscribe dialog default height"
-msgstr "ნაგულისხმევი"
+msgstr "ხელის მოწერა დიალოგი ნაგულისხმები სიმაღლე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:79
 #, fuzzy
 msgid "Subscribe dialog default width"
-msgstr "ნაგულისხმევი"
+msgstr "ხელის მოწერა დიალოგი ნაგულისხმები სიგანე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:80
+#, fuzzy
 msgid "Terminal font"
-msgstr ""
+msgstr "ტერმინალი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr "დღე."
+msgstr "ურნა - დღე."
 
 #: ../mail/evolution-mail.schemas.in.in.h:82
+#, fuzzy
 msgid "The terminal font for mail display"
-msgstr ""
+msgstr "ტერმინალი ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:83
+#, fuzzy
 msgid "The variable width font for mail display"
-msgstr ""
+msgstr "სიგანე ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
@@ -13164,19 +13488,22 @@ msgid ""
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
-msgstr "a და -სკენ&lt; ჩართული&gt; ჩართული -სკენ."
+msgstr "გასაღები შეიცავს a სია - და -სკენ -&lt; თავსართი ჩართული&gt; ჩართული თავსართი -სკენ - ფოსტა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
+#, fuzzy
 msgid "Thread the message list."
-msgstr ""
+msgstr "სია."
 
 #: ../mail/evolution-mail.schemas.in.in.h:86
+#, fuzzy
 msgid "Thread the message-list"
-msgstr ""
+msgstr "სია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:87
+#, fuzzy
 msgid "Thread the message-list based on Subject"
-msgstr ""
+msgstr "სია ჩართულია თემა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
@@ -13191,17 +13518,17 @@ msgstr "დაყოვნების დრო."
 #: ../mail/evolution-mail.schemas.in.in.h:90
 #, fuzzy
 msgid "UID string of the default account."
-msgstr "UID ნაგულისხმევი."
+msgstr "UID სტრიქონი - ნაგულისხმები ანგარიში."
 
 #: ../mail/evolution-mail.schemas.in.in.h:91
 #, fuzzy
 msgid "Use Spamassassin daemon and client"
-msgstr "და"
+msgstr "გამოყენება და"
 
 #: ../mail/evolution-mail.schemas.in.in.h:92
 #, fuzzy
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr "და"
+msgstr "გამოყენება და"
 
 #: ../mail/evolution-mail.schemas.in.in.h:93
 #, fuzzy
@@ -13211,7 +13538,7 @@ msgstr "გამოყენება"
 #: ../mail/evolution-mail.schemas.in.in.h:94
 #, fuzzy
 msgid "Use custom fonts for displaying mail"
-msgstr "გამოყენება"
+msgstr "გამოყენება ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
@@ -13221,65 +13548,69 @@ msgstr "გამოყენება."
 #: ../mail/evolution-mail.schemas.in.in.h:96
 #, fuzzy
 msgid "Use only the local spam tests (no DNS)."
-msgstr "არა."
+msgstr "გამოყენება არა DNS."
 
 #: ../mail/evolution-mail.schemas.in.in.h:97
+#, fuzzy
 msgid "Variable width font"
-msgstr ""
+msgstr "ცვლადი სიგანე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:98
 #, fuzzy
 msgid "View/Bcc menu item is checked"
-msgstr "ხედი"
+msgstr "ჩვენება უხილავი ასლი მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:99
 #, fuzzy
 msgid "View/Bcc menu item is checked."
-msgstr "ხედი."
+msgstr "ჩვენება უხილავი ასლი მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "View/Cc menu item is checked"
-msgstr "ხედი"
+msgstr "ჩვენება ასლი მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:101
 #, fuzzy
 msgid "View/Cc menu item is checked."
-msgstr "ხედი."
+msgstr "ჩვენება ასლი მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:102
 #, fuzzy
 msgid "View/From menu item is checked"
-msgstr "ხედი ვისგან"
+msgstr "ჩვენება -დან მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:103
 #, fuzzy
 msgid "View/From menu item is checked."
-msgstr "ხედი ვისგან."
+msgstr "ჩვენება -დან მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:104
+#, fuzzy
 msgid "View/PostTo menu item is checked"
-msgstr ""
+msgstr "ჩვენება მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:105
+#, fuzzy
 msgid "View/PostTo menu item is checked."
-msgstr ""
+msgstr "ჩვენება მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:106
 #, fuzzy
 msgid "View/ReplyTo menu item is checked"
-msgstr "ხედი"
+msgstr "ჩვენება მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:107
 #, fuzzy
 msgid "View/ReplyTo menu item is checked."
-msgstr "ხედი."
+msgstr "ჩვენება მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:108
+#, fuzzy
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
-msgstr ""
+msgstr "ან არა -სკენ ჩართულია არა შეიცავს პასუხი ვის ან."
 
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
@@ -13292,19 +13623,19 @@ msgstr "ევოლუშენ Elm იმპორტერი"
 #: ../mail/importers/elm-importer.c:382
 #, fuzzy
 msgid "Import mail from Elm."
-msgstr "იმპორტი."
+msgstr "იმპორტი ფოსტა."
 
 #: ../mail/importers/evolution-mbox-importer.c:83
 #: ../mail/importers/evolution-outlook-importer.c:136
 #, fuzzy
 msgid "Destination folder:"
-msgstr "ნიშნულება:"
+msgstr "დაშორება:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 #, fuzzy
 msgid "Select folder to import into"
-msgstr "-სკენ"
+msgstr "ამორჩევა -სკენ იმპორტი"
 
 #: ../mail/importers/evolution-mbox-importer.c:223
 #, fuzzy
@@ -13319,8 +13650,9 @@ msgstr "საფოსტო ყუთი"
 #: ../mail/importers/evolution-outlook-importer.c:262
 #: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
+#, fuzzy
 msgid "Importing `%s'"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
@@ -13331,20 +13663,22 @@ msgstr ""
 
 #: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
+#, fuzzy
 msgid "Importing mailbox"
-msgstr ""
+msgstr "საფოსტო ყუთი"
 
 #: ../mail/importers/mail-importer.c:376
 #, fuzzy, c-format
 msgid "Scanning %s"
-msgstr "სკანირება"
+msgstr "სკანირება წმ"
 
 #: ../mail/importers/netscape-importer.c:74
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
-msgstr "პრიორიტეტი ფილტრი"
+msgstr "პრიორიტეტი ფილტრი წმ"
 
 #: ../mail/importers/netscape-importer.c:663
+#, fuzzy
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13357,32 +13691,36 @@ msgid ""
 "Evolution's scores, and the affected filters use scores instead\n"
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
-msgstr ""
+msgstr "- Netscape ელფოსტა ჩართულია არა - Evolution Evolution ქულები - - არა -სკენ -სკენ და არა a a - პრიორიტეტი ფილტრი Netscape წმ ელფოსტა წმ ქულები და ქულები შემოწმება -სკენ."
 
 #: ../mail/importers/netscape-importer.c:687
+#, fuzzy
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
-msgstr ""
+msgstr "- Netscape ელფოსტა იგნორირება ან არა - Evolution."
 
 #: ../mail/importers/netscape-importer.c:704
+#, fuzzy
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
 "which is not supported in Evolution. Those filters\n"
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
-msgstr ""
+msgstr "- Netscape ელფოსტა - - -სკენ a სტრიქონი არა - Evolution შეცვლილი -სკენ სტრიქონი ან არა -."
 
 #: ../mail/importers/netscape-importer.c:1251
+#, fuzzy
 msgid "Evolution is importing your old Netscape data"
-msgstr ""
+msgstr "Evolution Netscape"
 
 #: ../mail/importers/netscape-importer.c:1708
+#, fuzzy
 msgid "Importing Netscape data"
-msgstr ""
+msgstr "Netscape"
 
 #: ../mail/importers/netscape-importer.c:1908
 #, fuzzy
@@ -13392,13 +13730,14 @@ msgstr "პარამეტრები"
 #: ../mail/importers/netscape-importer.c:1913
 #, fuzzy
 msgid "Mail Filters"
-msgstr "ფილტრები"
+msgstr "ფოსტა ფილტრები"
 
 #: ../mail/importers/netscape-importer.c:1934
+#, fuzzy
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
-msgstr ""
+msgstr "Evolution Netscape ფოსტა ფაილი -სკენ Evolution?"
 
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
@@ -13412,17 +13751,18 @@ msgstr "Evolution"
 #: ../mail/importers/pine-importer.c:434
 #, fuzzy
 msgid "Import mail from Pine."
-msgstr "იმპორტი."
+msgstr "იმპორტი ფოსტა."
 
 #: ../mail/mail-autofilter.c:79
 #, fuzzy, c-format
 msgid "Mail to %s"
-msgstr "-სკენ"
+msgstr "ფოსტა -სკენ წმ"
 
 #: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
+#, fuzzy
 msgid "Mail from %s"
-msgstr ""
+msgstr "ფოსტა წმ"
 
 #: ../mail/mail-autofilter.c:266
 #, c-format
@@ -13431,13 +13771,14 @@ msgstr "თემა არის %s"
 
 #: ../mail/mail-autofilter.c:301
 #, c-format
+#, fuzzy
 msgid "%s mailing list"
-msgstr ""
+msgstr "წმ სია"
 
 #: ../mail/mail-autofilter.c:372
 #, fuzzy
 msgid "Add Filter Rule"
-msgstr "დამატება ფილტრი"
+msgstr "დამატება ფილტრი წესი"
 
 #: ../mail/mail-component.c:521
 #, c-format
@@ -13448,43 +13789,38 @@ msgstr[0] "%d წაშლილია"
 #: ../mail/mail-component.c:523
 #, c-format
 msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:546
 #, c-format
 msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:548
 #, c-format
+#, fuzzy
 msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] ""
+msgstr "გაგზავნილი"
 
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:554
 #, c-format
 msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:556
 #, c-format
 msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:779
 #, fuzzy
 msgid "New Mail Message"
-msgstr "ახალი შეტყობინება"
+msgstr "ახალი ფოსტა შეტყობინება"
 
 #: ../mail/mail-component.c:780
 msgid "_Mail Message"
@@ -13493,12 +13829,12 @@ msgstr "_წერილი"
 #: ../mail/mail-component.c:781
 #, fuzzy
 msgid "Compose a new mail message"
-msgstr "a"
+msgstr "შექმნა a ახალი ფოსტა"
 
 #: ../mail/mail-component.c:787
 #, fuzzy
 msgid "New Mail Folder"
-msgstr "ახალი საქაღალდე"
+msgstr "ახალი ფოსტა საქაღალდე"
 
 #: ../mail/mail-component.c:788
 msgid "Mail _Folder"
@@ -13507,12 +13843,12 @@ msgstr "წერილების _საქაღალდე"
 #: ../mail/mail-component.c:789
 #, fuzzy
 msgid "Create a new mail folder"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი ფოსტა"
 
 #: ../mail/mail-component.c:933
 #, fuzzy
 msgid "Failed upgrading Mail settings or folders."
-msgstr "ოპერაცია ვერ/არ ჩატარდა."
+msgstr "ვერ განხორციელდა ფოსტა ან."
 
 #: ../mail/mail-config.c:85
 msgid "I_mportant"
@@ -13520,9 +13856,8 @@ msgstr "_მნიშვნელოვანი"
 
 #. red
 #: ../mail/mail-config.c:86
-#, fuzzy
 msgid "_Work"
-msgstr "სამსახური"
+msgstr "_სამსახური"
 
 #. orange
 #: ../mail/mail-config.c:87
@@ -13531,9 +13866,8 @@ msgstr "_პირადი"
 
 #. forest green
 #: ../mail/mail-config.c:88
-#, fuzzy
 msgid "_To Do"
-msgstr "ვის"
+msgstr "_გასაკეთებელი"
 
 #. blue
 #: ../mail/mail-config.c:89
@@ -13553,7 +13887,7 @@ msgstr ""
 #: ../mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b> SSL Evolution</b>"
+msgstr "<b> SSL არა - - Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
 #, fuzzy
@@ -13565,8 +13899,9 @@ msgid "<b>_Languages</b>"
 msgstr "<b>_ენები</b>"
 
 #: ../mail/mail-config.glade.h:7
+#, fuzzy
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr ""
+msgstr "<small> მეტი</small>"
 
 #: ../mail/mail-config.glade.h:8
 #, fuzzy
@@ -13582,8 +13917,9 @@ msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">აუთენტიფიკაცია</span>"
 
 #: ../mail/mail-config.glade.h:12
+#, fuzzy
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr ""
+msgstr "<span weight=\"bold\"> შეტყობინებები</span>"
 
 #: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
@@ -13597,11 +13933,12 @@ msgstr "<span weight=\"bold\"> ნაგულისხმევი ქცევ
 #: ../mail/mail-config.glade.h:15
 #, fuzzy
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\"> წაშლა</span>"
+msgstr "<span weight=\"bold\"> წაშლა ფოსტა</span>"
 
 #: ../mail/mail-config.glade.h:16
+#, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr ""
+msgstr "<span weight=\"bold\"> ფოსტა სათაურები</span>"
 
 #: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
@@ -13615,7 +13952,7 @@ msgstr "<span weight=\"bold\"> და ფერები</span>"
 #: ../mail/mail-config.glade.h:20
 #, fuzzy
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\"> სურათები</span>"
+msgstr "<span weight=\"bold\"> ჩატვირვა სურათები</span>"
 
 #: ../mail/mail-config.glade.h:21
 #, fuzzy
@@ -13635,13 +13972,13 @@ msgstr "<span weight=\"bold\"> შეტყობინება</span>"
 #: ../mail/mail-config.glade.h:24
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\"> ახალი შეტყობინება</span>"
+msgstr "<span weight=\"bold\"> ახალი ფოსტა ნოიფიკაცია</span>"
 
 #: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 #, fuzzy
 msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\"> ინფორმაცია</span>"
+msgstr "<span weight=\"bold\"> დამატებით ინფორმაცია</span>"
 
 #: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
@@ -13650,7 +13987,7 @@ msgstr "<span weight=\"bold\">ოფციები</span>"
 #: ../mail/mail-config.glade.h:27
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\"> პრივატობა</span>"
+msgstr "<span weight=\"bold\"> პრივატობა PGP</span>"
 
 #: ../mail/mail-config.glade.h:28
 #, fuzzy
@@ -13660,7 +13997,7 @@ msgstr "<span weight=\"bold\"> შრიფტები</span>"
 #: ../mail/mail-config.glade.h:29
 #, fuzzy
 msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\"> ინფორმაცია</span>"
+msgstr "<span weight=\"bold\"> აუცილებელია ინფორმაცია</span>"
 
 #: ../mail/mail-config.glade.h:30
 #, fuzzy
@@ -13674,7 +14011,7 @@ msgstr "<span weight=\"bold\">უსაფრთხოება</span>"
 #: ../mail/mail-config.glade.h:32
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\"> და</span>"
+msgstr "<span weight=\"bold\"> გაგზავნა და შეტყობინებები</span>"
 
 #: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
@@ -13691,44 +14028,48 @@ msgid "Add Ne_w Signature..."
 msgstr "დამატება ხელმოწერა."
 
 #: ../mail/mail-config.glade.h:37
-#, fuzzy
 msgid "Add _Script"
-msgstr "დამატება"
+msgstr "სკრიპტის _დამატება"
 
 #: ../mail/mail-config.glade.h:38
+#, fuzzy
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr ""
+msgstr "გამავალი ანგარიში"
 
 #: ../mail/mail-config.glade.h:39
+#, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr ""
+msgstr "-სკენ f ფოსტა"
 
 #: ../mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "კოპია -სკენ:"
+msgstr "წმ კოპირება -სკენ:"
 
 #: ../mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ყოველთვის კოპია -სკენ:"
+msgstr "ყოველთვის კოპირება -სკენ:"
 
 #: ../mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "ყოველთვის"
+msgstr "ყოველთვის -"
 
 #: ../mail/mail-config.glade.h:43
+#, fuzzy
 msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr ""
+msgstr "ყოველთვის -სკენ ფოსტა"
 
 #: ../mail/mail-config.glade.h:44
+#, fuzzy
 msgid "Attach original message"
-msgstr ""
+msgstr "ორიგინალი"
 
 #: ../mail/mail-config.glade.h:46
+#, fuzzy
 msgid "Automatically insert _smiley images"
-msgstr ""
+msgstr "ავრომატურად"
 
 #: ../mail/mail-config.glade.h:47
 #, fuzzy
@@ -13741,12 +14082,14 @@ msgid "Baltic (ISO-8859-4)"
 msgstr "ბალტიური ISO"
 
 #: ../mail/mail-config.glade.h:49
+#, fuzzy
 msgid "Beep w_hen new mail arrives"
-msgstr ""
+msgstr "ახალი ფოსტა"
 
 #: ../mail/mail-config.glade.h:50
+#, fuzzy
 msgid "C_haracter set:"
-msgstr ""
+msgstr "C:"
 
 #: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
@@ -13755,16 +14098,17 @@ msgstr ""
 #: ../mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Check in_coming mail for junk"
-msgstr "შემოწმება"
+msgstr "შემოწმება - ფოსტა"
 
 #: ../mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check spelling while I _type"
-msgstr "შემოწმება I ტიპი"
+msgstr "შემოწმება I"
 
 #: ../mail/mail-config.glade.h:54
+#, fuzzy
 msgid "Checks incoming mail messages to be Junk"
-msgstr ""
+msgstr "შემომავალი ფოსტა -სკენ"
 
 #: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
@@ -13784,10 +14128,12 @@ msgid "Colors"
 msgstr "ფერები"
 
 #: ../mail/mail-config.glade.h:59
+#, fuzzy
 msgid "Confirm _when expunging a folder"
-msgstr ""
+msgstr "დამოწმება a"
 
 #: ../mail/mail-config.glade.h:60
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13795,7 +14141,7 @@ msgid ""
 "using Evolution. \n"
 "\n"
 "Click \"Apply\" to save your settings."
-msgstr ""
+msgstr "ფოსტა არა ახლა -სკენ და ელფოსტა Evolution არა გამოყენება -სკენ შენახვა."
 
 #: ../mail/mail-config.glade.h:66
 msgid "De_fault"
@@ -13809,16 +14155,16 @@ msgstr "ნაგულისხმევი e:"
 #: ../mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
-msgstr "ნაგულისხმევი"
+msgstr "გამავალი ნაგულისხმები"
 
 #: ../mail/mail-config.glade.h:71
+#, fuzzy
 msgid "Do not quote original message"
-msgstr ""
+msgstr "არა ბრჭყალები ორიგინალი"
 
 #: ../mail/mail-config.glade.h:72
-#, fuzzy
 msgid "Done"
-msgstr "შესრულდა"
+msgstr "შესრულებული"
 
 #: ../mail/mail-config.glade.h:73
 #, fuzzy
@@ -13827,8 +14173,9 @@ msgstr "საქაღალდე:"
 
 #: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
+#, fuzzy
 msgid "E_nable"
-msgstr ""
+msgstr "E"
 
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
@@ -13837,12 +14184,12 @@ msgstr "საფოსტო ანგარიშები"
 #: ../mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Email _Address:"
-msgstr "Email მისამართი:"
+msgstr "ელფოსტა მისამართი:"
 
 #: ../mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Empty trash folders on e_xit"
-msgstr "ცარიელი e"
+msgstr "ცარიელი ურნა ჩართულია e"
 
 #: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
@@ -13851,26 +14198,27 @@ msgstr ""
 #: ../mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Encrypt out_going messages (by default)"
-msgstr "დაშიფვრა ნაგულისხმევი"
+msgstr "დაშიფვრა ნაგულისხმები"
 
 #: ../mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Fi_xed width Font:"
-msgstr "შრიფტი:"
+msgstr "სიგანე შრიფტი:"
 
 #: ../mail/mail-config.glade.h:82
+#, fuzzy
 msgid "Fi_xed-width:"
-msgstr ""
+msgstr "სიგანე:"
 
 #: ../mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Font Properties"
-msgstr "შრიფტის პარამეტრები"
+msgstr "შრიფტი პარამეტრები"
 
 #: ../mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Format messages in _HTML"
-msgstr "ფორმატი"
+msgstr "ფორმატი - HTML"
 
 #: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
@@ -13881,16 +14229,19 @@ msgid "HTML Mail"
 msgstr "HTML წერილი"
 
 #: ../mail/mail-config.glade.h:88
+#, fuzzy
 msgid "Headers"
-msgstr ""
+msgstr "სათაურები"
 
 #: ../mail/mail-config.glade.h:89
+#, fuzzy
 msgid "Highlight _quotations with"
-msgstr ""
+msgstr "მარკირებული"
 
 #: ../mail/mail-config.glade.h:90
+#, fuzzy
 msgid "I_nclude remote tests"
-msgstr ""
+msgstr "I"
 
 #: ../mail/mail-config.glade.h:93
 msgid "Inline"
@@ -13899,16 +14250,17 @@ msgstr ""
 #: ../mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Languages Table"
-msgstr "ენები"
+msgstr "ენები ცხრილი"
 
 #: ../mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Mail Configuration"
-msgstr "კონფიგურაცია"
+msgstr "ფოსტა გამართვა"
 
 #: ../mail/mail-config.glade.h:98
+#, fuzzy
 msgid "Mail Headers Table"
-msgstr ""
+msgstr "ფოსტა სათაურები ცხრილი"
 
 #: ../mail/mail-config.glade.h:100
 #, fuzzy
@@ -13925,7 +14277,7 @@ msgstr "შეტყობინება"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "შენიშვნა a"
+msgstr "შენიშვნა არა a პირველი"
 
 #: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
@@ -13934,43 +14286,48 @@ msgstr "ორ_განიზაცია:"
 #: ../mail/mail-config.glade.h:104
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
-msgstr "გასაღები ID:"
+msgstr "PGP გასაღები ID:"
 
 #: ../mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
-msgstr "დაკვრა"
+msgstr "დაკვრა ფაილი ახალი ფოსტა"
 
 #: ../mail/mail-config.glade.h:108
+#, fuzzy
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
-msgstr ""
+msgstr "a სახელი ანგარიში - სახელი."
 
 #: ../mail/mail-config.glade.h:110
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
-msgstr ""
+msgstr "შესახებ ფოსტა არა ან ინტერნეტი სერვისი."
 
 #: ../mail/mail-config.glade.h:111
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr ""
+msgstr "სახელი და ელფოსტა არა -სკენ - -სკენ შემცველობა - ელფოსტა."
 
 #: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:113
+#, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
+msgstr "უხილავი ასლი"
 
 #: ../mail/mail-config.glade.h:114
+#, fuzzy
 msgid "Quote original message"
-msgstr ""
+msgstr "ორიგინალი"
 
 #: ../mail/mail-config.glade.h:115
 msgid "Quoted"
@@ -13991,8 +14348,9 @@ msgid "Remember _password"
 msgstr "დაიმახსოვრე"
 
 #: ../mail/mail-config.glade.h:120
+#, fuzzy
 msgid "S_elect..."
-msgstr ""
+msgstr "S."
 
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
@@ -14005,25 +14363,27 @@ msgstr ""
 #: ../mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Select HTML fixed width font"
-msgstr "სტაციონარული"
+msgstr "ამორჩევა HTML სტაციონარული სიგანე"
 
 #: ../mail/mail-config.glade.h:125
 #, fuzzy
 msgid "Select HTML fixed width font for printing"
-msgstr "სტაციონარული"
+msgstr "ამორჩევა HTML სტაციონარული სიგანე"
 
 #: ../mail/mail-config.glade.h:126
+#, fuzzy
 msgid "Select HTML variable width font"
-msgstr ""
+msgstr "ამორჩევა HTML სიგანე"
 
 #: ../mail/mail-config.glade.h:127
+#, fuzzy
 msgid "Select HTML variable width font for printing"
-msgstr ""
+msgstr "ამორჩევა HTML სიგანე"
 
 #: ../mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Select sound file"
-msgstr "ფაილის არჩევა"
+msgstr "ამორჩევა ფაილი"
 
 #: ../mail/mail-config.glade.h:129
 #, fuzzy
@@ -14031,17 +14391,19 @@ msgid "Send message receipts:"
 msgstr "გაგზავნა:"
 
 #: ../mail/mail-config.glade.h:131
+#, fuzzy
 msgid "Sending Mail"
-msgstr ""
+msgstr "გაგზავნა ფოსტა"
 
 #: ../mail/mail-config.glade.h:132
 #, fuzzy
 msgid "Sent _Messages Folder:"
-msgstr "საქაღალდე:"
+msgstr "გაგზავნა შეტყობინებები საქაღალდე:"
 
 #: ../mail/mail-config.glade.h:133
+#, fuzzy
 msgid "Ser_ver requires authentication"
-msgstr ""
+msgstr "აუთენტიფიკაცია"
 
 #: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
@@ -14056,12 +14418,14 @@ msgid "Signat_ure:"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:137
+#, fuzzy
 msgid "Signatures"
-msgstr ""
+msgstr "ხელმოწერები"
 
 #: ../mail/mail-config.glade.h:138
+#, fuzzy
 msgid "Signatures Table"
-msgstr ""
+msgstr "ხელმოწერები ცხრილი"
 
 #: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
@@ -14081,29 +14445,31 @@ msgstr "ტ_იპი: "
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "a."
+msgstr "სია - a."
 
 #: ../mail/mail-config.glade.h:143
+#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
-msgstr ""
+msgstr "- სახელი "
 
 #: ../mail/mail-config.glade.h:147
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
-msgstr "ტიპი -სკენ -სკენ სამსახური პირადი"
+msgstr "ტიპი სახელი -სკენ -სკენ ანგარიში მაგალითი სამსახური ან პირადი"
 
 #: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "მომხმარებელი:"
 
 #: ../mail/mail-config.glade.h:150
+#, fuzzy
 msgid "V_ariable-width:"
-msgstr ""
+msgstr "სიგანე:"
 
 #: ../mail/mail-config.glade.h:151
 #, fuzzy
@@ -14111,7 +14477,7 @@ msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
-msgstr "მოგესალმებით -სკენ Evolution კონფიგურაცია ასისტენტი n -სკენ "
+msgstr "მოგესალმებით -სკენ Evolution ფოსტა გამართვა ასისტენტი არა წინ -სკენ "
 
 #: ../mail/mail-config.glade.h:155
 #, fuzzy
@@ -14124,13 +14490,14 @@ msgid "_Always load images from the Internet"
 msgstr "ყოველთვის ინტერნეტი"
 
 #: ../mail/mail-config.glade.h:157
+#, fuzzy
 msgid "_Do not notify me when new mail arrives"
-msgstr ""
+msgstr "არა ახალი ფოსტა"
 
 #: ../mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "Outlook"
+msgstr "არა Outlook"
 
 #: ../mail/mail-config.glade.h:160
 #, fuzzy
@@ -14140,12 +14507,12 @@ msgstr "წინ:"
 #: ../mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Load images in mail from contacts"
-msgstr "ჩატვირთვა"
+msgstr "ჩატვირთვა - ფოსტა"
 
 #: ../mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
-msgstr "ნაგულისხმევი"
+msgstr "Make ნაგულისხმები ანგარიში"
 
 #: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
@@ -14161,36 +14528,40 @@ msgid "_Path:"
 msgstr "_გეზი:"
 
 #: ../mail/mail-config.glade.h:167
+#, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr ""
+msgstr "მოთხოვნა HTML -სკენ არა"
 
 #: ../mail/mail-config.glade.h:168
+#, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr ""
+msgstr "მოთხოვნა თემა ხაზი"
 
 #: ../mail/mail-config.glade.h:169
+#, fuzzy
 msgid "_Reply style:"
-msgstr ""
+msgstr "პასუხი:"
 
 #: ../mail/mail-config.glade.h:170
+#, fuzzy
 msgid "_Script:"
-msgstr ""
+msgstr "სკრიპტი:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show image animations"
-msgstr "ანახე"
+msgstr "ჩვენება ნახატი"
 
 #: ../mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Use Secure Connection:"
-msgstr "კავშირები:"
+msgstr "გამოყენება კავშირი:"
 
 #: ../mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use the same fonts as other applications"
-msgstr "გამოყენება"
+msgstr "გამოყენება სხვა"
 
 #: ../mail/mail-config.glade.h:176
 msgid "color"
@@ -14204,7 +14575,7 @@ msgstr "აღწერა"
 #: ../mail/mail-dialogs.glade.h:2
 #, fuzzy
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b> ძებნა საქაღალდე</b>"
+msgstr "<b> ძებნა საქაღალდე წყაროები</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 #, fuzzy
@@ -14225,18 +14596,20 @@ msgid "Co_mpleted"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:8
+#, fuzzy
 msgid "F_ind:"
-msgstr ""
+msgstr "F:"
 
 #: ../mail/mail-dialogs.glade.h:9
 #, fuzzy
 msgid "Find in Message"
-msgstr "ძებნა შეტყობინება"
+msgstr "ძიება - შეტყობინება"
 
 #: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
+#, fuzzy
 msgid "Flag to Follow Up"
-msgstr ""
+msgstr "-სკენ მიყოლა ზემოთ"
 
 #: ../mail/mail-dialogs.glade.h:11
 #, fuzzy
@@ -14251,7 +14624,7 @@ msgstr "სალიცენზიო შეთანხმება"
 #: ../mail/mail-dialogs.glade.h:13
 #, fuzzy
 msgid "None Selected"
-msgstr "არა"
+msgstr "არა მონიშნული"
 
 #: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
@@ -14262,56 +14635,65 @@ msgid "Security Information"
 msgstr "უსაფრთხოების ინფორმაცია"
 
 #: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#, fuzzy
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+msgstr "ზემოთ a ზემოთ მოქმედება მენიუ."
 
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_მიიღე ლიცენზია"
 
 #: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#, fuzzy
 msgid "_Due By:"
-msgstr ""
+msgstr "ვადა:"
 
 #: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:22
+#, fuzzy
 msgid "_Subscribe"
-msgstr ""
+msgstr "ხელის მოწერა"
 
 #: ../mail/mail-dialogs.glade.h:23
+#, fuzzy
 msgid "_Tick this to accept the license agreement"
-msgstr ""
+msgstr "-სკენ მიღება"
 
 #: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+#, fuzzy
 msgid "_Unsubscribe"
-msgstr ""
+msgstr "ხელმოუწერელი"
 
 #: ../mail/mail-dialogs.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:26
+#, fuzzy
 msgid "with all active remote folders"
-msgstr ""
+msgstr "ყველა აქტიური"
 
 #: ../mail/mail-dialogs.glade.h:27
+#, fuzzy
 msgid "with all local and active remote folders"
-msgstr ""
+msgstr "ყველა და აქტიური"
 
 #: ../mail/mail-dialogs.glade.h:28
+#, fuzzy
 msgid "with all local folders"
-msgstr ""
+msgstr "ყველა"
 
 #: ../mail/mail-folder-cache.c:858
 #, c-format
+#, fuzzy
 msgid "Pinging %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:104
 #, fuzzy
@@ -14319,45 +14701,47 @@ msgid "Filtering Folder"
 msgstr "საქაღალდე"
 
 #: ../mail/mail-ops.c:265
+#, fuzzy
 msgid "Fetching Mail"
-msgstr ""
+msgstr "ფოსტა"
 
 #. sending mail, filtering failed
 #: ../mail/mail-ops.c:565
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ"
+msgstr "ვერ განხორციელდა -სკენ გამოყენება გამავალი წმ"
 
 #: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, fuzzy, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ -სკენ -სკენ."
+msgstr "ვერ განხორციელდა -სკენ -სკენ წმ წმ -სკენ გაგზავნა."
 
 #: ../mail/mail-ops.c:623
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ -სკენ"
+msgstr "ვერ განხორციელდა -სკენ -სკენ გაგზავნა წმ"
 
 #: ../mail/mail-ops.c:735
 #, c-format
+#, fuzzy
 msgid "Sending message %d of %d"
-msgstr ""
+msgstr "გაგზავნა -"
 
 #: ../mail/mail-ops.c:760
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ"
+msgstr "ვერ განხორციელდა -სკენ -"
 
 #: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
-#, fuzzy
 msgid "Canceled."
 msgstr "გაუქმებულია."
 
 #: ../mail/mail-ops.c:764
+#, fuzzy
 msgid "Complete."
-msgstr ""
+msgstr "შესრულებულია."
 
 #: ../mail/mail-ops.c:861
 #, fuzzy
@@ -14367,12 +14751,12 @@ msgstr "ვიმახსოვრებ -სკენ"
 #: ../mail/mail-ops.c:946
 #, fuzzy, c-format
 msgid "Moving messages to %s"
-msgstr "გადატანის პროცესში -სკენ"
+msgstr "გადატანის პროცესში -სკენ წმ"
 
 #: ../mail/mail-ops.c:946
 #, fuzzy, c-format
 msgid "Copying messages to %s"
-msgstr "ვაკოპირებ -სკენ"
+msgstr "ვაკოპირებ -სკენ წმ"
 
 #: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
@@ -14380,33 +14764,38 @@ msgstr "გადაგზავნილი წერილები"
 
 #: ../mail/mail-ops.c:1212
 #, c-format
+#, fuzzy
 msgid "Opening folder %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1284
 #, c-format
+#, fuzzy
 msgid "Opening store %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1362
 #, c-format
+#, fuzzy
 msgid "Removing folder %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1456
 #, c-format
+#, fuzzy
 msgid "Storing folder '%s'"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1521
 #, fuzzy, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "და"
+msgstr "და ანგარიში წმ"
 
 #: ../mail/mail-ops.c:1522
 #, c-format
+#, fuzzy
 msgid "Storing account '%s'"
-msgstr ""
+msgstr "ანგარიში წმ"
 
 #: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
@@ -14418,8 +14807,9 @@ msgstr ""
 
 #: ../mail/mail-ops.c:1661
 #, c-format
+#, fuzzy
 msgid "Emptying trash in '%s'"
-msgstr ""
+msgstr "ურნა - წმ"
 
 #: ../mail/mail-ops.c:1662
 #, fuzzy
@@ -14428,60 +14818,73 @@ msgstr "ლოკალური საქაღალდეები"
 
 #: ../mail/mail-ops.c:1745
 #, c-format
+#, fuzzy
 msgid "Retrieving message %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-ops.c:1941
 #, c-format
+#, fuzzy
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] ""
+msgstr "ვიმახსოვრებ"
 
 #: ../mail/mail-ops.c:1991
 #, c-format
+#, fuzzy
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
+"-სკენ ფაილი წმ\n"
+" წმ"
 
 #: ../mail/mail-ops.c:2019
 #, c-format
+#, fuzzy
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
+"შეცდომა -სკენ წმ\n"
+" წმ"
 
 #: ../mail/mail-ops.c:2091
+#, fuzzy
 msgid "Saving attachment"
-msgstr ""
+msgstr "ვიმახსოვრებ"
 
 #: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
+#, fuzzy
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
+"ფაილი წმ\n"
+" წმ"
 
 #: ../mail/mail-ops.c:2120
 #, c-format
+#, fuzzy
 msgid "Could not write data: %s"
-msgstr ""
+msgstr "არა წმ"
 
 #: ../mail/mail-ops.c:2269
 #, c-format
+#, fuzzy
 msgid "Disconnecting from %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:2269
 #, c-format
+#, fuzzy
 msgid "Reconnecting to %s"
-msgstr ""
+msgstr "-სკენ წმ"
 
 #: ../mail/mail-ops.c:2385
 #, fuzzy
@@ -14489,37 +14892,38 @@ msgid "Checking Service"
 msgstr "სერვისი"
 
 #: ../mail/mail-send-recv.c:158
-#, fuzzy
 msgid "Canceling..."
-msgstr "გაუქმება"
+msgstr "ვაუქმებ..."
 
 #: ../mail/mail-send-recv.c:329
 #, fuzzy
 msgid "Send & Receive Mail"
-msgstr "გაგზავნა"
+msgstr "გაგზავნა მიღება ფოსტა"
 
 #: ../mail/mail-send-recv.c:336
 #, fuzzy
 msgid "Cancel _All"
-msgstr "გაუქმება ყველა"
+msgstr "შეწყვეტა ყველა"
 
 #: ../mail/mail-send-recv.c:425
+#, fuzzy
 msgid "Updating..."
-msgstr ""
+msgstr "მიმდინარეობს განახლება..."
 
 #: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "ველოდები..."
 
 #: ../mail/mail-send-recv.c:709
+#, fuzzy
 msgid "Checking for new mail"
-msgstr ""
+msgstr "ახალი ფოსტა"
 
 #: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, fuzzy, c-format
 msgid "Enter Password for %s"
-msgstr "პაროლი"
+msgstr "შეყვანა პაროლი წმ"
 
 #: ../mail/mail-session.c:206
 msgid "Enter Password"
@@ -14531,13 +14935,13 @@ msgid "User canceled operation."
 msgstr "მომხმარებელი."
 
 #: ../mail/mail-signature-editor.c:384
-#, fuzzy
 msgid "Edit signature"
-msgstr "რედაქტირება"
+msgstr "ხელმოწერის რედაქტირება"
 
 #: ../mail/mail-signature-editor.c:431
+#, fuzzy
 msgid "Enter a name for this signature."
-msgstr ""
+msgstr "შეყვანა a სახელი."
 
 #: ../mail/mail-signature-editor.c:434
 #: ../plugins/groupwise-features/properties.glade.h:5
@@ -14546,13 +14950,15 @@ msgstr "სახელი:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
+#, fuzzy
 msgid "Could not create spool directory `%s': %s"
-msgstr ""
+msgstr "არა წმ წმ"
 
 #: ../mail/mail-tools.c:150
 #, c-format
+#, fuzzy
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
+msgstr "-სკენ a წმ"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14565,23 +14971,24 @@ msgstr "გადაგზავნილი წერილები"
 
 #: ../mail/mail-tools.c:298
 #, c-format
+#, fuzzy
 msgid "Invalid folder: `%s'"
-msgstr ""
+msgstr "არასწორი წმ"
 
 #: ../mail/mail-vfolder.c:91
 #, fuzzy, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "პარამეტრი ძებნა საქაღალდე"
+msgstr "ზემოთ ძებნა საქაღალდე წმ"
 
 #: ../mail/mail-vfolder.c:240
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "ძებნა საქაღალდეები"
+msgstr "ძებნა საქაღალდეები წმ წმ"
 
 #: ../mail/mail-vfolder.c:247
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "ძებნა საქაღალდეები"
+msgstr "ძებნა საქაღალდეები წმ"
 
 #: ../mail/mail-vfolder.c:1050
 #, fuzzy
@@ -14596,7 +15003,7 @@ msgstr "ახალი ძებნა საქაღალდე"
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
 msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "A&quot;&quot; a."
+msgstr "A&quot;&quot; a სახელი."
 
 #: ../mail/mail.error.xml.h:2
 #, fuzzy
@@ -14605,71 +15012,77 @@ msgid ""
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
-msgstr "A&quot;&quot; n -სკენ n"
+msgstr "A ეთ&quot;&quot; არა -სკენ ან ან დასრულება არა"
 
 #: ../mail/mail.error.xml.h:6
 #, fuzzy
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
-msgstr "A&quot;&quot; გაგზავნა -სკენ?"
+msgstr "A მოთხოვნილი&quot;&quot; გაგზავნა -სკენ?"
 
 #: ../mail/mail.error.xml.h:7
 #, fuzzy
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
-msgstr "A&quot;&quot; a."
+msgstr "A სახელი&quot;&quot; a სახელი."
 
 #: ../mail/mail.error.xml.h:8
 #, fuzzy
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "a თემა ხაზი -სკენ."
+msgstr "a თემა ხაზი -სკენ - ფოსტა შესახებ."
 
 #: ../mail/mail.error.xml.h:9
 #, fuzzy
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "-სკენ და?"
+msgstr "-სკენ წაშლა ანგარიში და ყველა?"
 
 #: ../mail/mail.error.xml.h:10
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "-სკენ?"
+msgstr "-სკენ წაშლა ანგარიში?"
 
 #: ../mail/mail.error.xml.h:11
 #, fuzzy
 msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "-სკენ და?"
+msgstr "-სკენ გამორთვა ანგარიში და წაშლა ყველა?"
 
 #: ../mail/mail.error.xml.h:12
+#, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr ""
+msgstr "-სკენ გახსნა ეთ?"
 
 #: ../mail/mail.error.xml.h:13
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr ""
+msgstr "-სკენ ამოშლა ყველა - ყველა?"
 
 #: ../mail/mail.error.xml.h:14
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
-msgstr ""
+msgstr "-სკენ ამოშლა ყველა -&quot;&quot;?"
 
 #: ../mail/mail.error.xml.h:15
+#, fuzzy
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr ""
+msgstr "-სკენ a - HTML?"
 
 #: ../mail/mail.error.xml.h:16
+#, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
+msgstr "-სკენ a ბრმა ასლი?"
 
 #: ../mail/mail.error.xml.h:17
+#, fuzzy
 msgid "Are you sure you want to send a message without a subject?"
-msgstr ""
+msgstr "-სკენ a a თემა?"
 
 #: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
@@ -14682,42 +15095,46 @@ msgstr ""
 #: ../mail/mail.error.xml.h:21
 #, fuzzy
 msgid "Blank Signature"
-msgstr "ხელმოწერა"
+msgstr "სუფთა ფურცელი ხელმოწერა"
 
 #: ../mail/mail.error.xml.h:22
 #, fuzzy
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "ძებნა საქაღალდე&quot;&quot;."
+msgstr "დამატება ძებნა საქაღალდე&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:23
 #, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "კოპია&quot;&quot; -სკენ&quot;&quot;."
+msgstr "კოპირება&quot;&quot; -სკენ&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:25
+#, fuzzy
 msgid "Cannot create temporary save directory."
-msgstr ""
+msgstr "შენახვა."
 
 #: ../mail/mail.error.xml.h:26
+#, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr ""
+msgstr "შენახვა&quot;&quot;"
 
 #: ../mail/mail.error.xml.h:27
+#, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr ""
+msgstr "წაშლა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:28
+#, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr ""
+msgstr "წაშლა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:29
 #, fuzzy
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "ძებნა საქაღალდე&quot;&quot;."
+msgstr "რედაქტირება ძებნა საქაღალდე&quot;&quot; არა."
 
 #: ../mail/mail.error.xml.h:30
 #, fuzzy
@@ -14725,16 +15142,19 @@ msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;&quot; -სკენ&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:31
+#, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
-msgstr ""
+msgstr "გახსნა&quot;&quot;"
 
 #: ../mail/mail.error.xml.h:32
+#, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
-msgstr ""
+msgstr "გახსნა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:33
+#, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
-msgstr ""
+msgstr "გახსნა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:34
 #, fuzzy
@@ -14742,7 +15162,7 @@ msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
 "license."
-msgstr "&quot;&quot; -სკენ თქვენ -სკენ მიღება."
+msgstr "ფაილი&quot;&quot; -სკენ თქვენ არა -სკენ მიღება."
 
 #: ../mail/mail.error.xml.h:35
 #, fuzzy
@@ -14757,17 +15177,17 @@ msgstr "ან&quot;&quot;."
 #: ../mail/mail.error.xml.h:37
 #, fuzzy
 msgid "Cannot save changes to account."
-msgstr "-სკენ."
+msgstr "შენახვა -სკენ ანგარიში."
 
 #: ../mail/mail.error.xml.h:38
 #, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "-სკენ დირექტორია&quot;&quot;."
+msgstr "შენახვა -სკენ&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:39
 #, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "-სკენ&quot;&quot;."
+msgstr "შენახვა -სკენ ფაილი&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
@@ -14778,11 +15198,12 @@ msgstr ""
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
-msgstr "შემოწმება -სკენ დაიმახსოვრე."
+msgstr "შემოწმება -სკენ დაიმახსოვრე ჩართულია."
 
 #: ../mail/mail.error.xml.h:42
+#, fuzzy
 msgid "Could not save signature file."
-msgstr ""
+msgstr "არა შენახვა ფაილი."
 
 #: ../mail/mail.error.xml.h:43
 #, fuzzy
@@ -14790,8 +15211,9 @@ msgid "Delete &quot;{0}&quot;?"
 msgstr "წაშლა&quot;&quot;?"
 
 #: ../mail/mail.error.xml.h:44
+#, fuzzy
 msgid "Delete account?"
-msgstr ""
+msgstr "წაშლა ანგარიში?"
 
 #: ../mail/mail.error.xml.h:45
 #, fuzzy
@@ -14801,31 +15223,32 @@ msgstr "უარყოფა?"
 #: ../mail/mail.error.xml.h:46
 #, fuzzy
 msgid "Do not delete"
-msgstr "წაშლა"
+msgstr "არა წაშლა"
 
 #: ../mail/mail.error.xml.h:47
 #, fuzzy
 msgid "Do not disable"
-msgstr "გამორთე"
+msgstr "არა გამორთვა"
 
 #: ../mail/mail.error.xml.h:48
 #, fuzzy
 msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "-სკენ?"
+msgstr "-სკენ -?"
 
 #: ../mail/mail.error.xml.h:49
 #, fuzzy
 msgid "Do you want to mark all messages as read?"
-msgstr "-სკენ?"
+msgstr "-სკენ ყველა?"
 
 #: ../mail/mail.error.xml.h:50
 #, fuzzy
 msgid "Do you wish to save your changes?"
-msgstr "-სკენ?"
+msgstr "-სკენ შენახვა?"
 
 #: ../mail/mail.error.xml.h:51
+#, fuzzy
 msgid "Enter password."
-msgstr ""
+msgstr "შეყვანა."
 
 #: ../mail/mail.error.xml.h:52
 #, fuzzy
@@ -14850,42 +15273,43 @@ msgstr "ფაილი."
 #: ../mail/mail.error.xml.h:56
 #, fuzzy
 msgid "File exists but is not a regular file."
-msgstr "ფაილი a წესიერი."
+msgstr "ფაილი არა a წესიერი ფაილი."
 
 #: ../mail/mail.error.xml.h:57
 #, fuzzy
 msgid "If you continue, you will not be able to recover these messages."
-msgstr "-სკენ."
+msgstr "არა -სკენ."
 
 #: ../mail/mail.error.xml.h:58
 #, fuzzy
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr "და."
+msgstr "წაშლა ყველა - და."
 
 #: ../mail/mail.error.xml.h:59
 #, fuzzy
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "ანგარიშები."
+msgstr "ყველა ანგარიშები."
 
 #: ../mail/mail.error.xml.h:60
 #, fuzzy
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
-msgstr "და."
+msgstr "ანგარიში და."
 
 #: ../mail/mail.error.xml.h:62
+#, fuzzy
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgstr "ანგარიში."
 
 #: ../mail/mail.error.xml.h:63
 #, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "Evolution."
+msgstr "დასრულება არა გაგზავნილი Evolution."
 
 #: ../mail/mail.error.xml.h:64
 #, fuzzy
@@ -14895,27 +15319,31 @@ msgstr "იგნორირება"
 #: ../mail/mail.error.xml.h:65
 #, fuzzy
 msgid "Invalid authentication"
-msgstr "არასწორი"
+msgstr "არასწორი აუთენტიფიკაცია"
 
 #: ../mail/mail.error.xml.h:66
+#, fuzzy
 msgid "Mail filters automatically updated."
-msgstr ""
+msgstr "ფოსტა."
 
 #: ../mail/mail.error.xml.h:67
+#, fuzzy
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
-msgstr ""
+msgstr "ელფოსტა დამატება ვის თავსართი -სკენ ბრმა ასლი თავსართი სია ყველა - -სკენ ვის დამატება ეთ ვის ან ასლი."
 
 #: ../mail/mail.error.xml.h:68
+#, fuzzy
 msgid "Mark all messages as read"
-msgstr ""
+msgstr "ყველა"
 
 #: ../mail/mail.error.xml.h:69
+#, fuzzy
 msgid "Mark all messages as read in the selected folder"
-msgstr ""
+msgstr "ყველა -"
 
 #: ../mail/mail.error.xml.h:70
 #, fuzzy
@@ -14928,59 +15356,68 @@ msgid "No sources selected."
 msgstr "არა."
 
 #: ../mail/mail.error.xml.h:73
+#, fuzzy
 msgid "Opening too many messages at once may take a long time."
-msgstr ""
+msgstr "ეთ a."
 
 #: ../mail/mail.error.xml.h:74
+#, fuzzy
 msgid "Please check your account settings and try again."
-msgstr ""
+msgstr "ანგარიში და."
 
 #: ../mail/mail.error.xml.h:75
+#, fuzzy
 msgid "Please enable the account or send using another account."
-msgstr ""
+msgstr "ანგარიში ან ანგარიში."
 
 #: ../mail/mail.error.xml.h:76
+#, fuzzy
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
-msgstr ""
+msgstr "a ელფოსტა - ვის ველი თქვენ ძიება ელფოსტა ჩართულია ვის -სკენ ელემენტი."
 
 #: ../mail/mail.error.xml.h:77
+#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}\n"
 "Send anyway?"
-msgstr ""
+msgstr "და -სკენ HTML ელფოსტა არა?"
 
 #: ../mail/mail.error.xml.h:80
+#, fuzzy
 msgid "Please provide an unique name to identify this signature."
-msgstr ""
+msgstr "უნიკალური სახელი -სკენ."
 
 #: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:82
+#, fuzzy
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr ""
+msgstr "ფოსტა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:84
+#, fuzzy
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr ""
+msgstr "a სია - აუთენტიფიკაცია."
 
 #: ../mail/mail.error.xml.h:85
+#, fuzzy
 msgid "Read receipt requested."
-msgstr ""
+msgstr "წაკითხვა მოთხოვნილი."
 
 #: ../mail/mail.error.xml.h:86
 #, fuzzy
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "&quot;&quot; და?"
+msgstr "წაშლა&quot;&quot; და ყველა -?"
 
 #: ../mail/mail.error.xml.h:87
 #, fuzzy
@@ -14990,7 +15427,7 @@ msgstr "ძებნა საქაღალდეები."
 #: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Send Receipt"
-msgstr "გაგზავნა"
+msgstr "გაგზავნა მიღება"
 
 #: ../mail/mail.error.xml.h:89
 #, fuzzy
@@ -15002,9 +15439,10 @@ msgstr "ხელმოწერა"
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
-msgstr "სისტემა Evolution -სკენ და."
+msgstr "სისტემა Evolution -სკენ და ან."
 
 #: ../mail/mail.error.xml.h:91
+#, fuzzy
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15012,7 +15450,7 @@ msgid ""
 "BCC recipients. This header, if added, will list all of your recipients in "
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
-msgstr ""
+msgstr "სია -სკენ -სკენ სია არა ელფოსტა დამატება ვის თავსართი -სკენ ბრმა ასლი თავსართი სია ყველა - - ვის დამატება ეთ ვის ან ასლი "
 
 #: ../mail/mail.error.xml.h:94
 #, fuzzy
@@ -15023,7 +15461,7 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"ძებნა საქაღალდე n ახლა\n"
+"ძებნა საქაღალდე წმ არა ახლა\n"
 "&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:99
@@ -15035,7 +15473,7 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"n ახლა\n"
+"წმ არა ახლა\n"
 "&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:104
@@ -15045,46 +15483,50 @@ msgid ""
 "Sendmail reports the following error: status 67: mail not sent.\n"
 "The message is stored in the Outbox folder. Check the message for errors and "
 "resend."
-msgstr "&quot;&quot; შეცდომა შემოწმება და."
+msgstr "გაგზავნილი&quot;&quot; პროგრამა Sendmail შეცდომა ფოსტა არა გაგზავნილი - შემოწმება და."
 
 #: ../mail/mail.error.xml.h:106
 #, fuzzy
 msgid "The script file must exist and be executable."
-msgstr "და."
+msgstr "ფაილი და."
 
 #: ../mail/mail.error.xml.h:107
 #, fuzzy
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
-msgstr "-სკენ ძებნა საქაღალდე -სკენ."
+msgstr "-სკენ ძებნა საქაღალდე -სკენ დამატება."
 
 #: ../mail/mail.error.xml.h:109
+#, fuzzy
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr ""
+msgstr "გაგზავნილი ანგარიში -სკენ არა ჩართული"
 
 #: ../mail/mail.error.xml.h:110
+#, fuzzy
 msgid "This message cannot be sent because you have not specified any recipients"
-msgstr ""
+msgstr "გაგზავნილი არა ნებისმიერი"
 
 #: ../mail/mail.error.xml.h:111
 #, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "სუპორტი ტიპი და სუპორტი."
+msgstr "არა სუპორტი - აუთენტიფიკაცია და არა სუპორტი აუთენტიფიკაცია ეთ ყველა."
 
 #: ../mail/mail.error.xml.h:112
+#, fuzzy
 msgid "This signature has been changed, but has not been saved."
-msgstr ""
+msgstr "არა."
 
 #: ../mail/mail.error.xml.h:113
+#, fuzzy
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr ""
+msgstr "ყველა - და."
 
 #: ../mail/mail.error.xml.h:114
 #, fuzzy
@@ -15096,41 +15538,42 @@ msgstr "-სკენ -სკენ."
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "-სკენ?"
+msgstr "-სკენ გახსნა ანგარიში გამოყენება?"
 
 #: ../mail/mail.error.xml.h:116
 #, fuzzy
 msgid "Unable to read license file."
-msgstr "-სკენ."
+msgstr "-სკენ ფაილი."
 
 #: ../mail/mail.error.xml.h:117
 #, fuzzy
 msgid "Use _Default"
-msgstr "ნაგულისხმევი"
+msgstr "გამოყენება ნაგულისხმევი"
 
 #: ../mail/mail.error.xml.h:118
 #, fuzzy
 msgid "Use default drafts folder?"
-msgstr "ნაგულისხმევი?"
+msgstr "გამოყენება ნაგულისხმები?"
 
 #: ../mail/mail.error.xml.h:119
+#, fuzzy
 msgid "You have not filled in all of the required information."
-msgstr ""
+msgstr "თქვენ არა - ყველა -."
 
 #: ../mail/mail.error.xml.h:120
 #, fuzzy
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "თქვენ -სკენ?"
+msgstr "თქვენ -სკენ დასრულება?"
 
 #: ../mail/mail.error.xml.h:121
 #, fuzzy
 msgid "You may not create two accounts with the same name."
-msgstr "თქვენ ანგარიშები."
+msgstr "თქვენ არა ანგარიშები სახელი."
 
 #: ../mail/mail.error.xml.h:122
 #, fuzzy
 msgid "You must name this Search Folder."
-msgstr "თქვენ ძებნა საქაღალდე."
+msgstr "თქვენ სახელი ძებნა საქაღალდე."
 
 #: ../mail/mail.error.xml.h:123
 #, fuzzy
@@ -15143,15 +15586,17 @@ msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
-msgstr "თქვენ a და."
+msgstr "თქვენ ეთ a და ან ყველა ყველა ან."
 
 #: ../mail/mail.error.xml.h:126
+#, fuzzy
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
+msgstr "-სკენ&quot;&quot;&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:127
+#, fuzzy
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr ""
+msgstr "თემა&quot;&quot; არა."
 
 #: ../mail/mail.error.xml.h:128
 msgid "_Append"
@@ -15163,13 +15608,14 @@ msgid "_Discard changes"
 msgstr "უარყოფა"
 
 #: ../mail/mail.error.xml.h:131
+#, fuzzy
 msgid "_Expunge"
-msgstr ""
+msgstr "განადგურება"
 
 #: ../mail/mail.error.xml.h:132
 #, fuzzy
 msgid "_Open Messages"
-msgstr "გახსენი"
+msgstr "გახსნა შეტყობინებები"
 
 #: ../mail/message-list.c:1000
 msgid "Unseen"
@@ -15184,12 +15630,14 @@ msgid "Answered"
 msgstr ""
 
 #: ../mail/message-list.c:1003
+#, fuzzy
 msgid "Multiple Unseen Messages"
-msgstr ""
+msgstr "შეტყობინებები"
 
 #: ../mail/message-list.c:1004
+#, fuzzy
 msgid "Multiple Messages"
-msgstr ""
+msgstr "შეტყობინებები"
 
 #: ../mail/message-list.c:1008
 msgid "Lowest"
@@ -15198,7 +15646,7 @@ msgstr ""
 #: ../mail/message-list.c:1009
 #, fuzzy
 msgid "Lower"
-msgstr "უფრო დაბლა"
+msgstr "ჩაწევა"
 
 #: ../mail/message-list.c:1013
 msgid "Higher"
@@ -15224,29 +15672,33 @@ msgid "Yesterday %l:%M %p"
 msgstr "გუშინ %l:%M %p"
 
 #: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
+#, fuzzy
 msgid "%a %l:%M %p"
-msgstr ""
+msgstr "a M"
 
 #: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 #: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
+#, fuzzy
 msgid "%b %d %Y"
-msgstr ""
+msgstr "Y"
 
 #: ../mail/message-list.c:2063
 #, fuzzy
 msgid "Messages"
-msgstr "შეტყობინება"
+msgstr "შეტყობინებები"
 
 #: ../mail/message-list.c:3441
+#, fuzzy
 msgid "Generating message list"
-msgstr ""
+msgstr "სია"
 
 #: ../mail/message-list.etspec.h:3
+#, fuzzy
 msgid "Due By"
-msgstr ""
+msgstr "ვადა"
 
 #: ../mail/message-list.etspec.h:4
 #, fuzzy
@@ -15263,13 +15715,13 @@ msgid "Follow Up Flag"
 msgstr "მიყოლა ზემოთ"
 
 #: ../mail/message-list.etspec.h:8
-#, fuzzy
 msgid "Original Location"
-msgstr "ადგილმდებარეობა"
+msgstr "თავდაპირველი ადგილმდებარეობა"
 
 #: ../mail/message-list.etspec.h:9
+#, fuzzy
 msgid "Received"
-msgstr ""
+msgstr "მიღებული"
 
 #: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
@@ -15277,22 +15729,22 @@ msgid "Size"
 msgstr "ზომა"
 
 #: ../mail/message-tag-followup.c:75
+#, fuzzy
 msgid "Call"
-msgstr ""
+msgstr "დარეკვა"
 
 #: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "არ გადააგზავნო"
 
 #: ../mail/message-tag-followup.c:77
-#, fuzzy
 msgid "Follow-Up"
-msgstr "მიყოლა ზემოთ"
+msgstr "მიყოლა-ზემოთ"
 
 #: ../mail/message-tag-followup.c:78
 #, fuzzy
 msgid "For Your Information"
-msgstr "ინფორმაცია"
+msgstr "-თვის ინფორმაცია"
 
 #: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
@@ -15301,7 +15753,7 @@ msgstr "გადაგზავნა"
 #: ../mail/message-tag-followup.c:80
 #, fuzzy
 msgid "No Response Necessary"
-msgstr "არა"
+msgstr "არა პასუხი"
 
 #: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
@@ -15312,24 +15764,28 @@ msgid "Reply to All"
 msgstr "პასუხი ყველას"
 
 #: ../mail/message-tag-followup.c:84
+#, fuzzy
 msgid "Review"
-msgstr ""
+msgstr "გადახედვა"
 
 #: ../mail/searchtypes.xml.h:1
+#, fuzzy
 msgid "Body contains"
-msgstr ""
+msgstr "ტანი შეიცავს"
 
 #: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "წერილი შეიცავს"
 
 #: ../mail/searchtypes.xml.h:3
+#, fuzzy
 msgid "Recipients contain"
-msgstr ""
+msgstr "შეიცავს"
 
 #: ../mail/searchtypes.xml.h:4
+#, fuzzy
 msgid "Sender contains"
-msgstr ""
+msgstr "გამგზავნი შეიცავს"
 
 #: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
@@ -15345,8 +15801,9 @@ msgid "Local Address Books"
 msgstr "ლოკალური მისამართი"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+#, fuzzy
 msgid "Provides core functionality for local address books."
-msgstr ""
+msgstr "წარმოადგენს."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 #, fuzzy
@@ -15363,27 +15820,27 @@ msgstr "აუდიო"
 #: ../plugins/backup-restore/backup-restore.c:51
 #, fuzzy
 msgid "Select name of Evolution archive"
-msgstr "Evolution"
+msgstr "ამორჩევა სახელი - Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:61
 #, fuzzy
 msgid "_Restart Evolution after backup"
-msgstr "გადატვირთე Evolution"
+msgstr "გადატვირთვა Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:89
 #, fuzzy
 msgid "Select Evolution archive to restore"
-msgstr "Evolution -სკენ"
+msgstr "ამორჩევა Evolution -სკენ"
 
 #: ../plugins/backup-restore/backup-restore.c:97
 #, fuzzy
 msgid "_Restart Evolution after restore"
-msgstr "გადატვირთე Evolution"
+msgstr "გადატვირთვა Evolution"
 
 #: ../plugins/backup-restore/backup.c:109
 #, fuzzy
 msgid "Backup Evolution directory"
-msgstr "Evolution დირექტორია"
+msgstr "სარეზერვო ასლი Evolution"
 
 #: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
@@ -15399,54 +15856,57 @@ msgid "Restart Evolution"
 msgstr "გადატვირთე ევოლუშენი"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr ""
+msgstr "A ზემოთ და Evolution და."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 #, fuzzy
 msgid "Backup and restore plugin"
-msgstr "და"
+msgstr "სარეზერვო ასლი და"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-#, fuzzy
 msgid "Backup Settings..."
-msgstr "პარამეტრები."
+msgstr "პარამეტრების "
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#, fuzzy
 msgid "Backup and restore Evolution data and settings"
-msgstr ""
+msgstr "სარეზერვო ასლი და Evolution და"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 #, fuzzy
 msgid "Restore Settings..."
-msgstr "პარამეტრები."
+msgstr "აღდგენა პარამეტრები."
 
 #: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
 msgid "Automatic Contacts"
-msgstr "ავტომატური"
+msgstr "ავტომატური კონტაქტები"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
+#, fuzzy
 msgid "_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
+msgstr "ავრომატურად - წიგნაკი -სკენ ფოსტა"
 
 #: ../plugins/bbdb/bbdb.c:475
 #, fuzzy
 msgid "Instant Messaging Contacts"
-msgstr "გაგზავნა შეტყობინება -სკენ"
+msgstr "მეგობრები"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
+#, fuzzy
 msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr ""
+msgstr "და სია"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
+#, fuzzy
 msgid "Synchronize with _buddy list now"
-msgstr ""
+msgstr "სია ახლა"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 #, fuzzy
@@ -15454,7 +15914,7 @@ msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
-msgstr "და -სკენ მოკ-შე."
+msgstr "ავრომატურად წიგნაკი და ელფოსტა -სკენ - მოკ-შე."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -15465,8 +15925,9 @@ msgid "CalDAV"
 msgstr ""
 
 #: ../plugins/caldav/caldav-source.c:269
+#, fuzzy
 msgid "Use _SSL"
-msgstr ""
+msgstr "გამოყენება SSL"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 #, fuzzy
@@ -15474,8 +15935,9 @@ msgid "Local Calendars"
 msgstr "ლოკალური კალენდრები"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+#, fuzzy
 msgid "Provides core functionality for local calendars."
-msgstr ""
+msgstr "წარმოადგენს."
 
 #: ../plugins/calendar-http/calendar-http.c:339
 #, fuzzy
@@ -15487,8 +15949,9 @@ msgid "HTTP Calendars"
 msgstr "HTTP კალენდრები"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+#, fuzzy
 msgid "Provides core functionality for webcal and http calendars."
-msgstr ""
+msgstr "წარმოადგენს და."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
@@ -15496,12 +15959,14 @@ msgid "Weather: Cloudy"
 msgstr "ამინდი: დაღრუბლული"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
+#, fuzzy
 msgid "Weather: Fog"
-msgstr ""
+msgstr "ამინდი"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
+#, fuzzy
 msgid "Weather: Partly Cloudy"
-msgstr ""
+msgstr "ამინდი"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
@@ -15512,85 +15977,102 @@ msgid "Weather: Snow"
 msgstr "ამინდი: თოვს"
 
 #: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
 msgid "Weather: Sunny"
-msgstr ""
+msgstr "ამინდი"
 
 #: ../plugins/calendar-weather/calendar-weather.c:66
+#, fuzzy
 msgid "Weather: Thunderstorms"
-msgstr ""
+msgstr "ამინდი"
 
 #: ../plugins/calendar-weather/calendar-weather.c:267
+#, fuzzy
 msgid "Select a location"
-msgstr ""
+msgstr "ამორჩევა a"
 
 #: ../plugins/calendar-weather/calendar-weather.c:654
+#, fuzzy
 msgid "_Units:"
-msgstr ""
+msgstr "ერთეული:"
 
 #: ../plugins/calendar-weather/calendar-weather.c:661
+#, fuzzy
 msgid "Metric (Celsius, cm, etc)"
-msgstr ""
+msgstr "შკალა ცელსიუსი სმ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:662
+#, fuzzy
 msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr ""
+msgstr "ფარენგეიტი"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+#, fuzzy
 msgid "Provides core functionality for weather calendars."
-msgstr ""
+msgstr "წარმოადგენს."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "ამინდის კალენდრები"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr ""
+msgstr "A a მენიუ კოპირება -სკენ."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "დააკოპირე _ელფოსტის მისამართი"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+#, fuzzy
 msgid "Copy tool"
-msgstr ""
+msgstr "დააკოპირე"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#, fuzzy
 msgid "Check whether Evolution is the default mailer"
-msgstr ""
+msgstr "შემოწმება Evolution ნაგულისხმები"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#, fuzzy
 msgid "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
+msgstr "Evolution ან არა ნაგულისხმები."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+#, fuzzy
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
+msgstr "Evolution ნაგულისხმები ფოსტა ჩართულია."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+#, fuzzy
 msgid "Default Mail Client "
-msgstr ""
+msgstr "ნაგულისხმევი ფოსტა კლიენტი "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+#, fuzzy
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
+msgstr "-სკენ Evolution ნაგულისხმები e ფოსტა?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
+#, fuzzy
 msgid "Mark as _default folder"
-msgstr ""
+msgstr "ნაგულისხმები"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+#, fuzzy
 msgid "Default Sources"
-msgstr ""
+msgstr "ნაგულისხმევი წყაროები"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+#, fuzzy
 msgid ""
 "Provides functionallity for marking a calendar or addressbook as the default "
 "one."
-msgstr ""
+msgstr "წარმოადგენს a კალენდარი ან წიგნაკი ნაგულისხმები."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15615,30 +16097,33 @@ msgstr "დაცული პაროლი"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
+#, fuzzy
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
-msgstr ""
+msgstr "-სკენ გაცვლა აუთენტიფიკაცია."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "ღია პაროლი"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
+#, fuzzy
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
-msgstr ""
+msgstr "-სკენ გაცვლა აუთენტიფიკაცია."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "ოფისიდან გასული"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:264
+#, fuzzy
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
-msgstr ""
+msgstr "გაგზავნილი -სკენ პირადი ფორმა ვინ ფოსტა -სკენ -."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:276
 #: ../plugins/exchange-operations/exchange-account-setup.c:281
@@ -15652,8 +16137,9 @@ msgstr "მე ვარ ოფისში"
 
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:328
+#, fuzzy
 msgid "Change the password for Exchange account"
-msgstr ""
+msgstr "შეცვლა გაცვლა ანგარიში"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
@@ -15662,8 +16148,9 @@ msgstr "პაროლის შეცვლა"
 
 #. Delegation Assistant
 #: ../plugins/exchange-operations/exchange-account-setup.c:335
+#, fuzzy
 msgid "Manage the delegate settings for Exchange account"
-msgstr ""
+msgstr "გაცვლა ანგარიში"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
@@ -15676,8 +16163,9 @@ msgstr ""
 
 #. Folder Size
 #: ../plugins/exchange-operations/exchange-account-setup.c:359
+#, fuzzy
 msgid "View the size of all Exchange folders"
-msgstr ""
+msgstr "ჩვენება - ყველა გაცვლა"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
@@ -15693,8 +16181,9 @@ msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:635
+#, fuzzy
 msgid "A_uthenticate"
-msgstr ""
+msgstr "A"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
@@ -15706,23 +16195,26 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-calendar.c:193
 #: ../plugins/exchange-operations/exchange-contacts.c:167
+#, fuzzy
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
-msgstr ""
+msgstr "Evolution - ხაზიდან გასვლა რეჟიმი თქვენ ან ახლა -სკენ ხაზზე რეჟიმი."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:115
+#, fuzzy
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
-msgstr ""
+msgstr "არა ემთხვევა ანგარიში"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
+#, fuzzy
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr ""
+msgstr "არა ემთხვევა."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
@@ -15737,74 +16229,86 @@ msgid "New Password:"
 msgstr "ახალი პაროლი:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#, fuzzy
 msgid "Your current password has expired. Please change your password now."
-msgstr ""
+msgstr "ახლა."
 
 #: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
+#, fuzzy
 msgid "Your password will expire in the next %d days"
-msgstr ""
+msgstr "- დღე"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#, fuzzy
 msgid "Custom"
-msgstr ""
+msgstr "სხვა"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#, fuzzy
 msgid "Delegate Permissions"
-msgstr ""
+msgstr "უფლებები"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, fuzzy, c-format
 msgid "Permissions for %s"
-msgstr "უფლებები"
+msgstr "უფლებები წმ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
+#, fuzzy
 msgid "Delegate To"
-msgstr ""
+msgstr "ვის"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:562
 #, c-format
+#, fuzzy
 msgid "Remove the delegate %s?"
-msgstr ""
+msgstr "ამოშლა წმ?"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:680
 #, fuzzy
 msgid "Could not access Active Directory"
-msgstr "აქტიური დირექტორია"
+msgstr "არა აქტიური დასტა"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:692
+#, fuzzy
 msgid "Could not find self in Active Directory"
-msgstr ""
+msgstr "არა პოვნა - აქტიური დასტა"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:705
 #, fuzzy, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "აქტიური დირექტორია"
+msgstr "არა პოვნა წმ - აქტიური დასტა"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
+#, fuzzy
 msgid "Could not remove delegate %s"
-msgstr ""
+msgstr "არა ამოშლა წმ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:777
+#, fuzzy
 msgid "Could not update list of delegates."
-msgstr ""
+msgstr "არა სია -."
 
 #: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
+#, fuzzy
 msgid "Could not add delegate %s"
-msgstr ""
+msgstr "არა დამატება წმ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:963
+#, fuzzy
 msgid "Error reading delegates list."
-msgstr ""
+msgstr "შეცდომა სია."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#, fuzzy
 msgid "Author (read, create)"
-msgstr ""
+msgstr "ავტორი"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
@@ -15823,7 +16327,7 @@ msgstr ""
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 #, fuzzy
 msgid "Editor (read, create, edit)"
-msgstr "რედაქტორი"
+msgstr "რედაქტორი რედაქტირება"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 #, fuzzy
@@ -15835,14 +16339,16 @@ msgid "Reviewer (read-only)"
 msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#, fuzzy
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
-msgstr ""
+msgstr "-სკენ ფოსტა ჩართულია."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#, fuzzy
 msgid "_Delegate can see private items"
-msgstr ""
+msgstr "პირადი"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:17
@@ -15869,47 +16375,54 @@ msgstr "საქაღალდის ზომა"
 
 #: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+#, fuzzy
 msgid "Subscribe to Other User's Folder"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ სხვა მომხმარებელი წმ საქაღალდე"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+#, fuzzy
 msgid "Exchange Folder Tree"
-msgstr ""
+msgstr "გაცვლა საქაღალდე განშტოება"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
 #: ../plugins/exchange-operations/exchange-folder.c:229
 #: ../plugins/exchange-operations/exchange-folder.c:239
 #, fuzzy
 msgid "Unsubscribe Folder..."
-msgstr "საქაღალდე."
+msgstr "ხელმოუწერელი საქაღალდე."
 
 #: ../plugins/exchange-operations/exchange-folder.c:463
 #: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
+#, fuzzy
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr ""
+msgstr "წმ?"
 
 #: ../plugins/exchange-operations/exchange-folder.c:475
 #: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
+#, fuzzy
 msgid "Unsubscribe from \"%s\""
-msgstr ""
+msgstr "ხელმოუწერელი წმ"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+#, fuzzy
 msgid "Password Expiry Warning..."
-msgstr ""
+msgstr "პაროლი გაფრთხილება."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+#, fuzzy
 msgid "Your password will expire in 7 days..."
-msgstr ""
+msgstr "- დღე."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
 msgstr "პაროლის _შეცვლა"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+#, fuzzy
 msgid "ok_button"
-msgstr ""
+msgstr "დიახ"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
@@ -15946,22 +16459,24 @@ msgid "Create subfolders"
 msgstr "შექმნა"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#, fuzzy
 msgid "Delete Any Items"
-msgstr ""
+msgstr "წაშლა ნებისმიერი ელემენტები"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#, fuzzy
 msgid "Delete Own Items"
-msgstr ""
+msgstr "წაშლა ელემენტები"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 #, fuzzy
 msgid "Edit Any Items"
-msgstr "რედაქტირება"
+msgstr "რედაქტირება ნებისმიერი ელემენტები"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 #, fuzzy
 msgid "Edit Own Items"
-msgstr "რედაქტირება"
+msgstr "რედაქტირება ელემენტები"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 #, fuzzy
@@ -15975,12 +16490,12 @@ msgstr "საქაღალდის პატრონი"
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 #, fuzzy
 msgid "Folder visible"
-msgstr "ხილული საქაღალდე"
+msgstr "საქაღალდე ხოლული"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 #, fuzzy
 msgid "Read items"
-msgstr "წაკითხული"
+msgstr "წაკითხვა"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
@@ -15996,102 +16511,123 @@ msgid "Address Book..."
 msgstr "მისამართების წიგნაკი..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+#, fuzzy
 msgid "Subscribe to Other User's Contacts"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ სხვა მომხმარებელი წმ მეგობრები"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+#, fuzzy
 msgid "Subscribe to Other User's Calendar"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ სხვა მომხმარებელი წმ კალენდარი"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr ""
+msgstr "A a - გაცვლა ანგარიში და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 #, fuzzy
 msgid "Exchange Operations"
-msgstr "პარამეტრები"
+msgstr "გაცვლა ოპერაციები"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+#, fuzzy
 msgid "Cannot change password due to configuration problems."
-msgstr ""
+msgstr "-სკენ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#, fuzzy
 msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
-msgstr ""
+msgstr "ცვლილებები -სკენ გაცვლა ანგარიში დასრულება და Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#, fuzzy
 msgid "Could not authenticate to server."
-msgstr ""
+msgstr "არა -სკენ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#, fuzzy
 msgid "Could not change password."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#, fuzzy
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
-msgstr ""
+msgstr "არა გაცვლა ანგარიში უცნობი შეცდომა შემოწმება URL და და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#, fuzzy
 msgid "Could not connect to Exchange server."
-msgstr ""
+msgstr "არა -სკენ გაცვლა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#, fuzzy
 msgid "Could not connect to server {0}."
-msgstr ""
+msgstr "არა -სკენ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#, fuzzy
 msgid "Could not determine folder permissions for delegates."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#, fuzzy
 msgid "Could not find Exchange Web Storage System."
-msgstr ""
+msgstr "არა პოვნა გაცვლა ვები სისტემა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#, fuzzy
 msgid "Could not locate server {0}."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#, fuzzy
 msgid "Could not make {0} a delegate"
-msgstr ""
+msgstr "არა a"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#, fuzzy
 msgid "Could not read folder permissions"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#, fuzzy
 msgid "Could not read folder permissions."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#, fuzzy
 msgid "Could not read out-of-office state"
-msgstr ""
+msgstr "არა -"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#, fuzzy
 msgid "Could not update folder permissions."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#, fuzzy
 msgid "Could not update out-of-office state"
-msgstr ""
+msgstr "არა -"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#, fuzzy
 msgid "Exchange Account is offline."
-msgstr ""
+msgstr "გაცვლა ანგარიში ხაზიდან გასვლა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#, fuzzy
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16105,11 +16641,12 @@ msgid ""
 "\n"
 "{0}\n"
 "  "
-msgstr ""
+msgstr "გაცვლა -სკენ ჩართულია გაცვლა სერვერი გამორთული ან გაცვლა -სკენ - -სკენ -სკენ Evolution გაცვლა არა -სკენ -სკენ გაცვლა ბმული არა არა არა "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#, fuzzy
 msgid "Failed to update delegates:"
-msgstr ""
+msgstr "ვერ განხორციელდა -სკენ:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
@@ -16122,7 +16659,7 @@ msgstr "საქაღალდე არ არსებობს"
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Folder offline"
-msgstr "საქაღალდე კავშირგარეშე რეჟიმი"
+msgstr "საქაღალდე ხაზიდან გასვლა"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1269
@@ -16130,39 +16667,46 @@ msgid "Generic error"
 msgstr "ზოგადი შეცდომა"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#, fuzzy
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr ""
+msgstr "გაშვებული ჩართულია a - ანგარიში დიალოგი."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #, fuzzy
 msgid "Mailbox for {0} is not on this server."
-msgstr "საფოსტო ყუთი."
+msgstr "საფოსტო ყუთი არა ჩართულია."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#, fuzzy
 msgid "Make sure the URL is correct and try again."
-msgstr ""
+msgstr "Make URL და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#, fuzzy
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
+msgstr "Make სახელი და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#, fuzzy
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
+msgstr "Make და და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#, fuzzy
 msgid "No Global Catalog server configured for this account."
-msgstr ""
+msgstr "არა ზოგადი ანგარიში."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#, fuzzy
 msgid "No mailbox for user {0} on {1}."
-msgstr ""
+msgstr "არა საფოსტო ყუთი ჩართულია."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#, fuzzy
 msgid "No such user {0}"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
@@ -16173,56 +16717,66 @@ msgid "Please restart Evolution"
 msgstr "გთხოვთ თავიდან ჩართოთ ევოლუშენი"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#, fuzzy
 msgid "Please select a user."
-msgstr ""
+msgstr "a."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#, fuzzy
 msgid "Server rejected password because it is too weak."
-msgstr ""
+msgstr "სერვერი."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#, fuzzy
 msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr ""
+msgstr "გაცვლა ანგარიში გამორთული დასრულება Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#, fuzzy
 msgid "The Exchange account will be removed when you quit Evolution"
-msgstr ""
+msgstr "გაცვლა ანგარიში დასრულება Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#, fuzzy
 msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr ""
+msgstr "გაცვლა არა გაცვლა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#, fuzzy
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
+msgstr "გაშვებული გაცვლა გაცვლა გაცვლა და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#, fuzzy
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
 "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
 "\n"
 "Or you might have just typed your password wrong."
-msgstr ""
+msgstr "-სკენ ფანჯრები სახელი -&quot; დომეინი&quot; არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#, fuzzy
 msgid "Try again with a different password."
-msgstr ""
+msgstr "ცდა a."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#, fuzzy
 msgid "Unable to add user to access control list:"
-msgstr ""
+msgstr "-სკენ დამატება -სკენ სია:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#, fuzzy
 msgid "Unable to edit delegates."
-msgstr ""
+msgstr "-სკენ რედაქტირება."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 #, fuzzy
 msgid "Unknown error looking up {0}"
-msgstr "უცნობი შეცდომა"
+msgstr "უცნობი შეცდომა ზემოთ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
@@ -16237,83 +16791,99 @@ msgid "Unsupported operation"
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#, fuzzy
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
+msgstr "თქვენ ფოსტა ჩართულია."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#, fuzzy
 msgid "You cannot make yourself your own delegate"
-msgstr ""
+msgstr "თქვენ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#, fuzzy
 msgid "You have exceeded your quota for storing mail on this server."
-msgstr ""
+msgstr "თქვენ ფოსტა ჩართულია."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#, fuzzy
 msgid "You may only configure a single Exchange account."
-msgstr ""
+msgstr "თქვენ a გაცვლა ანგარიში."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
-msgstr ""
+msgstr "კბ ცდა -სკენ გასუფთავება ზემოთ მონაცემები მონაცემები ფოსტა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr ""
+msgstr "კბ თქვენ არა -სკენ ან ფოსტა ახლა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr ""
+msgstr "კბ თქვენ არა -სკენ ფოსტა გასუფთავება ზემოთ მონაცემები მონაცემები ფოსტა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#, fuzzy
 msgid "{0} cannot be added to an access control list"
-msgstr ""
+msgstr "-სკენ სია"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#, fuzzy
 msgid "{0} is already a delegate"
-msgstr ""
+msgstr "a"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#, fuzzy
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "- სია"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+#, fuzzy
 msgid "Subscribe to Other User's Tasks"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ სხვა მომხმარებელი წმ ამოცანები"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+#, fuzzy
 msgid "Check folder permissions"
-msgstr ""
+msgstr "შემოწმება"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
+#, fuzzy
 msgid "Unsubscribing from folder \"%s\""
-msgstr ""
+msgstr "წმ"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+#, fuzzy
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
+msgstr "- ფოსტა - ხე მენიუ."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+#, fuzzy
 msgid "Unsubscribe Folders"
-msgstr ""
+msgstr "ხელმოუწერელი საქაღალდეები"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+#, fuzzy
 msgid "Groupwise Account Setup"
-msgstr ""
+msgstr "ანგარიში პარამეტრები"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 #, fuzzy
@@ -16323,12 +16893,12 @@ msgstr "პარამეტრები"
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 #, fuzzy
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b> პარამეტრები</b>"
+msgstr "<b> ფოსტა პარამეტრები</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 #, fuzzy
 msgid "Junk Mail Settings..."
-msgstr "პარამეტრები."
+msgstr "ფოსტა პარამეტრები."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 #, fuzzy
@@ -16342,7 +16912,7 @@ msgstr "ელფოსტა:"
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 #, fuzzy
 msgid "Junk Mail Settings"
-msgstr "პარამეტრები"
+msgstr "ფოსტა პარამეტრები"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -16350,16 +16920,19 @@ msgid "_Disable"
 msgstr "_გამორთვა"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:6
+#, fuzzy
 msgid "_Enable"
-msgstr ""
+msgstr "ჩართვა"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
+#, fuzzy
 msgid "_Junk List"
-msgstr ""
+msgstr "სია"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+#, fuzzy
 msgid "Add Send Options to groupwise messages"
-msgstr ""
+msgstr "დამატება გაგზავნა ოფციები -სკენ"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
@@ -16368,8 +16941,9 @@ msgid "Send Options"
 msgstr "გაგზავნის ოფციები"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin for the features in Groupwise accounts."
-msgstr ""
+msgstr "A - ანგარიშები."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 #, fuzzy
@@ -16379,7 +16953,7 @@ msgstr "შესაძლებლობანი"
 #: ../plugins/groupwise-features/process-meeting.c:49
 #, fuzzy
 msgid "Accept Tentatively"
-msgstr "მიიღე"
+msgstr "მიღება"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
@@ -16394,39 +16968,46 @@ msgstr "შეტყობინება"
 #: ../plugins/groupwise-features/properties.glade.h:6
 #, fuzzy
 msgid "Shared Folder Notification"
-msgstr "საქაღალდე შეტყობინება"
+msgstr "გაზიარებული საქაღალდე ნოიფიკაცია"
 
 #: ../plugins/groupwise-features/properties.glade.h:8
+#, fuzzy
 msgid "The participants will receive the following notification.\n"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/groupwise-features/properties.glade.h:11
+#, fuzzy
 msgid "_Contacts..."
-msgstr ""
+msgstr "მეგობრები."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
+#, fuzzy
 msgid "_Customize notification message"
-msgstr ""
+msgstr "გამართვა"
 
 #: ../plugins/groupwise-features/properties.glade.h:13
+#, fuzzy
 msgid "_Not Shared"
-msgstr ""
+msgstr "გაზიარებული"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
+#, fuzzy
 msgid "_Shared With ..."
-msgstr ""
+msgstr "გაზიარებული."
 
 #: ../plugins/groupwise-features/properties.glade.h:16
+#, fuzzy
 msgid "_Sharing"
-msgstr ""
+msgstr "გაზიარება"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
 msgid "<b>Name</b>"
 msgstr "<b>სახელი</b>"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#, fuzzy
 msgid "Access Rights"
-msgstr ""
+msgstr "წვდომის უფლებები"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
 msgid "Add/Edit"
@@ -16437,25 +17018,29 @@ msgid "Con_tacts"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#, fuzzy
 msgid "Modify _folders/options/rules/"
-msgstr ""
+msgstr "შეცვლა"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#, fuzzy
 msgid "Read items marked _private"
-msgstr ""
+msgstr "წაკითხვა პირადი"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 #, fuzzy
 msgid "Reminder Notes"
-msgstr "შენიშვნები"
+msgstr "შემხსენებელი ჩანაწერები"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#, fuzzy
 msgid "Subscribe to my _alarms"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#, fuzzy
 msgid "Subscribe to my _notifications"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
 #: ../ui/evolution-mail-message.xml.h:126
@@ -16484,8 +17069,9 @@ msgstr "პროქსი შესვლა"
 #: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
+#, fuzzy
 msgid "%sEnter password for %s (user %s)"
-msgstr ""
+msgstr "წმ წმ"
 
 #: ../plugins/groupwise-features/proxy-login.c:505
 #, fuzzy
@@ -16493,43 +17079,48 @@ msgid "_Proxy Login..."
 msgstr "პროქსი შესვლა."
 
 #: ../plugins/groupwise-features/proxy.c:697
+#, fuzzy
 msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
+msgstr "პროქსი ანგარიში ხაზზე."
 
 #: ../plugins/groupwise-features/proxy.c:702
+#, fuzzy
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
+msgstr "პროქსი ანგარიში ჩართული."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
 msgstr "მომხმარებლები"
 
 #: ../plugins/groupwise-features/share-folder-common.c:323
+#, fuzzy
 msgid "Enter the users and set permissions"
-msgstr ""
+msgstr "შეყვანა და"
 
 #: ../plugins/groupwise-features/share-folder-common.c:342
 #, fuzzy
 msgid "New _Shared Folder..."
-msgstr "ახალი საქაღალდე."
+msgstr "ახალი გაზიარებული საქაღალდე."
 
 #: ../plugins/groupwise-features/share-folder-common.c:450
+#, fuzzy
 msgid "Sharing"
-msgstr ""
+msgstr "გაზიარება"
 
 #: ../plugins/groupwise-features/status-track.c:242
 #, fuzzy
 msgid "Track Message Status..."
-msgstr "კვალი შეტყობინება სტატუსი."
+msgstr "აუდიოკვალი შეტყობინება სტატუსი."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin to setup hula calendar sources."
-msgstr ""
+msgstr "A -სკენ კალენდარი."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 #, fuzzy
 msgid "Hula Account Setup"
-msgstr "ანგარიში ინსტალაცია"
+msgstr "ანგარიში პარამეტრები"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
@@ -16544,13 +17135,14 @@ msgid "Import ICS"
 msgstr "ICS-ის იმპორტი"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:226
+#, fuzzy
 msgid "Select Task List"
-msgstr ""
+msgstr "ამორჩევა ამოცანა სია"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:230
 #, fuzzy
 msgid "Select Calendar"
-msgstr "კალენდარი"
+msgstr "ამორჩევა კალენდარი"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
 #: ../shell/e-shell-importer.c:703
@@ -16559,186 +17151,220 @@ msgstr "_იმპორტი"
 
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:137
+#, fuzzy
 msgid "iCalendar format (.ics)"
-msgstr ""
+msgstr "iCalendar"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+#, fuzzy
 msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr ""
+msgstr "დრო კალენდარი წიგნაკი"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+#, fuzzy
 msgid "Synchronize to iPod"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod სინქრონიზაცია"
 
 #: ../plugins/ipod-sync/sync.c:158
+#, fuzzy
 msgid "No output directory!"
-msgstr ""
+msgstr "არა!"
 
 #: ../plugins/ipod-sync/sync.c:159
+#, fuzzy
 msgid ""
 "The output directory was not found on iPod! Please ensure that iPod has been "
 "correctly set up and try again."
-msgstr ""
+msgstr "არა ჩართულია ზემოთ და."
 
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+#, fuzzy
 msgid "Could not export data!"
-msgstr ""
+msgstr "არა!"
 
 #: ../plugins/ipod-sync/sync.c:203
+#, fuzzy
 msgid "Exporting data failed."
-msgstr ""
+msgstr "ექსპორტირება."
 
 #: ../plugins/ipod-sync/sync.c:231
 #, fuzzy
 msgid "Could not open addressbook!"
-msgstr "evolution მისამართების გწიგნაკი"
+msgstr "არა გახსნა წიგნაკი!"
 
 #: ../plugins/ipod-sync/sync.c:232
+#, fuzzy
 msgid "Could not open the Evolution addressbook to export data."
-msgstr ""
+msgstr "არა გახსნა Evolution წიგნაკი -სკენ."
 
 #: ../plugins/ipod-sync/sync.c:291
+#, fuzzy
 msgid "Could not open calendar/todo!"
-msgstr ""
+msgstr "არა გახსნა კალენდარი!"
 
 #: ../plugins/ipod-sync/sync.c:292
+#, fuzzy
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
+msgstr "არა გახსნა Evolution კალენდარი სია -სკენ."
 
 #: ../plugins/itip-formatter/itip-formatter.c:275
 #: ../plugins/itip-formatter/itip-formatter.c:392
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s'"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ"
+msgstr "ვერ განხორციელდა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
+#, fuzzy
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
+msgstr "- კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:433
 #, fuzzy, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "შეცდომა"
+msgstr "- კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:488
+#, fuzzy
 msgid "Unable to find any calendars"
-msgstr ""
+msgstr "-სკენ პოვნა ნებისმიერი"
 
 #: ../plugins/itip-formatter/itip-formatter.c:495
+#, fuzzy
 msgid "Unable to find this meeting in any calendar"
-msgstr ""
+msgstr "-სკენ პოვნა - ნებისმიერი კალენდარი"
 
 #: ../plugins/itip-formatter/itip-formatter.c:499
+#, fuzzy
 msgid "Unable to find this task in any task list"
-msgstr ""
+msgstr "-სკენ პოვნა დრო - ნებისმიერი დრო სია"
 
 #: ../plugins/itip-formatter/itip-formatter.c:503
+#, fuzzy
 msgid "Unable to find this journal entry in any journal"
-msgstr ""
+msgstr "-სკენ პოვნა ელემენტი - ნებისმიერი"
 
 #: ../plugins/itip-formatter/itip-formatter.c:529
+#, fuzzy
 msgid "Searching for an existing version of this appointment"
-msgstr ""
+msgstr "ვეძებ -"
 
 #: ../plugins/itip-formatter/itip-formatter.c:726
+#, fuzzy
 msgid "Unable to parse item"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
+#, fuzzy
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr ""
+msgstr "-სკენ -სკენ კალენდარი წმ წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
+#, fuzzy
 msgid "Sent to calendar '%s' as accepted"
-msgstr ""
+msgstr "გაგზავნა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
+#, fuzzy
 msgid "Sent to calendar '%s' as tentative"
-msgstr ""
+msgstr "გაგზავნა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
+#, fuzzy
 msgid "Sent to calendar '%s' as declined"
-msgstr ""
+msgstr "გაგზავნა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
+#, fuzzy
 msgid "Sent to calendar '%s' as canceled"
-msgstr ""
+msgstr "გაგზავნა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
+#, fuzzy
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "წმ "
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
+#, fuzzy
 msgid "Sent a cancelation notice to the delegate"
-msgstr ""
+msgstr "გაგზავნა a -სკენ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:909
+#, fuzzy
 msgid "Could not send the cancelation notice to the delegate"
-msgstr ""
+msgstr "არა -სკენ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:994
+#, fuzzy
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
+msgstr "არა მცდარი"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
+#, fuzzy
 msgid "Unable to update attendee. %s"
-msgstr ""
+msgstr "-სკენ წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr ""
 
 #: ../plugins/itip-formatter/itip-formatter.c:1152
+#, fuzzy
 msgid "The calendar attached is not valid"
-msgstr ""
+msgstr "კალენდარი არა"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1153
+#, fuzzy
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr ""
+msgstr "-სკენ შეიცავს a კალენდარი კალენდარი არა a iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:1202
 #: ../plugins/itip-formatter/itip-formatter.c:1278
+#, fuzzy
 msgid "The item in the calendar is not valid"
-msgstr ""
+msgstr "- კალენდარი არა"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1188
 #: ../plugins/itip-formatter/itip-formatter.c:1203
 #: ../plugins/itip-formatter/itip-formatter.c:1279
+#, fuzzy
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
-msgstr ""
+msgstr "შეიცავს a კალენდარი კალენდარი შეიცავს არა ამოცანები ან"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1213
+#, fuzzy
 msgid "The calendar attached contains multiple items"
-msgstr ""
+msgstr "კალენდარი შეიცავს"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1214
+#, fuzzy
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr ""
+msgstr "ვის ყველა - ფაილი და კალენდარი"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1994
+#, fuzzy
 msgid "_Delete message after acting"
-msgstr ""
+msgstr "წაშლა"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2004
 #: ../plugins/itip-formatter/itip-formatter.c:2036
@@ -16747,8 +17373,9 @@ msgstr "კონფლიქტების ძებნა"
 
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2019
+#, fuzzy
 msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
+msgstr "ამორჩევა -სკენ ძიება"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
@@ -16895,145 +17522,173 @@ msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
 #: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr ""
+msgstr "<b> წმ</b> წმ:"
 
 #: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr ""
+msgstr "<b> წმ</b>:"
 
 #: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ:"
 
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr ""
+msgstr "<b> წმ</b> წმ ეთ:"
 
 #: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr ""
+msgstr "<b> წმ</b> ეთ:"
 
 #: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
+msgstr "<b> წმ</b> წმ -სკენ დამატება -სკენ:"
 
 #: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ დამატება -სკენ:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr ""
+msgstr "<b> წმ</b> გაგზავნილი:"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr ""
+msgstr "<b> წმ</b> წმ:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has canceled the following meeting."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
+msgstr "<b> წმ</b> წმ:"
 
 #: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published the following task:"
-msgstr ""
+msgstr "<b> წმ</b> დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr ""
+msgstr "<b> წმ</b> - წმ -სკენ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ a დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has assigned you a task:"
-msgstr ""
+msgstr "<b> წმ</b> a დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ -სკენ დამატება -სკენ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ დამატება -სკენ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
+#, fuzzy
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr ""
+msgstr "<b> წმ</b> გაგზავნილი დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr ""
+msgstr "<b> წმ</b> დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> დრო:"
 
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:705
@@ -17061,8 +17716,9 @@ msgid "_Decline"
 msgstr "_უარი"
 
 #: ../plugins/itip-formatter/itip-view.c:714
+#, fuzzy
 msgid "_Tentative all"
-msgstr ""
+msgstr "ყველა"
 
 #: ../plugins/itip-formatter/itip-view.c:714
 #: ../plugins/itip-formatter/itip-view.c:719
@@ -17083,8 +17739,9 @@ msgstr "_გააგზავე ინფორმაცია"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:728
+#, fuzzy
 msgid "_Update Attendee Status"
-msgstr ""
+msgstr "განახლება სტატუსი"
 
 #: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
@@ -17107,42 +17764,49 @@ msgid "Comment:"
 msgstr "კომენტარი:"
 
 #: ../plugins/itip-formatter/itip-view.c:977
+#, fuzzy
 msgid "Send u_pdates to attendees"
-msgstr ""
+msgstr "გაგზავნა u -სკენ"
 
 #: ../plugins/itip-formatter/itip-view.c:986
+#, fuzzy
 msgid "A_pply to all instances"
-msgstr ""
+msgstr "A -სკენ ყველა"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+#, fuzzy
 msgid "Displays text/calendar parts in messages."
-msgstr ""
+msgstr "ტექსტი კალენდარი -."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#, fuzzy
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot; ?"
-msgstr ""
+msgstr "&quot;&quot; -სკენ დამატება&quot;&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#, fuzzy
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
+msgstr "არა a დამატება?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
+#, fuzzy
 msgid "Proxy _Logout"
-msgstr ""
+msgstr "პროქსი გამოსვლა"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+#, fuzzy
 msgid "Allows disabling of accounts."
-msgstr ""
+msgstr "- ანგარიშები."
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
@@ -17155,57 +17819,69 @@ msgstr "სისტემის შეცდომა: %s"
 
 #: ../plugins/mail-remote/client.c:32
 #, c-format
+#, fuzzy
 msgid "Camel error: %s"
-msgstr ""
+msgstr "შეცდომა წმ"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:476
+#, fuzzy
 msgid "Account cannot send e-mail"
-msgstr ""
+msgstr "ანგარიში e ფოსტა"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:605
+#, fuzzy
 msgid "No store available"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr ""
+msgstr "A a ფოსტა."
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+#, fuzzy
 msgid "Mail Remote"
-msgstr ""
+msgstr "ფოსტა დაშორებული"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
 "message."
-msgstr ""
+msgstr "A - - a ფოსტა."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+#, fuzzy
 msgid "Con_vert to Meeting"
-msgstr ""
+msgstr "-სკენ შეხვედრა"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+#, fuzzy
 msgid "Mail to meeting"
-msgstr ""
+msgstr "ფოსტა -სკენ"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr ""
+msgstr "A - ამოცანები - a ფოსტა."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+#, fuzzy
 msgid "Con_vert to Task"
-msgstr ""
+msgstr "-სკენ ამოცანა"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+#, fuzzy
 msgid "Mail to task"
-msgstr ""
+msgstr "ფოსტა -სკენ დრო"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#, fuzzy
 msgid "Convert the selected message to a new task"
-msgstr ""
+msgstr "გარდაქმნა -სკენ a ახალი დრო"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
@@ -17214,99 +17890,117 @@ msgstr "კონტაქტების სიის _პატრონი"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+#, fuzzy
 msgid "Get list _archive"
-msgstr ""
+msgstr "მიღება სია"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#, fuzzy
 msgid "Get list _usage information"
-msgstr ""
+msgstr "მიღება სია"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+#, fuzzy
 msgid "Mailing List Actions"
-msgstr ""
+msgstr "სია მოქმედებები"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+#, fuzzy
 msgid "Mailing _List"
-msgstr ""
+msgstr "სია"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+#, fuzzy
 msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
-msgstr ""
+msgstr "სია."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#, fuzzy
 msgid "_Post message to list"
-msgstr ""
+msgstr "-სკენ სია"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#, fuzzy
 msgid "_Subscribe to list"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ სია"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#, fuzzy
 msgid "_Un-subscribe to list"
-msgstr ""
+msgstr "-სკენ სია"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+#, fuzzy
 msgid "Action not available"
-msgstr ""
+msgstr "მოქმედება არა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+#, fuzzy
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
 "message automatically, or see and change it first.\n"
 "\n"
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
-msgstr ""
+msgstr "e ფოსტა გაგზავნილი -სკენ URL თქვენ ან და პირველი არა სია გაგზავნილი."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+#, fuzzy
 msgid "Malformed header"
-msgstr ""
+msgstr "უვარგისი თავსართი"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#, fuzzy
 msgid "No e-mail action"
-msgstr ""
+msgstr "არა e ფოსტა მოქმედება"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+#, fuzzy
 msgid "Posting not allowed"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+#, fuzzy
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
-msgstr ""
+msgstr "-სკენ სია არა a სია კონტაქტი სია."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#, fuzzy
 msgid "Send e-mail message to mailing list?"
-msgstr ""
+msgstr "გაგზავნა e ფოსტა -სკენ სია?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
-msgstr ""
+msgstr "მოქმედება არა თავსართი მოქმედება არა შეიცავს ნებისმიერი მოქმედება არა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+#, fuzzy
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
 "Header: {1}"
-msgstr ""
+msgstr "თავსართი - და არა არა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+#, fuzzy
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
+msgstr "არა შეიცავს თავსართი მოქმედება."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -17317,33 +18011,39 @@ msgid "_Send message"
 msgstr "წერილის _გაგზავნა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+#, fuzzy
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
+msgstr "კონტაქტი - სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+#, fuzzy
 msgid "Get an archive of the list this message belongs to"
-msgstr ""
+msgstr "მიღება - სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#, fuzzy
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
+msgstr "მიღება შესახებ - სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+#, fuzzy
 msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
+msgstr "a -სკენ სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+#, fuzzy
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr ""
+msgstr "ხელმოუწერელი -სკენ სია -სკენ"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 #, fuzzy
 msgid "Mark All Read"
-msgstr "ყველა წაკითხული"
+msgstr "ყველა წაკითხვა"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 #, fuzzy
@@ -17351,53 +18051,58 @@ msgid "Mark me_ssages as read"
 msgstr "წაკითხული"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+#, fuzzy
 msgid "Used for marking all the messages under a folder as read"
-msgstr ""
+msgstr "გამოყენებულია ყველა a"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 #, fuzzy
 msgid "Mark calendar offline"
-msgstr "კავშირგარეშე რეჟიმი"
+msgstr "კალენდარი ხაზიდან გასვლა"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
 #, fuzzy
 msgid "Marks the selected calendar for offline viewing."
-msgstr "კავშირგარეშე რეჟიმი."
+msgstr "კალენდარი ხაზიდან გასვლა."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+#, fuzzy
 msgid "_Do not make this available offline"
-msgstr ""
+msgstr "არა ხაზიდან გასვლა"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+#, fuzzy
 msgid "_Mark Calendar for offline use"
-msgstr ""
+msgstr "კალენდარი ხაზიდან გასვლა"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin which implements mono plugins."
-msgstr ""
+msgstr "A მონო."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "მონო "
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
+#, fuzzy
 msgid "Generates a D-BUS message when new mail arrives."
-msgstr ""
+msgstr "a D ახალი ფოსტა."
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
 #, fuzzy
 msgid "New Mail Notification"
-msgstr "ახალი შეტყობინება"
+msgstr "გაფრთხილება ახალ წერილზე"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
 #, fuzzy
 msgid "New mail notify"
-msgstr "ახალი"
+msgstr "ახალი ფოსტა"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 #, fuzzy
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "A ჩართული გამორთული."
+msgstr "A ჩართული ან გამორთული."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -17406,8 +18111,9 @@ msgid "Plugin Manager"
 msgstr "პლაგინების მმართველი"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#, fuzzy
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "ჩართვა და გამორთვა"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
@@ -17424,8 +18130,9 @@ msgid "Description"
 msgstr "აღწერა"
 
 #: ../plugins/plugin-manager/plugin-manager.c:193
+#, fuzzy
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
+msgstr "შენიშვნა არა"
 
 #: ../plugins/plugin-manager/plugin-manager.c:202
 #: ../plugins/plugin-manager/plugin-manager.c:262
@@ -17433,12 +18140,13 @@ msgid "Plugin"
 msgstr "პლაგინი"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
 "disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
-msgstr ""
+msgstr "A a -სკენ გამორთვა HTML არა არა"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
@@ -17447,35 +18155,40 @@ msgid "Plain Text Mode"
 msgstr "გლუვი ტექსტი რეჟიმი"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+#, fuzzy
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "ტექსტი"
 
 #: ../plugins/prefer-plain/prefer-plain.c:105
+#, fuzzy
 msgid "Show HTML if present"
-msgstr ""
+msgstr "ჩვენება HTML აწმყო"
 
 #: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
 msgstr ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:107
+#, fuzzy
 msgid "Only ever show PLAIN"
-msgstr ""
+msgstr "მხოლოდ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML რეჟიმი"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
+#, fuzzy
 msgid "Gives an option to print mail from composer"
-msgstr ""
+msgstr "-სკენ ბეჭდვა ფოსტა"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
+#, fuzzy
 msgid "Print Pre_view"
-msgstr ""
+msgstr "_ესკიზი"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
 msgid "Prints the message"
@@ -17486,17 +18199,19 @@ msgid "Evolution Profiler"
 msgstr "ევოლუშენ პროფაილერი"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+#, fuzzy
 msgid "Writes a log of profiling data events."
-msgstr ""
+msgstr "a -."
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#, fuzzy
 msgid "Allows calendars to be published to the web"
-msgstr ""
+msgstr "-სკენ -სკენ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 #, fuzzy
 msgid "Calendar Publishing"
-msgstr "კალენდარი"
+msgstr "კალენდარი გამომცემლობა"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 #, fuzzy
@@ -17506,29 +18221,30 @@ msgstr "ადგილმდებარეობა"
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 #, fuzzy
 msgid "_Publish Calendar Information"
-msgstr "კალენდარი ინფორმაცია"
+msgstr "გამოქვეყნება კალენდარი ინფორმაცია"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 #, fuzzy
 msgid "Are you sure you want to remove this URL?"
-msgstr "-სკენ URL?"
+msgstr "-სკენ ამოშლა URL?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 #, fuzzy
 msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\"> ადგილმდებარეობა</span>"
+msgstr "<span weight=\"bold\"> მდებარეობა</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:4
 #, fuzzy
 msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">სტატუსი</span>"
+msgstr "<span weight=\"bold\"> წყაროები</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:6
+#, fuzzy
 msgid ""
 "Daily\n"
 "Weekly\n"
 "Manual (via Actions menu)"
-msgstr ""
+msgstr "ყოველდღიურად მოქმედებები მენიუ"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
@@ -17537,14 +18253,15 @@ msgstr "პ_ორტი:"
 #: ../plugins/publish-calendar/publish-calendar.glade.h:11
 #, fuzzy
 msgid "Publishing Location"
-msgstr "ადგილმდებარეობა"
+msgstr "გამომცემლობა მდებარეობა"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:12
 #, fuzzy
 msgid "Publishing _Frequency:"
-msgstr "სიხშირე:"
+msgstr "გამომცემლობა სიხშირე:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
 msgid ""
 "SSH\n"
 "Public FTP\n"
@@ -17553,7 +18270,7 @@ msgid ""
 "WebDAV (HTTP)\n"
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
-msgstr ""
+msgstr "SSH FTP HTTP მდებარეობა"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
@@ -17564,49 +18281,58 @@ msgid "_File:"
 msgstr "_ფაილი:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#, fuzzy
 msgid "_Publish as:"
-msgstr ""
+msgstr "გამოქვეყნება:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#, fuzzy
 msgid ""
 "iCal\n"
 "Free/Busy"
-msgstr ""
+msgstr "დაკავებული"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:101
+#, fuzzy
 msgid "Spamassassin (built-in)"
-msgstr ""
+msgstr "-"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
-msgstr ""
+msgstr "ფილტრები -სკენ."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
 msgstr ""
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr ""
+msgstr "A ყველა ან - a ეთ."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#, fuzzy
 msgid "Save attachments"
-msgstr ""
+msgstr "შენახვა"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#, fuzzy
 msgid "Save Attachments ..."
-msgstr ""
+msgstr "შენახვა დანართები."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+#, fuzzy
 msgid "Save all attachments"
-msgstr ""
+msgstr "შენახვა ყველა"
 
 #: ../plugins/save-attachments/save-attachments.c:338
+#, fuzzy
 msgid "Select save base name"
-msgstr ""
+msgstr "ამორჩევა შენახვა სახელი"
 
 #: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
@@ -17622,8 +18348,9 @@ msgstr "შენახვა"
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
 #: ../plugins/save-calendar/csv-format.c:171
+#, fuzzy
 msgid "%F %T"
-msgstr ""
+msgstr "F T"
 
 #: ../plugins/save-calendar/csv-format.c:385
 msgid "UID"
@@ -17641,7 +18368,7 @@ msgstr "კატეგორიების სია"
 #: ../plugins/save-calendar/csv-format.c:389
 #, fuzzy
 msgid "Comment List"
-msgstr "შენიშვნ სია"
+msgstr "კომენტარი სია"
 
 #: ../plugins/save-calendar/csv-format.c:391
 msgid "Created"
@@ -17662,29 +18389,31 @@ msgstr "დასრულება"
 #: ../plugins/save-calendar/csv-format.c:396
 #, fuzzy
 msgid "percent Done"
-msgstr "შესრულებული პროცენტი"
+msgstr "შესრულებულია"
 
 #: ../plugins/save-calendar/csv-format.c:398
 msgid "URL"
 msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:399
+#, fuzzy
 msgid "Attendees List"
-msgstr ""
+msgstr "სია"
 
 #: ../plugins/save-calendar/csv-format.c:401
 #, fuzzy
 msgid "Modified"
-msgstr "შეცვლილია"
+msgstr "ჩასწორებულია"
 
 #: ../plugins/save-calendar/csv-format.c:552
 #, fuzzy
 msgid "Advanced options for the CSV format"
-msgstr "დამატებითი"
+msgstr "დეტალური CSV"
 
 #: ../plugins/save-calendar/csv-format.c:559
+#, fuzzy
 msgid "Prepend a header"
-msgstr ""
+msgstr "a თავსართი"
 
 #: ../plugins/save-calendar/csv-format.c:568
 #, fuzzy
@@ -17708,8 +18437,9 @@ msgid "Save Selected"
 msgstr "ამორჩეულის შენახვა"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#, fuzzy
 msgid "Saves selected calendar or tasks list to disk."
-msgstr ""
+msgstr "კალენდარი ან ამოცანები სია -სკენ."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -17721,8 +18451,9 @@ msgstr "_შენახვა დისკზე"
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
 #: ../plugins/save-calendar/rdf-format.c:158
+#, fuzzy
 msgid "%FT%T"
-msgstr ""
+msgstr "T"
 
 #: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
@@ -17730,16 +18461,19 @@ msgstr ""
 
 #: ../plugins/save-calendar/save-calendar.c:169
 #: ../plugins/save-calendar/save-calendar.c:179
+#, fuzzy
 msgid "Select destination file"
-msgstr ""
+msgstr "ამორჩევა ფაილი"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+#, fuzzy
 msgid "Select one source"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+#, fuzzy
 msgid "Selects a single calendar or task source for viewing."
-msgstr ""
+msgstr "a კალენდარი ან დრო."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -17750,40 +18484,45 @@ msgid "Show _only this Task List"
 msgstr "აჩვენე _მხოლოდ ეს დავალებათა სია"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin that handles the Startup wizard."
-msgstr ""
+msgstr "A დასაწყისი."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+#, fuzzy
 msgid "Startup wizard"
-msgstr ""
+msgstr "დასაწყისი"
 
 #: ../plugins/startup-wizard/startup-wizard.c:85
 #, fuzzy
 msgid "Evolution Setup Assistant"
-msgstr "Evolution ინსტალაცია ასისტენტი"
+msgstr "Evolution პარამეტრები ასისტენტი"
 
 #: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "მოგესალმებით"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
+#, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
-msgstr ""
+msgstr "მოგესალმებით -სკენ Evolution Evolution -სკენ -სკენ ელფოსტა ანგარიშები და -სკენ იმპორტი ფაილი სხვა არა წინ -სკენ "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
 #: ../shell/e-shell-importer.c:147
+#, fuzzy
 msgid "Please select the information that you would like to import:"
-msgstr ""
+msgstr "-სკენ იმპორტი:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
 #: ../shell/e-shell-importer.c:400
 #, c-format
+#, fuzzy
 msgid "From %s:"
-msgstr ""
+msgstr "-დან წმ:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
 #: ../shell/e-shell-importer.c:511
@@ -17791,29 +18530,34 @@ msgid "Importing data."
 msgstr ""
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+#, fuzzy
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
+msgstr "- -სკენ თემა."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+#, fuzzy
 msgid "Subject Threading"
-msgstr ""
+msgstr "თემა"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+#, fuzzy
 msgid "Thread messages by subject"
-msgstr ""
+msgstr "თემა"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
+#, fuzzy
 msgid "Fall back to threading messages by sub_ject"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "ევოლუშენ შელი"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
 msgid "Evolution Shell Config factory"
-msgstr ""
+msgstr "Evolution გარსი"
 
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
@@ -17825,116 +18569,139 @@ msgid "Evolution Test component"
 msgstr "Evolution ტესტი"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
 msgid "A GNOME Print description of the current printer settings"
-msgstr ""
+msgstr "A GNOME ბეჭდვა აღწერა -"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
 msgstr "კონფიგურაციის ვერსია"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
 msgid "Default sidebar width"
-msgstr ""
+msgstr "ნაგულისხმევი სიგანე"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
 msgid "Default window height"
-msgstr ""
+msgstr "ნაგულისხმევი ფანჯარა სიმაღლე"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
 msgid "Default window width"
-msgstr ""
+msgstr "ნაგულისხმევი ფანჯარა სიგანე"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
+msgstr "ID ან - -სკენ ნაგულისხმები ეთ ზემოთ."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
 msgid "Last upgraded configuration version"
-msgstr ""
+msgstr "ბოლო"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
+msgstr "სია - -სკენ -სკენ ხაზიდან გასვლა"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "პრინტერის პარამეტრები"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#, fuzzy
 msgid "Sidebar is visible"
-msgstr ""
+msgstr "ხოლული"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#, fuzzy
 msgid "Skip development warning dialog"
-msgstr ""
+msgstr "გამოტოვება გაფრთხილება დიალოგი"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#, fuzzy
 msgid "Start in offline mode"
-msgstr ""
+msgstr "გაშვება - ხაზიდან გასვლა რეჟიმი"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr ""
+msgstr "- Evolution მაგალითი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
 msgid "The default height for the main window, in pixels."
-msgstr ""
+msgstr "ნაგულისხმები სიმაღლე ფანჯარა - პიქსელი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
 msgid "The default width for the main window, in pixels."
-msgstr ""
+msgstr "ნაგულისხმები სიგანე ფანჯარა - პიქსელი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#, fuzzy
 msgid "The default width for the sidebar, in pixels."
-msgstr ""
+msgstr "ნაგულისხმები სიგანე - პიქსელი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#, fuzzy
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
-msgstr ""
+msgstr "- Evolution მაგალითი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#, fuzzy
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
-msgstr ""
+msgstr "- ფანჯარა ტექსტი - GNOME."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
 msgid "Toolbar is visible"
-msgstr ""
+msgstr "ინსტრუმენტთა პანელი ხოლული"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#, fuzzy
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
+msgstr "Evolution ზემოთ - ხაზიდან გასვლა რეჟიმი - ხაზზე რეჟიმი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
 msgid "Whether the sidebar should be visible."
-msgstr ""
+msgstr "ხოლული."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
 msgid "Whether the toolbar should be visible."
-msgstr ""
+msgstr "ხოლული."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#, fuzzy
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
+msgstr "გაფრთხილება დიალოგი - - Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
 msgid "Whether the window buttons should be visible."
-msgstr ""
+msgstr "ფანჯარა ხოლული."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#, fuzzy
 msgid "Window button style"
-msgstr ""
+msgstr "ფანჯარა"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:26
 #, fuzzy
 msgid "Window buttons are visible"
-msgstr "ფანჯარა ხილული"
+msgstr "ფანჯარა ხოლული"
 
 #: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
@@ -17945,8 +18712,9 @@ msgid "Active Connections"
 msgstr "აქტიური შეერთებები"
 
 #: ../shell/e-active-connection-dialog.glade.h:3
+#, fuzzy
 msgid "Click OK to close these connections and go offline"
-msgstr ""
+msgstr "OK -სკენ დახურვა და ხაზიდან გასვლა"
 
 #: ../shell/e-shell-folder-title-bar.c:584
 #: ../shell/e-shell-folder-title-bar.c:585
@@ -17954,33 +18722,38 @@ msgid "(Untitled)"
 msgstr "(უსახელო)"
 
 #: ../shell/e-shell-importer.c:135
+#, fuzzy
 msgid "Choose the type of importer to run:"
-msgstr ""
+msgstr "- -სკენ:"
 
 #: ../shell/e-shell-importer.c:138
+#, fuzzy
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
 "\n"
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
-msgstr ""
+msgstr "ფაილი -სკენ იმპორტი Evolution და - ფაილი სია არა ავტომატური არა და Evolution -სკენ."
 
 #: ../shell/e-shell-importer.c:144
+#, fuzzy
 msgid "Choose the destination for this import"
-msgstr ""
+msgstr "იმპორტი"
 
 #: ../shell/e-shell-importer.c:150
+#, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
 "settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
-msgstr ""
+msgstr "Evolution -სკენ იმპორტი Netscape iCalendar არა -სკენ უკან არა"
 
 #: ../shell/e-shell-importer.c:285
+#, fuzzy
 msgid "F_ilename:"
-msgstr ""
+msgstr "F:"
 
 #: ../shell/e-shell-importer.c:290
 msgid "Select a file"
@@ -17991,12 +18764,14 @@ msgid "File _type:"
 msgstr "ფაილის _ტიპი:"
 
 #: ../shell/e-shell-importer.c:338
+#, fuzzy
 msgid "Import data and settings from _older programs"
-msgstr ""
+msgstr "იმპორტი და პროგრამები"
 
 #: ../shell/e-shell-importer.c:341
+#, fuzzy
 msgid "Import a _single file"
-msgstr ""
+msgstr "იმპორტი a ფაილი"
 
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Preferences"
@@ -18007,44 +18782,52 @@ msgid "No folder name specified."
 msgstr "საქაღალდის სახელი არ არის მოცემული."
 
 #: ../shell/e-shell-utils.c:125
+#, fuzzy
 msgid "Folder name cannot contain the Return character."
-msgstr ""
+msgstr "საქაღალდე სახელი შეიცავს დაბრუნება."
 
 #: ../shell/e-shell-utils.c:131
+#, fuzzy
 msgid "Folder name cannot contain the character \"/\"."
-msgstr ""
+msgstr "საქაღალდე სახელი შეიცავს."
 
 #: ../shell/e-shell-utils.c:137
+#, fuzzy
 msgid "Folder name cannot contain the character \"#\"."
-msgstr ""
+msgstr "საქაღალდე სახელი შეიცავს."
 
 #: ../shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
 msgstr "საქაღალდის სახელები '.' და '..' დარეზერვირებულია."
 
 #: ../shell/e-shell-window-commands.c:71
+#, fuzzy
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
+msgstr "GNOME არა -სკენ ჩართულია."
 
 #: ../shell/e-shell-window-commands.c:79
 #, c-format
+#, fuzzy
 msgid "Error executing %s."
-msgstr ""
+msgstr "შეცდომა წმ."
 
 #: ../shell/e-shell-window-commands.c:128
+#, fuzzy
 msgid "Bug buddy is not installed."
-msgstr ""
+msgstr "შეცდომა არა."
 
 #: ../shell/e-shell-window-commands.c:136
+#, fuzzy
 msgid "Bug buddy could not be run."
-msgstr ""
+msgstr "შეცდომა არა."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
 #: ../shell/e-shell-window-commands.c:530
+#, fuzzy
 msgid "translator-credits"
-msgstr ""
+msgstr "თარგმანი-შესრულებულია"
 
 #: ../shell/e-shell-window-commands.c:775
 #, fuzzy
@@ -18054,31 +18837,33 @@ msgstr "სამსახური ხაზზე"
 #: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Work Offline"
-msgstr "სამსახური გასული"
+msgstr "სამსახური ხაზიდან გასული"
 
 #: ../shell/e-shell-window-commands.c:801
 #, fuzzy
 msgid "Work Offline"
-msgstr "სამსახური გასული"
+msgstr "სამსახური ხაზიდან გასული"
 
 #: ../shell/e-shell-window.c:368
 #, fuzzy
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution -სკენ კავშირგარეშე რეჟიმი."
+msgstr "Evolution ხაზზე ჩართულია -სკენ ხაზიდან გასვლა."
 
 #: ../shell/e-shell-window.c:376
 #, fuzzy
 msgid "Evolution is in the process of going offline."
-msgstr "Evolution კავშირგარეშე რეჟიმი."
+msgstr "Evolution - - ხაზიდან გასვლა."
 
 #: ../shell/e-shell-window.c:383
+#, fuzzy
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr ""
+msgstr "Evolution ხაზიდან გასვლა ჩართულია -სკენ ხაზზე."
 
 #: ../shell/e-shell-window.c:783
 #, c-format
+#, fuzzy
 msgid "Switch to %s"
-msgstr ""
+msgstr "-სკენ წმ"
 
 #: ../shell/e-shell.c:633
 msgid "Uknown system error."
@@ -18086,8 +18871,9 @@ msgstr "უცნობი სისტემის შეცდომა."
 
 #: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
+#, fuzzy
 msgid "%ld KB"
-msgstr ""
+msgstr "კბ"
 
 #: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
@@ -18099,13 +18885,14 @@ msgid "Invalid arguments"
 msgstr "არასწორი"
 
 #: ../shell/e-shell.c:1265
+#, fuzzy
 msgid "Cannot register on OAF"
-msgstr ""
+msgstr "ჩართულია"
 
 #: ../shell/e-shell.c:1267
 #, fuzzy
 msgid "Configuration Database not found"
-msgstr "კონფიგურაცია მონაცემთა ბაზა"
+msgstr "გამართვა მონაცემთა ბაზა არა"
 
 #: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
@@ -18120,12 +18907,14 @@ msgid "_Test"
 msgstr "_ტესტი"
 
 #: ../shell/evolution-test-component.c:142
+#, fuzzy
 msgid "Create a new test item"
-msgstr ""
+msgstr "შექმნა a ახალი"
 
 #: ../shell/import.glade.h:1
+#, fuzzy
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
+msgstr "იმპორტი -სკენ ფაილი Evolution "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -18138,30 +18927,34 @@ msgstr "ფაილის იმპორტი"
 #: ../shell/import.glade.h:4
 #, fuzzy
 msgid "Import Location"
-msgstr "მდებარეობის იმპორტი"
+msgstr "იმპორტი მდებარეობა"
 
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "იმპორტერის ტიპი"
 
 #: ../shell/import.glade.h:6
+#, fuzzy
 msgid "Select Importers"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../shell/import.glade.h:7
+#, fuzzy
 msgid "Select a File"
-msgstr ""
+msgstr "ამორჩევა a ფაილი"
 
 #: ../shell/import.glade.h:8
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
-msgstr ""
+msgstr "მოგესალმებით -სკენ Evolution იმპორტი ასისტენტი - ფაილი Evolution."
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:230
 #, no-c-format
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -18178,7 +18971,7 @@ msgid ""
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
-msgstr ""
+msgstr "-სკენ Evolution არა - Evolution არა დახურვა მონაცემები ან არა არა a - Evolution -სკენ და წმ არა პოვნა -სკენ ეთ არა და არა -სკენ - არა - და არა"
 
 #: ../shell/main.c:254
 msgid ""
@@ -18189,71 +18982,86 @@ msgstr ""
 "ევოლუშენის ჯგუფი\n"
 
 #: ../shell/main.c:261
+#, fuzzy
 msgid "Do not tell me again"
-msgstr ""
+msgstr "არა"
 
 #: ../shell/main.c:471
+#, fuzzy
 msgid "Start Evolution activating the specified component"
-msgstr ""
+msgstr "გაშვება Evolution"
 
 #: ../shell/main.c:475
+#, fuzzy
 msgid "Start in online mode"
-msgstr ""
+msgstr "გაშვება - ხაზზე რეჟიმი"
 
 #: ../shell/main.c:478
+#, fuzzy
 msgid "Forcibly shut down all Evolution components"
-msgstr ""
+msgstr "ქვემოთ ყველა Evolution"
 
 #: ../shell/main.c:482
+#, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr ""
+msgstr "Evolution 4"
 
 #: ../shell/main.c:485
+#, fuzzy
 msgid "Send the debugging output of all components to a file."
-msgstr ""
+msgstr "გაგზავნა - ყველა -სკენ a ფაილი."
 
 #: ../shell/main.c:487
+#, fuzzy
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "გამორთე - ნებისმიერი."
 
 #: ../shell/main.c:518
 #, c-format
+#, fuzzy
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
+"წმ ხაზზე და ხაზიდან გასვლა\n"
+" გამოყენება წმ დახმარება მეტი არა"
 
 #: ../shell/shell.error.xml.h:1
+#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr ""
+msgstr "-სკენ დავიწყება ყველა?"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
 msgstr "გაგრძელება"
 
 #: ../shell/shell.error.xml.h:3
+#, fuzzy
 msgid "Delete old data from version {0}?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
 msgstr "ევოლუშენი ვერ ირთვება."
 
 #: ../shell/shell.error.xml.h:5
+#, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
-msgstr ""
+msgstr "გასუფთავება ყველა თქვენ."
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
 msgstr ""
 
 #: ../shell/shell.error.xml.h:8
+#, fuzzy
 msgid "Really delete old data?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../shell/shell.error.xml.h:9
+#, fuzzy
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -18264,9 +19072,10 @@ msgid ""
 "\n"
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
-msgstr ""
+msgstr "-&quot;&quot; შესახებ -სკენ არა ყველა - ფოსტა და კალენდარი აწმყო და - Evolution არა -სკენ - Evolution ხელით არა"
 
 #: ../shell/shell.error.xml.h:15
+#, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -18274,78 +19083,87 @@ msgid ""
 "evolution&quot; directory will be removed permanently. If you choose to keep "
 "this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
-msgstr ""
+msgstr "- - a არა -სკენ ამოშლა -&quot;&quot; -სკენ ამოშლა -&quot;&quot; ეთ არა"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:20
+#, fuzzy
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
 "can continue."
-msgstr ""
+msgstr "და ზემოთ -სკენ - არა -სკენ მეტი - თავფურცელი."
 
 #: ../shell/shell.error.xml.h:23
+#, fuzzy
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
-msgstr ""
+msgstr "არა ემთხვევა Evolution არა დახმარება"
 
 #: ../shell/shell.error.xml.h:26
+#, fuzzy
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
 "{0}\n"
 "\n"
 "Click help for details."
-msgstr ""
+msgstr "არა ემთხვევა Evolution არა არა არა დახმარება."
 
 #: ../shell/shell.error.xml.h:31
 msgid "_Forget"
 msgstr "_დავიწყება"
 
 #: ../shell/shell.error.xml.h:32
+#, fuzzy
 msgid "_Keep Data"
-msgstr ""
+msgstr "დატოვება მონაცემები"
 
 #: ../shell/shell.error.xml.h:33
+#, fuzzy
 msgid "_Remind Me Later"
-msgstr ""
+msgstr "Me"
 
 #: ../shell/shell.error.xml.h:34
+#, fuzzy
 msgid ""
 "{1}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
-msgstr ""
+msgstr "არა -სკენ არა -სკენ მონაცემები - არა"
 
 #: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
+#, fuzzy
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
-msgstr ""
+msgstr "სერთიფიკატი წმ a არა:"
 
 #: ../smime/gui/cert-trust-dialog.c:154
+#, fuzzy
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
-msgstr ""
+msgstr "-"
 
 #: ../smime/gui/cert-trust-dialog.c:158
+#, fuzzy
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
-msgstr ""
+msgstr "არა არა -"
 
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:144
@@ -18353,8 +19171,9 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:383
 #: ../smime/gui/certificate-manager.c:595
 #: ../smime/gui/certificate-manager.c:603
+#, fuzzy
 msgid "Select a certificate to import..."
-msgstr ""
+msgstr "ამორჩევა a -სკენ იმპორტი."
 
 #: ../smime/gui/certificate-manager.c:267
 #: ../smime/gui/certificate-manager.c:472
@@ -18382,18 +19201,21 @@ msgstr "E-Mail მისამართი"
 
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
+#, fuzzy
 msgid "Certificate Viewer: %s"
-msgstr ""
+msgstr "სერთიფიკატი წმ"
 
 #: ../smime/gui/component.c:47
 #, c-format
+#, fuzzy
 msgid "Enter the password for `%s'"
-msgstr ""
+msgstr "შეყვანა წმ"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
+#, fuzzy
 msgid "Enter new password for certificate database"
-msgstr ""
+msgstr "შეყვანა ახალი"
 
 #: ../smime/gui/component.c:72
 msgid "Enter new password"
@@ -18402,38 +19224,47 @@ msgstr "შეიყვანეთ ახალი პაროლი"
 #. FIXME: add serial no, validity date, uses
 #: ../smime/gui/e-cert-selector.c:121
 #, c-format
+#, fuzzy
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
+"-სკენ\n"
+" თემა წმ არა"
 
 #: ../smime/gui/e-cert-selector.c:122
 #, c-format
+#, fuzzy
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
+"\n"
+" თემა წმ არა"
 
 #: ../smime/gui/e-cert-selector.c:174
+#, fuzzy
 msgid "Select certificate"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:2
+#, fuzzy
 msgid "<b>Certificate Fields</b>"
-msgstr ""
+msgstr "<b> სერთიფიკატი</b>"
 
 #: ../smime/gui/smime-ui.glade.h:3
+#, fuzzy
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b> სერთიფიკატი</b>"
 
 #: ../smime/gui/smime-ui.glade.h:4
 #, fuzzy
 msgid "<b>Field Value</b>"
-msgstr "<b> მნიშვნელობა</b>"
+msgstr "<b> ველი მნიშვნელობა</b>"
 
 #: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
@@ -18461,40 +19292,45 @@ msgid "Authorities"
 msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:11
+#, fuzzy
 msgid "Backup"
-msgstr ""
+msgstr "სარეზერვო ასლი"
 
 #: ../smime/gui/smime-ui.glade.h:12
+#, fuzzy
 msgid "Backup All"
-msgstr ""
+msgstr "სარეზერვო ასლი ყველა"
 
 #: ../smime/gui/smime-ui.glade.h:13
+#, fuzzy
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
-msgstr ""
+msgstr "ვიდრე ნებისმიერი და და."
 
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "სერტიფიკატი"
 
 #: ../smime/gui/smime-ui.glade.h:15
+#, fuzzy
 msgid "Certificate Authority Trust"
-msgstr ""
+msgstr "სერთიფიკატი ნდობა"
 
 #: ../smime/gui/smime-ui.glade.h:16
+#, fuzzy
 msgid "Certificate details"
-msgstr ""
+msgstr "სერთიფიკატი"
 
 #: ../smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Certificates Table"
-msgstr "სერთიფიკატები"
+msgstr "სერთიფიკატები ცხრილი"
 
 #: ../smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Common Name (CN)"
-msgstr "სახელი CN"
+msgstr "საერთო სახელი CN"
 
 #: ../smime/gui/smime-ui.glade.h:19
 #, fuzzy
@@ -18502,12 +19338,14 @@ msgid "Contact Certificates"
 msgstr "კონტაქტი სერთიფიკატები"
 
 #: ../smime/gui/smime-ui.glade.h:21
+#, fuzzy
 msgid "Do not trust the authenticity of this certificate"
-msgstr ""
+msgstr "არა -"
 
 #: ../smime/gui/smime-ui.glade.h:22
+#, fuzzy
 msgid "Dummy window only"
-msgstr ""
+msgstr "ფიქტიური ფანჯარა"
 
 #: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
@@ -18516,21 +19354,22 @@ msgstr "რედაქტირება"
 #: ../smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Certificate Trust Settings"
-msgstr "Email ნდობა პარამეტრები"
+msgstr "ელფოსტა სერთიფიკატი ნდობა პარამეტრები"
 
 #: ../smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Recipient Certificate"
-msgstr "Email"
+msgstr "ელფოსტა ადრესატი სერთიფიკატი"
 
 #: ../smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Email Signer Certificate"
-msgstr "Email"
+msgstr "ელფოსტა სერთიფიკატი"
 
 #: ../smime/gui/smime-ui.glade.h:27
+#, fuzzy
 msgid "Expires On"
-msgstr ""
+msgstr "ჩართ."
 
 #: ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
@@ -18542,8 +19381,9 @@ msgid "Issued On"
 msgstr "ჩართ."
 
 #: ../smime/gui/smime-ui.glade.h:31
+#, fuzzy
 msgid "MD5 Fingerprint"
-msgstr ""
+msgstr "MD5"
 
 #: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
@@ -18567,36 +19407,43 @@ msgid "SSL Server Certificate"
 msgstr "SSL სერვერის სერთიფიკატი"
 
 #: ../smime/gui/smime-ui.glade.h:38
+#, fuzzy
 msgid "Trust the authenticity of this certificate"
-msgstr ""
+msgstr "ნდობა -"
 
 #: ../smime/gui/smime-ui.glade.h:39
+#, fuzzy
 msgid "Trust this CA to identify email users."
-msgstr ""
+msgstr "ნდობა -სკენ ელფოსტა."
 
 #: ../smime/gui/smime-ui.glade.h:40
+#, fuzzy
 msgid "Trust this CA to identify software developers."
-msgstr ""
+msgstr "ნდობა -სკენ."
 
 #: ../smime/gui/smime-ui.glade.h:41
+#, fuzzy
 msgid "Trust this CA to identify web sites."
-msgstr ""
+msgstr "ნდობა -სკენ."
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "ხედი"
 
 #: ../smime/gui/smime-ui.glade.h:43
+#, fuzzy
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
+msgstr "თქვენ:"
 
 #: ../smime/gui/smime-ui.glade.h:44
+#, fuzzy
 msgid "You have certificates on file that identify these certificate authorities:"
-msgstr ""
+msgstr "თქვენ ჩართულია ფაილი:"
 
 #: ../smime/gui/smime-ui.glade.h:45
+#, fuzzy
 msgid "You have certificates on file that identify these people:"
-msgstr ""
+msgstr "თქვენ ჩართულია ფაილი:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -18609,12 +19456,14 @@ msgstr "რედაქტირება ნდობა"
 
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:664
+#, fuzzy
 msgid "Certificate already exists"
-msgstr ""
+msgstr "სერთიფიკატი"
 
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#, fuzzy
 msgid "%d/%m/%Y"
-msgstr ""
+msgstr "Y"
 
 #. x509 certificate usage types
 #: ../smime/lib/e-cert.c:425
@@ -18642,81 +19491,89 @@ msgid "Version 3"
 msgstr "ვერსია 3"
 
 #: ../smime/lib/e-cert.c:634
+#, fuzzy
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr ""
+msgstr "RSA დაშიფვრა"
 
 #: ../smime/lib/e-cert.c:637
+#, fuzzy
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr ""
+msgstr "MD5 RSA დაშიფვრა"
 
 #: ../smime/lib/e-cert.c:640
+#, fuzzy
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr ""
+msgstr "SHA RSA დაშიფვრა"
 
 #: ../smime/lib/e-cert.c:667
+#, fuzzy
 msgid "PKCS #1 RSA Encryption"
-msgstr ""
+msgstr "RSA დაშიფვრა"
 
 #: ../smime/lib/e-cert.c:670
 #, fuzzy
 msgid "Certificate Key Usage"
-msgstr "გასაღები გამოყენება"
+msgstr "სერთიფიკატი გასაღები გამოყენება"
 
 #: ../smime/lib/e-cert.c:673
 #, fuzzy
 msgid "Netscape Certificate Type"
-msgstr "Netscape ტიპი"
+msgstr "Netscape სერთიფიკატი ტიპი"
 
 #: ../smime/lib/e-cert.c:676
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
-msgstr "გასაღები"
+msgstr "სერთიფიკატი გასაღები"
 
 #: ../smime/lib/e-cert.c:688
 #, c-format
+#, fuzzy
 msgid "Object Identifier (%s)"
-msgstr ""
+msgstr "ობიექტი წმ"
 
 #: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
 msgstr ""
 
 #: ../smime/lib/e-cert.c:747
+#, fuzzy
 msgid "Algorithm Parameters"
-msgstr ""
+msgstr "პარამეტრები"
 
 #: ../smime/lib/e-cert.c:769
 #, fuzzy
 msgid "Subject Public Key Info"
-msgstr "თემა გასაღები ინფორმაცია"
+msgstr "თემა საზოგადო გასაღები ინფორმაცია"
 
 #: ../smime/lib/e-cert.c:774
+#, fuzzy
 msgid "Subject Public Key Algorithm"
-msgstr ""
+msgstr "თემა საზოგადო გასაღები"
 
 #: ../smime/lib/e-cert.c:789
 #, fuzzy
 msgid "Subject's Public Key"
-msgstr "თემა გასაღები"
+msgstr "თემა წმ საზოგადო გასაღები"
 
 #: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 #, fuzzy
 msgid "Error: Unable to process extension"
-msgstr "შეცდომა -სკენ"
+msgstr "შეცდომა -სკენ გაფართოვება"
 
 #: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#, fuzzy
 msgid "Object Signer"
-msgstr ""
+msgstr "ობიექტი"
 
 #: ../smime/lib/e-cert.c:835
 #, fuzzy
 msgid "SSL Certificate Authority"
-msgstr "SSL"
+msgstr "SSL სერთიფიკატი"
 
 #: ../smime/lib/e-cert.c:839
 #, fuzzy
 msgid "Email Certificate Authority"
-msgstr "Email"
+msgstr "ელფოსტა სერთიფიკატი"
 
 #: ../smime/lib/e-cert.c:867
 msgid "Signing"
@@ -18734,7 +19591,7 @@ msgstr "გასაღები"
 #: ../smime/lib/e-cert.c:879
 #, fuzzy
 msgid "Data Encipherment"
-msgstr "მონაცემი"
+msgstr "მონაცემები"
 
 #: ../smime/lib/e-cert.c:883
 #, fuzzy
@@ -18742,8 +19599,9 @@ msgid "Key Agreement"
 msgstr "გასაღები"
 
 #: ../smime/lib/e-cert.c:887
+#, fuzzy
 msgid "Certificate Signer"
-msgstr ""
+msgstr "სერთიფიკატი"
 
 #: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
@@ -18756,7 +19614,7 @@ msgstr "კრიტიკული"
 #: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 #, fuzzy
 msgid "Not Critical"
-msgstr "არა კრიტიკული"
+msgstr "კრიტიკული"
 
 #: ../smime/lib/e-cert.c:965
 msgid "Extensions"
@@ -18764,107 +19622,121 @@ msgstr "გაფართოებები"
 
 #: ../smime/lib/e-cert.c:1036
 #, c-format
+#, fuzzy
 msgid "%s = %s"
-msgstr ""
+msgstr "წმ წმ"
 
 #: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 #, fuzzy
 msgid "Certificate Signature Algorithm"
-msgstr "ხელმოწერა"
+msgstr "სერთიფიკატი ხელმოწერა"
 
 #: ../smime/lib/e-cert.c:1101
+#, fuzzy
 msgid "Issuer"
-msgstr ""
+msgstr "მფლობელი"
 
 #: ../smime/lib/e-cert.c:1155
+#, fuzzy
 msgid "Issuer Unique ID"
-msgstr ""
+msgstr "მფლობელი ID"
 
 #: ../smime/lib/e-cert.c:1174
+#, fuzzy
 msgid "Subject Unique ID"
-msgstr ""
+msgstr "თემა ID"
 
 #: ../smime/lib/e-cert.c:1217
 #, fuzzy
 msgid "Certificate Signature Value"
-msgstr "ხელმოწერა მნიშვნელობა"
+msgstr "სერთიფიკატი ხელმოწერა მნიშვნელობა"
 
 #: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ფაილის პაროლი"
 
 #: ../smime/lib/e-pkcs12.c:266
+#, fuzzy
 msgid "Enter password for PKCS12 file:"
-msgstr ""
+msgstr "შეყვანა ფაილი:"
 
 #: ../smime/lib/e-pkcs12.c:365
+#, fuzzy
 msgid "Imported Certificate"
-msgstr ""
+msgstr "იმპორტირებული სერთიფიკატი"
 
 #: ../tools/evolution-launch-composer.c:321
+#, fuzzy
 msgid "An attachment to add."
-msgstr ""
+msgstr "-სკენ დამატება."
 
 #: ../tools/evolution-launch-composer.c:322
+#, fuzzy
 msgid "Content type of the attachment."
-msgstr ""
+msgstr "შიგთავსი -."
 
 #: ../tools/evolution-launch-composer.c:323
+#, fuzzy
 msgid "The filename to display in the mail."
-msgstr ""
+msgstr "-სკენ - ფოსტა."
 
 #: ../tools/evolution-launch-composer.c:324
+#, fuzzy
 msgid "Description of the attachment."
-msgstr ""
+msgstr "აღწერა -."
 
 #: ../tools/evolution-launch-composer.c:325
+#, fuzzy
 msgid "Mark attachment to be shown inline by default."
-msgstr ""
+msgstr "-სკენ ნაგულისხმები."
 
 #: ../tools/evolution-launch-composer.c:326
+#, fuzzy
 msgid "Default subject for the message."
-msgstr ""
+msgstr "ნაგულისხმევი თემა."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
 #: ../tools/killev.c:61
 #, c-format
+#, fuzzy
 msgid "Could not execute '%s': %s\n"
-msgstr ""
+msgstr "არა შესრულება წმ წმ არა"
 
 #: ../tools/killev.c:76
 #, c-format
+#, fuzzy
 msgid "Shutting down %s (%s)\n"
-msgstr ""
+msgstr "ქვემოთ წმ წმ არა"
 
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
 msgstr "მისამართების _წიგნაკის პარამეტრები"
 
 #: ../ui/evolution-addressbook.xml.h:3
+#, fuzzy
 msgid "Change the properties of the selected folder"
-msgstr ""
+msgstr "შეცვლა პარამეტრები -"
 
 #: ../ui/evolution-addressbook.xml.h:4
 #, fuzzy
 msgid "Co_py All Contacts To..."
-msgstr "ყველა ვის."
+msgstr "ყველა მეგობრები ვის."
 
 #: ../ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Contact _Preview"
-msgstr "კონტაქტი წინასწარ ნახვა"
+msgstr "კონტაქტის წ_ინასწარი ნახვა"
 
 #: ../ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "დააკოპირე -სკენ საქაღალდე."
+msgstr "დააკოპირე მონიშნული მეგობრები -სკენ საქაღალდე."
 
 #: ../ui/evolution-addressbook.xml.h:8
 #, fuzzy
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "დააკოპირე"
+msgstr "დააკოპირე -"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 #, fuzzy
@@ -18876,8 +19748,9 @@ msgid "Copy to Folder..."
 msgstr "დააკოპირე საქაღალდეში..."
 
 #: ../ui/evolution-addressbook.xml.h:11
+#, fuzzy
 msgid "Create a new addressbook folder"
-msgstr ""
+msgstr "შექმნა a ახალი წიგნაკი"
 
 #: ../ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
@@ -18886,16 +19759,18 @@ msgid "Cut"
 msgstr "ამოჭრა"
 
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#, fuzzy
 msgid "Cut the selection"
-msgstr ""
+msgstr "ამოჭრა"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
 msgstr "მისამართების წიგნაკის წა_შლა"
 
 #: ../ui/evolution-addressbook.xml.h:16
+#, fuzzy
 msgid "Delete selected contacts"
-msgstr ""
+msgstr "წაშლა"
 
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
@@ -18904,21 +19779,22 @@ msgstr "წაშალე ამორჩეული საქაღალდ�
 #: ../ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Forward Contact"
-msgstr "კონტაქტი"
+msgstr "წინ კონტაქტი"
 
 #: ../ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Mo_ve All Contacts To..."
-msgstr "ორ ყველა ვის."
+msgstr "ორ ყველა მეგობრები ვის."
 
 #: ../ui/evolution-addressbook.xml.h:20
+#, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
-msgstr ""
+msgstr "გადატანა მონიშნული მეგობრები -სკენ საქაღალდე."
 
 #: ../ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "გადატანა"
+msgstr "გადატანა -"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
@@ -18931,12 +19807,14 @@ msgid "Paste"
 msgstr "ჩასმა"
 
 #: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#, fuzzy
 msgid "Paste the clipboard"
-msgstr ""
+msgstr "ჩასმა"
 
 #: ../ui/evolution-addressbook.xml.h:25
+#, fuzzy
 msgid "Previews the contacts to be printed"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
@@ -18952,12 +19830,14 @@ msgid "S_ave Address Book As VCard"
 msgstr "S მისამართი"
 
 #: ../ui/evolution-addressbook.xml.h:32
+#, fuzzy
 msgid "Save selected contacts as a VCard."
-msgstr ""
+msgstr "შენახვა a."
 
 #: ../ui/evolution-addressbook.xml.h:33
+#, fuzzy
 msgid "Save the contacts of the selected folder as VCard"
-msgstr ""
+msgstr "შენახვა -"
 
 #: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
@@ -18970,8 +19850,9 @@ msgid "Select _All"
 msgstr "მონიშნე _ყველა"
 
 #: ../ui/evolution-addressbook.xml.h:36
+#, fuzzy
 msgid "Select all contacts"
-msgstr ""
+msgstr "ამორჩევა ყველა"
 
 #: ../ui/evolution-addressbook.xml.h:37
 #, fuzzy
@@ -18986,11 +19867,12 @@ msgstr "გაგზავნა -სკენ"
 #: ../ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "Send selected contacts to another person."
-msgstr "გაგზავნა -სკენ."
+msgstr "გაგზავნა -სკენ პირადი ფორმა."
 
 #: ../ui/evolution-addressbook.xml.h:40
+#, fuzzy
 msgid "Show contact preview window"
-msgstr ""
+msgstr "ჩვენება ფანჯარა"
 
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "St_op"
@@ -19001,13 +19883,13 @@ msgid "Stop"
 msgstr "შეჩერება"
 
 #: ../ui/evolution-addressbook.xml.h:43
-#, fuzzy
 msgid "Stop Loading"
-msgstr "შეჩერება"
+msgstr "ჩატვირთვის შეჩერება"
 
 #: ../ui/evolution-addressbook.xml.h:44
+#, fuzzy
 msgid "View the current contact"
-msgstr ""
+msgstr "ჩვენება"
 
 #: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:21
@@ -19021,7 +19903,7 @@ msgstr "_დააკოპირე კონტაქტი..."
 #: ../ui/evolution-addressbook.xml.h:48
 #, fuzzy
 msgid "_Copy Folder Contacts To"
-msgstr "დააკოპირე საქაღალდე ვის"
+msgstr "დააკოპირე საქაღალდე მეგობრები ვის"
 
 #: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
@@ -19030,17 +19912,17 @@ msgstr "კონტაქტის _წაშლა"
 #: ../ui/evolution-addressbook.xml.h:52
 #, fuzzy
 msgid "_Forward Contact..."
-msgstr "კონტაქტი."
+msgstr "წინ კონტაქტი."
 
 #: ../ui/evolution-addressbook.xml.h:53
 #, fuzzy
 msgid "_Move Contact to..."
-msgstr "კონტაქტი -სკენ."
+msgstr "გადატანა კონტაქტი -სკენ."
 
 #: ../ui/evolution-addressbook.xml.h:54
 #, fuzzy
 msgid "_Move Folder Contacts To"
-msgstr "საქაღალდე ვის"
+msgstr "გადატანა საქაღალდე მეგობრები ვის"
 
 #: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
@@ -19056,8 +19938,9 @@ msgid "_Save Contact as VCard..."
 msgstr "შენახვა კონტაქტი."
 
 #: ../ui/evolution-addressbook.xml.h:62
+#, fuzzy
 msgid "_Save Folder Contacts As VCard"
-msgstr ""
+msgstr "შენახვა საქაღალდე მეგობრები"
 
 #: ../ui/evolution-addressbook.xml.h:63
 #, fuzzy
@@ -19071,12 +19954,12 @@ msgstr "დღე"
 #: ../ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete _all Occurrences"
-msgstr "წაშლა"
+msgstr "წაშლა ყველა"
 
 #: ../ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Delete all occurrences"
-msgstr "წაშლა"
+msgstr "წაშლა ყველა"
 
 #: ../ui/evolution-calendar.xml.h:8
 #, fuzzy
@@ -19091,7 +19974,7 @@ msgstr "წაშლა"
 #: ../ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go To"
-msgstr "ვის"
+msgstr "გადასვლა"
 
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
@@ -19114,8 +19997,9 @@ msgid "Next"
 msgstr "შემდეგი"
 
 #: ../ui/evolution-calendar.xml.h:18
+#, fuzzy
 msgid "Previews the calendar to be printed"
-msgstr ""
+msgstr "კალენდარი -სკენ"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
@@ -19127,29 +20011,34 @@ msgid "Print this calendar"
 msgstr "ამ კალენდრის დაბეჭდვა"
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#, fuzzy
 msgid "Purg_e"
-msgstr ""
+msgstr "e"
 
 #: ../ui/evolution-calendar.xml.h:24
+#, fuzzy
 msgid "Purge old appointments and meetings"
-msgstr ""
+msgstr "გასუფთავება და"
 
 #: ../ui/evolution-calendar.xml.h:25
+#, fuzzy
 msgid "Select _Date"
-msgstr ""
+msgstr "ამორჩევა თარიღი"
 
 #: ../ui/evolution-calendar.xml.h:26
+#, fuzzy
 msgid "Select _Today"
-msgstr ""
+msgstr "ამორჩევა დღეს"
 
 #: ../ui/evolution-calendar.xml.h:27
+#, fuzzy
 msgid "Select a specific date"
-msgstr ""
+msgstr "ამორჩევა a თარიღი"
 
 #: ../ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Select today"
-msgstr "დღეს"
+msgstr "ამორჩევა დღეს"
 
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
@@ -19172,37 +20061,43 @@ msgid "Show the working week"
 msgstr "აჩვენე სამუშაო კვირა"
 
 #: ../ui/evolution-calendar.xml.h:35
+#, fuzzy
 msgid "View the current appointment"
-msgstr ""
+msgstr "ჩვენება"
 
 #: ../ui/evolution-calendar.xml.h:36
+#, fuzzy
 msgid "Week"
-msgstr ""
+msgstr "კვირა"
 
 #: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "სამუშაო კვირა"
 
 #: ../ui/evolution-calendar.xml.h:42
+#, fuzzy
 msgid "_Open Appointment"
-msgstr ""
+msgstr "გახსნა შეხვედრა"
 
 #: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 #, fuzzy
 msgid "Copy selected text to the clipboard"
-msgstr "დააკოპირე -სკენ"
+msgstr "დააკოპირე ტექსტი -სკენ"
 
 #: ../ui/evolution-composer-entries.xml.h:3
+#, fuzzy
 msgid "Copy selection to clipboard"
-msgstr ""
+msgstr "დააკოპირე -სკენ"
 
 #: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
+#, fuzzy
 msgid "Cut selected text to the clipboard"
-msgstr ""
+msgstr "ამოჭრა ტექსტი -სკენ"
 
 #: ../ui/evolution-composer-entries.xml.h:7
+#, fuzzy
 msgid "Cut selection to clipboard"
-msgstr ""
+msgstr "ამოჭრა -სკენ"
 
 #: ../ui/evolution-composer-entries.xml.h:9
 #, fuzzy
@@ -19212,31 +20107,36 @@ msgstr "ჩასმა"
 #: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 #, fuzzy
 msgid "Paste text from the clipboard"
-msgstr "ჩასმა"
+msgstr "ჩასმა ტექსტი"
 
 #: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
+#, fuzzy
 msgid "Select all text"
-msgstr ""
+msgstr "ამორჩევა ყველა ტექსტი"
 
 #: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
 
 #: ../ui/evolution-editor.xml.h:2
+#, fuzzy
 msgid "Click here to attach a file"
-msgstr ""
+msgstr "-სკენ მიმაგრება a ფაილი"
 
 #: ../ui/evolution-editor.xml.h:3
+#, fuzzy
 msgid "Click here to close the current window"
-msgstr ""
+msgstr "-სკენ დახურვა ფანჯარა"
 
 #: ../ui/evolution-editor.xml.h:4
+#, fuzzy
 msgid "Click here to save the current window"
-msgstr ""
+msgstr "-სკენ შენახვა ფანჯარა"
 
 #: ../ui/evolution-editor.xml.h:5
+#, fuzzy
 msgid "Click here to view help available"
-msgstr ""
+msgstr "-სკენ დახმარება"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -19280,12 +20180,12 @@ msgstr "_ოფციები"
 #: ../ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "All Day Event"
-msgstr "ყველა დღე შემთხვევა"
+msgstr "ყველა დღე მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:3
 #, fuzzy
 msgid "All _Day Event"
-msgstr "ყველა დღე შემთხვევა"
+msgstr "ყველა დღე მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
 #: ../ui/evolution-task-editor.xml.h:1
@@ -19295,8 +20195,9 @@ msgstr "კონფიდენციალური"
 
 #: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
 #: ../ui/evolution-task-editor.xml.h:2
+#, fuzzy
 msgid "Classify as Private"
-msgstr ""
+msgstr "პირადი"
 
 #: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
 #: ../ui/evolution-task-editor.xml.h:3
@@ -19304,17 +20205,19 @@ msgid "Classify as public"
 msgstr ""
 
 #: ../ui/evolution-event-editor.xml.h:7
+#, fuzzy
 msgid "Click here to set or unset alarms for this event"
-msgstr ""
+msgstr "-სკენ ან მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Insert advanced send options"
-msgstr "მომხმარებელი."
+msgstr "ჩამატება"
 
 #: ../ui/evolution-event-editor.xml.h:10
+#, fuzzy
 msgid "Make this a recurring event"
-msgstr ""
+msgstr "Make a მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
 #: ../ui/evolution-task-editor.xml.h:6
@@ -19324,16 +20227,17 @@ msgstr "სა_ზოგადო"
 #: ../ui/evolution-event-editor.xml.h:12
 #, fuzzy
 msgid "Query free / busy information for the attendees"
-msgstr "თავისუფალი დაკავებული"
+msgstr "გამოკითხვა"
 
 #: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+#, fuzzy
 msgid "R_ole Field"
-msgstr ""
+msgstr "R ველი"
 
 #: ../ui/evolution-event-editor.xml.h:16
 #, fuzzy
 msgid "Show time as _busy"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
 #, fuzzy
@@ -19341,20 +20245,24 @@ msgid "Time _Zone"
 msgstr "დროის სარ_ტყელი"
 
 #: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#, fuzzy
 msgid "Toggles whether the Attendee Type field is displayed"
-msgstr ""
+msgstr "ტიპი ველი"
 
 #: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#, fuzzy
 msgid "Toggles whether the RSVP field is displayed"
-msgstr ""
+msgstr "RSVP ველი"
 
 #: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#, fuzzy
 msgid "Toggles whether the Role field is displayed"
-msgstr ""
+msgstr "როლი ველი"
 
 #: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#, fuzzy
 msgid "Toggles whether the Status field is displayed"
-msgstr ""
+msgstr "სტატუსი ველი"
 
 #: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
@@ -19362,21 +20270,24 @@ msgstr ""
 
 #: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
+#, fuzzy
 msgid "Toggles whether to display categories"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../ui/evolution-event-editor.xml.h:24
+#, fuzzy
 msgid "Toggles whether to have All Day Event"
-msgstr ""
+msgstr "-სკენ ყველა დღე მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:25
+#, fuzzy
 msgid "Toggles whether to show time as busy"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../ui/evolution-event-editor.xml.h:26
 #, fuzzy
 msgid "_Alarms"
-msgstr "ჩამატება"
+msgstr "სიგნალები"
 
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
@@ -19395,13 +20306,13 @@ msgstr "_თავისუფალი/დაკავებული"
 
 #: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
-#, fuzzy
 msgid "_Private"
-msgstr "პრივატი"
+msgstr "_პრივატი"
 
 #: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#, fuzzy
 msgid "_RSVP"
-msgstr ""
+msgstr "RSVP"
 
 #: ../ui/evolution-event-editor.xml.h:33
 #, fuzzy
@@ -19411,17 +20322,17 @@ msgstr "რესურსი"
 #: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
 #, fuzzy
 msgid "_Status Field"
-msgstr "სტატუსი"
+msgstr "სტატუსი ველი"
 
 #: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
 #, fuzzy
 msgid "_Type Field"
-msgstr "ტიპი"
+msgstr "ტიპი ველი"
 
 #: ../ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
-msgstr "გაუქმება"
+msgstr "შეწყვეტა ფოსტა"
 
 #: ../ui/evolution-mail-global.xml.h:3
 #, fuzzy
@@ -19431,17 +20342,17 @@ msgstr "დააკოპირე"
 #: ../ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Create a new folder for storing mail"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი ფოსტა"
 
 #: ../ui/evolution-mail-global.xml.h:5
 #, fuzzy
 msgid "Create or edit Search Folder definitions"
-msgstr "შექმნა ძებნა საქაღალდე"
+msgstr "შექმნა ან რედაქტირება ძებნა საქაღალდე"
 
 #: ../ui/evolution-mail-global.xml.h:6
 #, fuzzy
 msgid "Create or edit rules for filtering new mail"
-msgstr "შექმნა"
+msgstr "შექმნა ან რედაქტირება ახალი ფოსტა"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
@@ -19458,25 +20369,30 @@ msgid "Message _Preview"
 msgstr "შეტყობინება წინასწარ ნახვა"
 
 #: ../ui/evolution-mail-global.xml.h:10
+#, fuzzy
 msgid "Move the selected folder into another folder"
-msgstr ""
+msgstr "გადატანა"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
+#, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
+msgstr "ამოშლა ყველა ყველა"
 
 #: ../ui/evolution-mail-global.xml.h:13
+#, fuzzy
 msgid "Search F_olders"
-msgstr ""
+msgstr "ძებნა F"
 
 #: ../ui/evolution-mail-global.xml.h:14
+#, fuzzy
 msgid "Show message preview window"
-msgstr ""
+msgstr "ჩვენება ფანჯარა"
 
 #: ../ui/evolution-mail-global.xml.h:15
+#, fuzzy
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
+msgstr "ხელის მოწერა ან -სკენ ჩართულია"
 
 #: ../ui/evolution-mail-global.xml.h:16
 #, fuzzy
@@ -19490,7 +20406,7 @@ msgstr "_წერილების ფილტრები"
 #: ../ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Move Folder To..."
-msgstr "საქაღალდე ვის."
+msgstr "გადატანა საქაღალდე ვის."
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
@@ -19504,112 +20420,130 @@ msgid "_Subscriptions"
 msgstr ""
 
 #: ../ui/evolution-mail-list.xml.h:1
+#, fuzzy
 msgid "Change the name of this folder"
-msgstr ""
+msgstr "შეცვლა სახელი -"
 
 #: ../ui/evolution-mail-list.xml.h:2
+#, fuzzy
 msgid "Change the properties of this folder"
-msgstr ""
+msgstr "შეცვლა პარამეტრები -"
 
 #: ../ui/evolution-mail-list.xml.h:3
 #, fuzzy
 msgid "Collapse All _Threads"
-msgstr "ყველა"
+msgstr "ჩაკეცვა ყველა ძაფები"
 
 #: ../ui/evolution-mail-list.xml.h:4
+#, fuzzy
 msgid "Collapse all message threads"
-msgstr ""
+msgstr "ჩაკეცვა ყველა"
 
 #: ../ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
-msgstr "დააკოპირე -სკენ"
+msgstr "დააკოპირე წმ -სკენ"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
-msgstr "ამოჭრა -სკენ"
+msgstr "ამოჭრა წმ -სკენ"
 
 #: ../ui/evolution-mail-list.xml.h:8
+#, fuzzy
 msgid "E_xpand All Threads"
-msgstr ""
+msgstr "E ყველა ძაფები"
 
 #: ../ui/evolution-mail-list.xml.h:9
+#, fuzzy
 msgid "E_xpunge"
-msgstr ""
+msgstr "E"
 
 #: ../ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Expand all message threads"
-msgstr "ყველა შეტყობინება"
+msgstr "გაფართოება ყველა"
 
 #: ../ui/evolution-mail-list.xml.h:12
+#, fuzzy
 msgid "Hide S_elected Messages"
-msgstr ""
+msgstr "დამალვა S შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:13
+#, fuzzy
 msgid "Hide _Deleted Messages"
-msgstr ""
+msgstr "დამალვა შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:14
+#, fuzzy
 msgid "Hide _Read Messages"
-msgstr ""
+msgstr "დამალვა წაკითხვა შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:15
+#, fuzzy
 msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
+msgstr "დამალვა a ხაზი"
 
 #: ../ui/evolution-mail-list.xml.h:16
 #, fuzzy
 msgid "Mar_k All Messages as Read"
-msgstr "ყველა წაკითხული"
+msgstr "მარ ყველა შეტყობინებები წაკითხვა"
 
 #: ../ui/evolution-mail-list.xml.h:17
+#, fuzzy
 msgid "Paste message(s) from the clipboard"
-msgstr ""
+msgstr "ჩასმა წმ"
 
 #: ../ui/evolution-mail-list.xml.h:18
+#, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
-msgstr ""
+msgstr "ამოშლა ყველა"
 
 #: ../ui/evolution-mail-list.xml.h:19
+#, fuzzy
 msgid "Permanently remove this folder"
-msgstr ""
+msgstr "ამოშლა"
 
 #: ../ui/evolution-mail-list.xml.h:20
+#, fuzzy
 msgid "Select Message _Thread"
-msgstr ""
+msgstr "ამორჩევა შეტყობინება"
 
 #: ../ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Select _All Messages"
-msgstr "ყველა"
+msgstr "ამორჩევა ყველა შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:22
+#, fuzzy
 msgid "Select all and only the messages that are not currently selected"
-msgstr ""
+msgstr "ამორჩევა ყველა და არა"
 
 #: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
+msgstr "ამორჩევა ყველა -"
 
 #: ../ui/evolution-mail-list.xml.h:24
 #, fuzzy
 msgid "Select all visible messages"
-msgstr "ხილული"
+msgstr "ამორჩევა ყველა ხოლული"
 
 #: ../ui/evolution-mail-list.xml.h:25
+#, fuzzy
 msgid "Sh_ow Hidden Messages"
-msgstr ""
+msgstr "დამალული შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:26
+#, fuzzy
 msgid "Show messages that have been temporarily hidden"
-msgstr ""
+msgstr "ჩვენება დამალული"
 
 #: ../ui/evolution-mail-list.xml.h:27
+#, fuzzy
 msgid "Temporarily hide all messages that have already been read"
-msgstr ""
+msgstr "ყველა"
 
 #: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
@@ -19618,12 +20552,12 @@ msgstr ""
 #: ../ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "Threaded Message list"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება სია"
 
 #: ../ui/evolution-mail-list.xml.h:31
 #, fuzzy
 msgid "_Group By Threads"
-msgstr "ჯგუფი"
+msgstr "ჯგუფი ძაფები"
 
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
@@ -19631,23 +20565,25 @@ msgid "_Message"
 msgstr "_წერილი"
 
 #: ../ui/evolution-mail-message.xml.h:1
+#, fuzzy
 msgid "A_dd Sender to Address Book"
-msgstr ""
+msgstr "A გამგზავნი -სკენ მისამართი"
 
 #: ../ui/evolution-mail-message.xml.h:2
+#, fuzzy
 msgid "A_pply Filters"
-msgstr ""
+msgstr "A ფილტრები"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 #, fuzzy
 msgid "Add Sender to Address Book"
-msgstr "დამატება -სკენ მისამართი"
+msgstr "დამატება გამგზავნი -სკენ მისამართი"
 
 #: ../ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "All Message _Headers"
-msgstr "ყველა შეტყობინება"
+msgstr "ყველა შეტყობინება სათაურები"
 
 #: ../ui/evolution-mail-message.xml.h:6
 #, fuzzy
@@ -19655,30 +20591,34 @@ msgid "Apply filter rules to the selected messages"
 msgstr "გამოყენება -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:7
+#, fuzzy
 msgid "Check for _Junk"
-msgstr ""
+msgstr "შემოწმება"
 
 #: ../ui/evolution-mail-message.xml.h:8
 #, fuzzy
 msgid "Compose _New Message"
-msgstr "ახალი შეტყობინება"
+msgstr "შექმნა ახალი შეტყობინება"
 
 #: ../ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "a -სკენ"
+msgstr "შექმნა a -სკენ ყველა - -"
 
 #: ../ui/evolution-mail-message.xml.h:10
+#, fuzzy
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr ""
+msgstr "შექმნა a -სკენ სია -"
 
 #: ../ui/evolution-mail-message.xml.h:11
+#, fuzzy
 msgid "Compose a reply to the sender of the selected message"
-msgstr ""
+msgstr "შექმნა a -სკენ -"
 
 #: ../ui/evolution-mail-message.xml.h:12
+#, fuzzy
 msgid "Copy selected messages to another folder"
-msgstr ""
+msgstr "დააკოპირე -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:13
 #, fuzzy
@@ -19697,7 +20637,7 @@ msgstr "შექმნა a ძებნა საქაღალდე"
 #: ../ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a Search Folder for this mailing list"
-msgstr "შექმნა a ძებნა საქაღალდე"
+msgstr "შექმნა a ძებნა საქაღალდე სია"
 
 #: ../ui/evolution-mail-message.xml.h:17
 #, fuzzy
@@ -19705,24 +20645,29 @@ msgid "Create a Search Folder for this sender"
 msgstr "შექმნა a ძებნა საქაღალდე"
 
 #: ../ui/evolution-mail-message.xml.h:18
+#, fuzzy
 msgid "Create a Search Folder for this subject"
-msgstr ""
+msgstr "შექმნა a ძებნა საქაღალდე თემა"
 
 #: ../ui/evolution-mail-message.xml.h:19
+#, fuzzy
 msgid "Create a rule to filter messages from this sender"
-msgstr ""
+msgstr "შექმნა a -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:20
+#, fuzzy
 msgid "Create a rule to filter messages to these recipients"
-msgstr ""
+msgstr "შექმნა a -სკენ -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:21
+#, fuzzy
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
+msgstr "შექმნა a -სკენ -სკენ სია"
 
 #: ../ui/evolution-mail-message.xml.h:22
+#, fuzzy
 msgid "Create a rule to filter messages with this subject"
-msgstr ""
+msgstr "შექმნა a -სკენ თემა"
 
 #: ../ui/evolution-mail-message.xml.h:23
 #, fuzzy
@@ -19730,17 +20675,19 @@ msgid "Cut selected messages to the clipboard"
 msgstr "ამოჭრა -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:24
+#, fuzzy
 msgid "Decrease the text size"
-msgstr ""
+msgstr "ტექსტი"
 
 #: ../ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the next important message"
-msgstr "დისპლეი"
+msgstr "დისპლეი მნიშვნელოვანი"
 
 #: ../ui/evolution-mail-message.xml.h:27
+#, fuzzy
 msgid "Display the next message"
-msgstr ""
+msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:28
 #, fuzzy
@@ -19748,66 +20695,79 @@ msgid "Display the next thread"
 msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:29
+#, fuzzy
 msgid "Display the next unread message"
-msgstr ""
+msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:30
+#, fuzzy
 msgid "Display the previous important message"
-msgstr ""
+msgstr "დისპლეი მნიშვნელოვანი"
 
 #: ../ui/evolution-mail-message.xml.h:31
+#, fuzzy
 msgid "Display the previous message"
-msgstr ""
+msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:32
+#, fuzzy
 msgid "Display the previous unread message"
-msgstr ""
+msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:33
+#, fuzzy
 msgid "F_orward As..."
-msgstr ""
+msgstr "F."
 
 #: ../ui/evolution-mail-message.xml.h:34
+#, fuzzy
 msgid "Filter on Mailing _List..."
-msgstr ""
+msgstr "ფილტრი ჩართულია სია."
 
 #: ../ui/evolution-mail-message.xml.h:35
+#, fuzzy
 msgid "Filter on Se_nder..."
-msgstr ""
+msgstr "ფილტრი ჩართულია."
 
 #: ../ui/evolution-mail-message.xml.h:36
+#, fuzzy
 msgid "Filter on _Recipients..."
-msgstr ""
+msgstr "ფილტრი ჩართულია."
 
 #: ../ui/evolution-mail-message.xml.h:37
+#, fuzzy
 msgid "Filter on _Subject..."
-msgstr ""
+msgstr "ფილტრი ჩართულია თემა."
 
 #: ../ui/evolution-mail-message.xml.h:38
+#, fuzzy
 msgid "Filter the selected messages for junk status"
-msgstr ""
+msgstr "ფილტრი"
 
 #: ../ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Flag selected messages for follow-up"
-msgstr "ამოჭრა -სკენ"
+msgstr "ზემოთ"
 
 #: ../ui/evolution-mail-message.xml.h:40
+#, fuzzy
 msgid "Follow _Up..."
-msgstr ""
+msgstr "მიყოლა ზემოთ."
 
 #: ../ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Force images in HTML mail to be loaded"
-msgstr "ძალდატანება -სკენ"
+msgstr "ძალდატანება - HTML ფოსტა -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:43
+#, fuzzy
 msgid "Forward the selected message in the body of a new message"
-msgstr ""
+msgstr "წინ - - a ახალი"
 
 #: ../ui/evolution-mail-message.xml.h:44
+#, fuzzy
 msgid "Forward the selected message quoted like a reply"
-msgstr ""
+msgstr "წინ a"
 
 #: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
@@ -19818,12 +20778,14 @@ msgid "Forward the selected message to someone as an attachment"
 msgstr "ამორჩეული წერილის გადაგზავნა ვინმესთან დანართის სახით"
 
 #: ../ui/evolution-mail-message.xml.h:47
+#, fuzzy
 msgid "Increase the text size"
-msgstr ""
+msgstr "ტექსტი"
 
 #: ../ui/evolution-mail-message.xml.h:49
+#, fuzzy
 msgid "Mar_k as"
-msgstr ""
+msgstr "მარ"
 
 #: ../ui/evolution-mail-message.xml.h:50
 #, fuzzy
@@ -19833,7 +20795,7 @@ msgstr "გახსენი a"
 #: ../ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark the selected messages as important"
-msgstr "გახსენი a"
+msgstr "მნიშვნელოვანი"
 
 #: ../ui/evolution-mail-message.xml.h:52
 #, fuzzy
@@ -19843,12 +20805,12 @@ msgstr "გახსენი a"
 #: ../ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark the selected messages as not being junk"
-msgstr "გახსენი a"
+msgstr "არა"
 
 #: ../ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected messages as not having been read"
-msgstr "გახსენი a"
+msgstr "არა"
 
 #: ../ui/evolution-mail-message.xml.h:55
 #, fuzzy
@@ -19860,8 +20822,9 @@ msgid "Mark the selected messages for deletion"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:57
+#, fuzzy
 msgid "Move selected messages to another folder"
-msgstr ""
+msgstr "გადატანა -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
@@ -19875,30 +20838,31 @@ msgstr "შემდეგი"
 #: ../ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Next _Unread Message"
-msgstr "შემდეგი შეტყობინება"
+msgstr "შემდეგი წაუკითხავად შეტყობინება"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:63
+#, fuzzy
 msgid "Open a window for composing a mail message"
-msgstr ""
+msgstr "გახსნა a ფანჯარა a ფოსტა"
 
 #: ../ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Open the selected messages in a new window"
-msgstr "გახსენი a"
+msgstr "გახსნა - a ახალი ფანჯარა"
 
 #: ../ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Open the selected messages in the composer for editing"
-msgstr "გახსენი"
+msgstr "გახსნა -"
 
 #: ../ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "P_revious Unread Message"
-msgstr "შეტყობინება"
+msgstr "წაუკითხავად შეტყობინება"
 
 #: ../ui/evolution-mail-message.xml.h:67
 #, fuzzy
@@ -19911,16 +20875,19 @@ msgid "Pos_t New Message to Folder"
 msgstr "ახალი შეტყობინება -სკენ საქაღალდე"
 
 #: ../ui/evolution-mail-message.xml.h:69
+#, fuzzy
 msgid "Post a Repl_y"
-msgstr ""
+msgstr "a y"
 
 #: ../ui/evolution-mail-message.xml.h:70
+#, fuzzy
 msgid "Post a message to a Public folder"
-msgstr ""
+msgstr "a -სკენ a საზოგადო"
 
 #: ../ui/evolution-mail-message.xml.h:71
+#, fuzzy
 msgid "Post a reply to a message in a Public folder"
-msgstr ""
+msgstr "a -სკენ a - a საზოგადო"
 
 #: ../ui/evolution-mail-message.xml.h:72
 #, fuzzy
@@ -19941,18 +20908,19 @@ msgid "Re_direct"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:79
+#, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Reset the text to its original size"
-msgstr "განულება -სკენ ორიგინალი სიდიდე"
+msgstr "ხელახალი კონფიგურაცია ტექსტი -სკენ ორიგინალი"
 
 #: ../ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Save the selected messages as a text file"
-msgstr "შენახვა a"
+msgstr "შენახვა a ტექსტი ფაილი"
 
 #: ../ui/evolution-mail-message.xml.h:86
 #, fuzzy
@@ -19977,37 +20945,42 @@ msgstr "ძებნა საქაღალდე."
 #: ../ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
-msgstr "ძებნა"
+msgstr "ძებნა ტექსტი - -"
 
 #: ../ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "Select _All Text"
-msgstr "ყველა ტექსტი"
+msgstr "ამორჩევა ყველა ტექსტი"
 
 #: ../ui/evolution-mail-message.xml.h:92
+#, fuzzy
 msgid "Select all the text in a message"
-msgstr ""
+msgstr "ამორჩევა ყველა ტექსტი - a"
 
 #: ../ui/evolution-mail-message.xml.h:93
+#, fuzzy
 msgid "Set up the page settings for your current printer"
-msgstr ""
+msgstr "ზემოთ პანელი"
 
 #: ../ui/evolution-mail-message.xml.h:94
+#, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr ""
+msgstr "ჩვენება a - -"
 
 #: ../ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show messages in the normal style"
-msgstr "ანახე"
+msgstr "ჩვენება - საშუალო"
 
 #: ../ui/evolution-mail-message.xml.h:96
+#, fuzzy
 msgid "Show messages with all email headers"
-msgstr ""
+msgstr "ჩვენება ყველა ელფოსტა"
 
 #: ../ui/evolution-mail-message.xml.h:97
+#, fuzzy
 msgid "Show the raw email source of the message"
-msgstr ""
+msgstr "ჩვენება ელფოსტა -"
 
 #: ../ui/evolution-mail-message.xml.h:98
 #, fuzzy
@@ -20027,8 +21000,9 @@ msgid "_Attached"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:102
+#, fuzzy
 msgid "_Caret Mode"
-msgstr ""
+msgstr "რეჟიმი"
 
 #: ../ui/evolution-mail-message.xml.h:103
 #, fuzzy
@@ -20043,17 +21017,17 @@ msgstr "წაშლა შეტყობინება"
 #: ../ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Find in Message..."
-msgstr "ძებნა შეტყობინება."
+msgstr "ძიება - შეტყობინება."
 
 #: ../ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Flag Completed"
-msgstr "შესრულებულია"
+msgstr "დასრულებულია"
 
 #: ../ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Go To"
-msgstr "ვის"
+msgstr "გადასვლა ვის"
 
 #: ../ui/evolution-mail-message.xml.h:112
 msgid "_Important"
@@ -20076,7 +21050,7 @@ msgstr "ჩატვირთვა სურათები"
 #: ../ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Message Source"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება წყარო"
 
 #: ../ui/evolution-mail-message.xml.h:119
 #, fuzzy
@@ -20094,7 +21068,7 @@ msgstr ""
 #: ../ui/evolution-mail-message.xml.h:122
 #, fuzzy
 msgid "_Open in New Window"
-msgstr "გახსენი ახალი ფანჯარა"
+msgstr "გახსნა - ახალი ფანჯარა"
 
 #: ../ui/evolution-mail-message.xml.h:123
 #, fuzzy
@@ -20117,8 +21091,9 @@ msgid "_Undelete Message"
 msgstr "შეტყობინება"
 
 #: ../ui/evolution-mail-message.xml.h:130
+#, fuzzy
 msgid "_Unread"
-msgstr ""
+msgstr "წაუკითხავად"
 
 #: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom In"
@@ -20156,26 +21131,27 @@ msgstr "ჩასმა"
 #: ../ui/evolution-memos.xml.h:10
 #, fuzzy
 msgid "Previews the list of memos to be printed"
-msgstr "-სკენ"
+msgstr "სია - -სკენ"
 
 #: ../ui/evolution-memos.xml.h:13
 #, fuzzy
 msgid "Print the list of memos"
-msgstr "ბეჭდვა"
+msgstr "ბეჭდვა სია -"
 
 #: ../ui/evolution-memos.xml.h:14
 #, fuzzy
 msgid "View the selected memo"
-msgstr "ხედი"
+msgstr "ჩვენება"
 
 #: ../ui/evolution-memos.xml.h:18
 #, fuzzy
 msgid "_Open Memo"
-msgstr "გახსენი"
+msgstr "გახსნა"
 
 #: ../ui/evolution-message-composer.xml.h:2
+#, fuzzy
 msgid "Attach a file"
-msgstr ""
+msgstr "a ფაილი"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -20189,28 +21165,30 @@ msgid "Close the current file"
 msgstr "დახურე შემდეგი ფაილი"
 
 #: ../ui/evolution-message-composer.xml.h:5
+#, fuzzy
 msgid "Delete all but signature"
-msgstr ""
+msgstr "წაშლა ყველა"
 
 #: ../ui/evolution-message-composer.xml.h:6
 #, fuzzy
 msgid "Encrypt this message with PGP"
-msgstr "დაშიფვრა"
+msgstr "დაშიფვრა PGP"
 
 #: ../ui/evolution-message-composer.xml.h:7
 #, fuzzy
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "დაშიფვრა S დაშიფვრა"
+msgstr "დაშიფვრა S დაშიფვრა სერთიფიკატი"
 
 #: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
+#, fuzzy
 msgid "For_mat"
-msgstr ""
+msgstr "-თვის"
 
 #: ../ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Get delivery notification when your message is read"
-msgstr "შემოწმება -სკენ"
+msgstr "მიღება"
 
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
@@ -20234,16 +21212,19 @@ msgid "PGP Sign"
 msgstr "PGP ხელმოწერა"
 
 #: ../ui/evolution-message-composer.xml.h:16
+#, fuzzy
 msgid "R_equest Read Receipt"
-msgstr ""
+msgstr "R წაკითხვა მიღება"
 
 #: ../ui/evolution-message-composer.xml.h:17
+#, fuzzy
 msgid "S/MIME Encrypt"
-msgstr ""
+msgstr "S დაშიფვრა"
 
 #: ../ui/evolution-message-composer.xml.h:18
+#, fuzzy
 msgid "S/MIME Sign"
-msgstr ""
+msgstr "S ხელმოწერა"
 
 #: ../ui/evolution-message-composer.xml.h:20
 msgid "Save As"
@@ -20252,7 +21233,7 @@ msgstr "შეინახე როგორც"
 #: ../ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save Draft"
-msgstr "შენახვა"
+msgstr "მონახაზის შენახვა"
 
 #: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _As..."
@@ -20283,8 +21264,9 @@ msgid "Save the current file with a different name"
 msgstr "დაიმახსოვრე ფაილი განსხვავებული სახელით"
 
 #: ../ui/evolution-message-composer.xml.h:28
+#, fuzzy
 msgid "Save the message in a specified folder"
-msgstr ""
+msgstr "შენახვა - a"
 
 #: ../ui/evolution-message-composer.xml.h:29
 msgid "Send"
@@ -20292,8 +21274,9 @@ msgstr "გაგზავნა"
 
 #: ../ui/evolution-message-composer.xml.h:30
 #: ../ui/evolution-signature-editor.xml.h:23
+#, fuzzy
 msgid "Send the mail in HTML format"
-msgstr ""
+msgstr "გაგზავნა ფოსტა - HTML"
 
 #: ../ui/evolution-message-composer.xml.h:31
 #, fuzzy
@@ -20303,57 +21286,67 @@ msgstr "გაგზავნა"
 #: ../ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Set the message priority to high"
-msgstr "-სკენ"
+msgstr "-სკენ მაღალი"
 
 #: ../ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Sign this message with your PGP key"
-msgstr "ხელმოწერა გასაღები"
+msgstr "ხელმოწერა PGP გასაღები"
 
 #: ../ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "ხელმოწერა S ხელმოწერა"
+msgstr "ხელმოწერა S ხელმოწერა სერთიფიკატი"
 
 #: ../ui/evolution-message-composer.xml.h:35
+#, fuzzy
 msgid "Toggles whether the BCC field is displayed"
-msgstr ""
+msgstr "ბრმა ასლი ველი"
 
 #: ../ui/evolution-message-composer.xml.h:36
+#, fuzzy
 msgid "Toggles whether the CC field is displayed"
-msgstr ""
+msgstr "ასლი ველი"
 
 #: ../ui/evolution-message-composer.xml.h:37
+#, fuzzy
 msgid "Toggles whether the From chooser is displayed"
-msgstr ""
+msgstr "-დან"
 
 #: ../ui/evolution-message-composer.xml.h:38
+#, fuzzy
 msgid "Toggles whether the Post-To field is displayed"
-msgstr ""
+msgstr "ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:39
+#, fuzzy
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
+msgstr "პასუხი ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:40
+#, fuzzy
 msgid "Toggles whether the To field is displayed"
-msgstr ""
+msgstr "ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:42
+#, fuzzy
 msgid "_Bcc Field"
-msgstr ""
+msgstr "უხილავი ასლი ველი"
 
 #: ../ui/evolution-message-composer.xml.h:43
+#, fuzzy
 msgid "_Cc Field"
-msgstr ""
+msgstr "ასლი ველი"
 
 #: ../ui/evolution-message-composer.xml.h:45
+#, fuzzy
 msgid "_Delete all"
-msgstr ""
+msgstr "წაშლა ყველა"
 
 #: ../ui/evolution-message-composer.xml.h:48
+#, fuzzy
 msgid "_From Field"
-msgstr ""
+msgstr "-დან ველი"
 
 #: ../ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
@@ -20362,7 +21355,7 @@ msgstr "_გახსნა..."
 #: ../ui/evolution-message-composer.xml.h:50
 #, fuzzy
 msgid "_Post-To Field"
-msgstr "ვის"
+msgstr "ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:51
 #, fuzzy
@@ -20370,8 +21363,9 @@ msgid "_Prioritize Message"
 msgstr "შეტყობინება"
 
 #: ../ui/evolution-message-composer.xml.h:52
+#, fuzzy
 msgid "_Reply-To Field"
-msgstr ""
+msgstr "პასუხი ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:54
 msgid "_Security"
@@ -20380,15 +21374,16 @@ msgstr "_უსაფრთხოება"
 #: ../ui/evolution-message-composer.xml.h:55
 #, fuzzy
 msgid "_To Field"
-msgstr "ვის"
+msgstr "ვის ველი"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_დახურვა"
 
 #: ../ui/evolution-signature-editor.xml.h:15
+#, fuzzy
 msgid "H_TML"
-msgstr ""
+msgstr "H"
 
 #: ../ui/evolution-signature-editor.xml.h:17
 #, fuzzy
@@ -20406,12 +21401,12 @@ msgstr "შენახვა და დახურვა"
 #: ../ui/evolution-signature-editor.xml.h:22
 #, fuzzy
 msgid "Save the current file and close the window"
-msgstr "შენახვა და"
+msgstr "შენახვა ფაილი და დახურვა ფანჯარა"
 
 #: ../ui/evolution-subscribe.xml.h:1
 #, fuzzy
 msgid "Add folder to your list of subscribed folders"
-msgstr "დამატება -სკენ"
+msgstr "დამატება -სკენ სია -"
 
 #: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
@@ -20420,20 +21415,22 @@ msgstr "განაახლე სია"
 #: ../ui/evolution-subscribe.xml.h:4
 #, fuzzy
 msgid "Refresh List of Folders"
-msgstr "განაახლე სია საქაღალდეები"
+msgstr "განახლება სია - საქაღალდეები"
 
 #: ../ui/evolution-subscribe.xml.h:5
 #, fuzzy
 msgid "Remove folder from your list of subscribed folders"
-msgstr "წაშლა"
+msgstr "ამოშლა სია -"
 
 #: ../ui/evolution-subscribe.xml.h:7
+#, fuzzy
 msgid "Subscribe"
-msgstr ""
+msgstr "ხელის მოწერა"
 
 #: ../ui/evolution-subscribe.xml.h:8
+#, fuzzy
 msgid "Unsubscribe"
-msgstr ""
+msgstr "ხელმოუწერელი"
 
 #: ../ui/evolution-subscribe.xml.h:12
 #, fuzzy
@@ -20441,13 +21438,14 @@ msgid "_Invert Selection"
 msgstr "არჩეული"
 
 #: ../ui/evolution-task-editor.xml.h:4
+#, fuzzy
 msgid "Click change / view the status details of the task"
-msgstr ""
+msgstr "- დრო"
 
 #: ../ui/evolution-task-editor.xml.h:9
 #, fuzzy
 msgid "Status Details"
-msgstr "სტატუსი დეტალები"
+msgstr "სტატუსი ცნობები"
 
 #: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
@@ -20460,68 +21458,72 @@ msgstr "_გაგზავნის ოფციები"
 #: ../ui/evolution-task-editor.xml.h:24
 #, fuzzy
 msgid "_Status Details"
-msgstr "სტატუსი დეტალები"
+msgstr "სტატუსი ცნობები"
 
 #: ../ui/evolution-tasks.xml.h:3
 #, fuzzy
 msgid "Copy selected tasks"
-msgstr "დააკოპირე"
+msgstr "დააკოპირე ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected tasks"
-msgstr "ამოჭრა"
+msgstr "ამოჭრა ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete completed tasks"
-msgstr "წაშლა"
+msgstr "წაშლა დასრულებულია ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:8
+#, fuzzy
 msgid "Delete selected tasks"
-msgstr ""
+msgstr "წაშლა ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:9
+#, fuzzy
 msgid "Mar_k as Complete"
-msgstr ""
+msgstr "მარ შესრულებულია"
 
 #: ../ui/evolution-tasks.xml.h:10
+#, fuzzy
 msgid "Mark selected tasks as complete"
-msgstr ""
+msgstr "ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Paste tasks from the clipboard"
-msgstr "ჩასმა"
+msgstr "ჩასმა ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:13
+#, fuzzy
 msgid "Previews the list of tasks to be printed"
-msgstr ""
+msgstr "სია - ამოცანები -სკენ"
 
 #: ../ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "Print the list of tasks"
-msgstr "ბეჭდვა"
+msgstr "ბეჭდვა სია - ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "Show task preview window"
-msgstr "ანახე"
+msgstr "ჩვენება დრო ფანჯარა"
 
 #: ../ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "Task _Preview"
-msgstr "წინასწარ ნახვა"
+msgstr "ამოცანა წინასწარ ნახვა"
 
 #: ../ui/evolution-tasks.xml.h:20
 #, fuzzy
 msgid "View the selected task"
-msgstr "ხედი"
+msgstr "ჩვენება დრო"
 
 #: ../ui/evolution-tasks.xml.h:27
 #, fuzzy
 msgid "_Open Task"
-msgstr "გახსენი"
+msgstr "გახსნა ამოცანა"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -20534,37 +21536,37 @@ msgstr "ევოლუშენის პარამეტრების შ�
 #: ../ui/evolution.xml.h:3
 #, fuzzy
 msgid "Change the visibility of the toolbar"
-msgstr "შეცვლა"
+msgstr "შეცვლა -"
 
 #: ../ui/evolution.xml.h:5
 #, fuzzy
 msgid "Create a new window displaying this folder"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი ფანჯარა"
 
 #: ../ui/evolution.xml.h:6
 #, fuzzy
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "დისპლეი"
+msgstr "დისპლეი ფანჯარა"
 
 #: ../ui/evolution.xml.h:7
 #, fuzzy
 msgid "Display window buttons with icons and text"
-msgstr "დისპლეი და"
+msgstr "დისპლეი ფანჯარა და ტექსტი"
 
 #: ../ui/evolution.xml.h:8
 #, fuzzy
 msgid "Display window buttons with icons only"
-msgstr "დისპლეი"
+msgstr "დისპლეი ფანჯარა"
 
 #: ../ui/evolution.xml.h:9
 #, fuzzy
 msgid "Display window buttons with text only"
-msgstr "დისპლეი"
+msgstr "დისპლეი ფანჯარა ტექსტი"
 
 #: ../ui/evolution.xml.h:10
 #, fuzzy
 msgid "Exit the program"
-msgstr "გასვლა პროგრამიდან"
+msgstr "გამოსვლა პროგრამა"
 
 #: ../ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
@@ -20603,12 +21605,14 @@ msgid "Send / _Receive"
 msgstr "გაგზავნა / _მიღება"
 
 #: ../ui/evolution.xml.h:21
+#, fuzzy
 msgid "Send queued items and retrieve new items"
-msgstr ""
+msgstr "გაგზავნა და ახალი"
 
 #: ../ui/evolution.xml.h:22
+#, fuzzy
 msgid "Set up Pilot configuration"
-msgstr ""
+msgstr "ზემოთ"
 
 #: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
@@ -20624,24 +21628,28 @@ msgid "Status _Bar"
 msgstr "სტატუსი"
 
 #: ../ui/evolution.xml.h:26
+#, fuzzy
 msgid "Submit Bug Report"
-msgstr ""
+msgstr "შეცდომის პატაკის გაგზავნა"
 
 #. <menuitem name="HelpFAQ" verb=""
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
 #: ../ui/evolution.xml.h:31
+#, fuzzy
 msgid "Submit _Bug Report"
-msgstr ""
+msgstr "გაგზავნა შეცდომა"
 
 #: ../ui/evolution.xml.h:32
+#, fuzzy
 msgid "Submit a bug report using Bug Buddy"
-msgstr ""
+msgstr "გაგზავნა a შეცდომა"
 
 #: ../ui/evolution.xml.h:33
+#, fuzzy
 msgid "Toggle whether we are working offline."
-msgstr ""
+msgstr "ხაზიდან გასვლა."
 
 #: ../ui/evolution.xml.h:34
 msgid "Tool_bar"
@@ -20652,12 +21660,14 @@ msgid "Tool_bar style"
 msgstr ""
 
 #: ../ui/evolution.xml.h:36
+#, fuzzy
 msgid "View/Hide the Side Bar"
-msgstr ""
+msgstr "ჩვენება დამალვა"
 
 #: ../ui/evolution.xml.h:37
+#, fuzzy
 msgid "View/Hide the Status Bar"
-msgstr ""
+msgstr "ჩვენება დამალვა სტატუსი"
 
 #: ../ui/evolution.xml.h:38
 msgid "_About"
@@ -20680,8 +21690,9 @@ msgid "_Icons only"
 msgstr "მხოლოდ _ხატულები"
 
 #: ../ui/evolution.xml.h:47
+#, fuzzy
 msgid "_Quick Reference"
-msgstr ""
+msgstr "მითითება"
 
 #: ../ui/evolution.xml.h:48
 msgid "_Quit"
@@ -20690,7 +21701,7 @@ msgstr "_გასვლა"
 #: ../ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Switcher Appearance"
-msgstr "შესახედაობა"
+msgstr "იერსახე"
 
 #: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
@@ -20712,7 +21723,7 @@ msgstr "კომპანია"
 #: ../views/addressbook/galview.xml.h:2
 #, fuzzy
 msgid "_Address Cards"
-msgstr "მისამართი"
+msgstr "მისამართი ბარათი"
 
 #: ../views/addressbook/galview.xml.h:3
 #, fuzzy
@@ -20720,45 +21731,48 @@ msgid "_Phone List"
 msgstr "ტელეფონი სია"
 
 #: ../views/calendar/galview.xml.h:1
+#, fuzzy
 msgid "W_eek View"
-msgstr ""
+msgstr "ჩვენება"
 
 #: ../views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "_Day View"
-msgstr "დღე ხედი"
+msgstr "დღე ჩვენება"
 
 #: ../views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "_List View"
-msgstr "სია ხედი"
+msgstr "სია ჩვენება"
 
 #: ../views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "_Month View"
-msgstr "თვე ხედი"
+msgstr "თვე ჩვენება"
 
 #: ../views/calendar/galview.xml.h:5
 #, fuzzy
 msgid "_Work Week View"
-msgstr "სამსახური ხედი"
+msgstr "სამსახური კვირა ჩვენება"
 
 #: ../views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As _Sent Folder"
-msgstr "საქაღალდე"
+msgstr "გაგზავნა საქაღალდე"
 
 #: ../views/mail/galview.xml.h:2
+#, fuzzy
 msgid "By S_tatus"
-msgstr ""
+msgstr "S"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:4
+#, fuzzy
 msgid "By Su_bject"
-msgstr ""
+msgstr "კვ"
 
 #: ../views/mail/galview.xml.h:5
 #, fuzzy
@@ -20766,8 +21780,9 @@ msgid "By _Follow Up Flag"
 msgstr "მიყოლა ზემოთ"
 
 #: ../views/mail/galview.xml.h:6
+#, fuzzy
 msgid "_Messages"
-msgstr ""
+msgstr "შეტყობინებები"
 
 #: ../views/memos/galview.xml.h:1
 #, fuzzy
@@ -20777,7 +21792,7 @@ msgstr "_წევრები"
 #: ../views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "With _Due Date"
-msgstr "თარიღი"
+msgstr "ვადა თარიღი"
 
 #: ../views/tasks/galview.xml.h:2
 #, fuzzy
@@ -20799,8 +21814,9 @@ msgid "<b>_Selection</b>"
 msgstr "<b> არჩეული</b>"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#, fuzzy
 msgid "Select a Time Zone"
-msgstr ""
+msgstr "ამორჩევა a დრო"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 #, fuzzy
@@ -20808,11 +21824,12 @@ msgid "TimeZone Combobox"
 msgstr "მხტუნავი მენიუ"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#, fuzzy
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
 "Use the right mouse button to zoom out."
-msgstr ""
+msgstr "გამოყენება მარცხენა -სკენ - ჩართულია - და a მარჯვენა -სკენ."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:188
@@ -20822,18 +21839,21 @@ msgstr ""
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
+#, fuzzy
 msgid "Define Views for %s"
-msgstr ""
+msgstr "ხედები წმ"
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
+#, fuzzy
 msgid "Define Views"
-msgstr ""
+msgstr "ხედები"
 
 #: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
+#, fuzzy
 msgid "Define Views for \"%s\""
-msgstr ""
+msgstr "ხედები წმ"
 
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit..."
@@ -20843,12 +21863,14 @@ msgstr "_რედაქტირება..."
 #: ../widgets/table/e-table-header-item.c:1839
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
+#, fuzzy
 msgid "Table"
-msgstr ""
+msgstr "ცხრილი"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#, fuzzy
 msgid "Instance"
-msgstr ""
+msgstr "Instance"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
 msgid "Save Current View"
@@ -20859,18 +21881,21 @@ msgid "_Create new view"
 msgstr "ახალი ხედის _შექმნა"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#, fuzzy
 msgid "_Replace existing view"
-msgstr ""
+msgstr "შეცვლა"
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:587
 #: ../widgets/menus/gal-view-menus.c:350
+#, fuzzy
 msgid "Custom View"
-msgstr ""
+msgstr "სხვა ჩვენება"
 
 #: ../widgets/menus/gal-view-instance.c:588
+#, fuzzy
 msgid "Save Custom View"
-msgstr ""
+msgstr "შენახვა სხვა ჩვენება"
 
 #: ../widgets/menus/gal-view-instance.c:592
 #: ../widgets/menus/gal-view-menus.c:372
@@ -20885,23 +21910,25 @@ msgstr "ა_ხლანდელი ხედი"
 #: ../widgets/menus/gal-view-menus.c:359
 #, fuzzy
 msgid "Save Custom View..."
-msgstr "შენახვა სხვა ხედი."
+msgstr "შენახვა სხვა ჩვენება."
 
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
 msgstr ""
 
 #: ../widgets/menus/gal-view-new-dialog.c:115
+#, fuzzy
 msgid "Define New View"
-msgstr ""
+msgstr "ახალი ჩვენება"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "ახალი ხედის სახელი:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#, fuzzy
 msgid "Type of View"
-msgstr ""
+msgstr "ტიპი - ჩვენება"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
@@ -20915,8 +21942,9 @@ msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1093
+#, fuzzy
 msgid "%B %Y"
-msgstr ""
+msgstr "B Y"
 
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
@@ -20926,8 +21954,9 @@ msgstr "თვის კალენდარი"
 #: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
 #: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
 #: ../widgets/text/e-text.c:3564
+#, fuzzy
 msgid "Fill color"
-msgstr ""
+msgstr "შევსება"
 
 #: ../widgets/misc/e-canvas-background.c:464
 #: ../widgets/misc/e-canvas-background.c:465
@@ -20944,8 +21973,9 @@ msgstr ""
 #: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
 #: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
 #: ../widgets/text/e-text.c:3586
+#, fuzzy
 msgid "Fill stipple"
-msgstr ""
+msgstr "შევსება"
 
 #: ../widgets/misc/e-canvas-background.c:485
 #: ../widgets/misc/e-canvas-background.c:486
@@ -20971,8 +22001,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3015
+#, fuzzy
 msgid "Minimum width"
-msgstr ""
+msgstr "სიგანე"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:975
@@ -20984,22 +22015,24 @@ msgstr "მინიმალური სიგანე"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
-#, fuzzy
 msgid "Spacing"
 msgstr "ინტერვალი"
 
 #: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
+#, fuzzy
 msgid "Now"
-msgstr ""
+msgstr "ახლა"
 
 #: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
+#, fuzzy
 msgid "The time must be in the format: %s"
-msgstr ""
+msgstr "- წმ"
 
 #: ../widgets/misc/e-cell-percent.c:76
+#, fuzzy
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
+msgstr "და"
 
 #: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
@@ -21008,7 +22041,7 @@ msgstr "ბალტიური"
 #: ../widgets/misc/e-charset-picker.c:65
 #, fuzzy
 msgid "Central European"
-msgstr "ცენტრალურ ევროპული"
+msgstr "ცენტრალური ევროპა"
 
 #: ../widgets/misc/e-charset-picker.c:66
 msgid "Chinese"
@@ -21035,7 +22068,6 @@ msgid "Korean"
 msgstr "კორეული"
 
 #: ../widgets/misc/e-charset-picker.c:72
-#, fuzzy
 msgid "Thai"
 msgstr "ტაილანდური"
 
@@ -21052,8 +22084,9 @@ msgid "Western European"
 msgstr "დასავლეთ ევროპა"
 
 #: ../widgets/misc/e-charset-picker.c:76
+#, fuzzy
 msgid "Western European, New"
-msgstr ""
+msgstr "დასავლური ახალი"
 
 #: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 #: ../widgets/misc/e-charset-picker.c:95
@@ -21070,22 +22103,24 @@ msgid "Ukrainian"
 msgstr "უკრაინული"
 
 #: ../widgets/misc/e-charset-picker.c:105
+#, fuzzy
 msgid "Visual"
-msgstr ""
+msgstr "იერსახე"
 
 #: ../widgets/misc/e-charset-picker.c:174
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
-msgstr "უცნობი"
+msgstr "უცნობი წმ"
 
 #: ../widgets/misc/e-charset-picker.c:219
 #, fuzzy
 msgid "Character Encoding"
-msgstr "კოდირება"
+msgstr "სიმბოლო კოდირება"
 
 #: ../widgets/misc/e-charset-picker.c:234
+#, fuzzy
 msgid "Enter the character set to use"
-msgstr ""
+msgstr "შეყვანა -სკენ"
 
 #: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
@@ -21105,16 +22140,19 @@ msgid "Date and Time"
 msgstr "დრო და თარიღი"
 
 #: ../widgets/misc/e-dateedit.c:340
+#, fuzzy
 msgid "Text entry to input date"
-msgstr ""
+msgstr "ტექსტი ელემენტი -სკენ თარიღი"
 
 #: ../widgets/misc/e-dateedit.c:362
+#, fuzzy
 msgid "Click this button to show a calendar"
-msgstr ""
+msgstr "-სკენ a კალენდარი"
 
 #: ../widgets/misc/e-dateedit.c:384
+#, fuzzy
 msgid "Combo box to select time"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../widgets/misc/e-dateedit.c:385
 msgid "Time"
@@ -21131,73 +22169,82 @@ msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #: ../widgets/misc/e-expander.c:181
+#, fuzzy
 msgid "Expanded"
-msgstr ""
+msgstr "გაფართოებული"
 
 #: ../widgets/misc/e-expander.c:182
+#, fuzzy
 msgid "Whether or not the expander is expanded"
-msgstr ""
+msgstr "ან არა"
 
 #: ../widgets/misc/e-expander.c:190
+#, fuzzy
 msgid "Text of the expander's label"
-msgstr ""
+msgstr "გამფართოებლის ჭდის ტექსტი"
 
 #: ../widgets/misc/e-expander.c:197
 #, fuzzy
 msgid "Use underline"
-msgstr "გამოყენება"
+msgstr "ხაზგასმის გამოყენება"
 
 #: ../widgets/misc/e-expander.c:198
+#, fuzzy
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
-msgstr ""
+msgstr "თუ მითითებულია, ტექსტის ხაზგასმა ნიშნავს, რომ შემდეგი სიმბოლო გამოიყენება როგორც სხარტულა."
 
 #: ../widgets/misc/e-expander.c:206
+#, fuzzy
 msgid "Space to put between the label and the child"
-msgstr ""
+msgstr "დამატებითი არე წარწერასა და ქვეელემენტს შორის"
 
 #: ../widgets/misc/e-expander.c:215
 #, fuzzy
 msgid "Label widget"
-msgstr "სათაური"
+msgstr "წარწერის მართვის ელემენტი"
 
 #: ../widgets/misc/e-expander.c:216
+#, fuzzy
 msgid "A widget to display in place of the usual expander label"
-msgstr ""
+msgstr "მართვის ელემენტი, რომელიც გამფართოებლის ჩვეულებრივი წარწერის ნაცვლად იქნება ნაჩვენები"
 
 #: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
+#, fuzzy
 msgid "Expander Size"
-msgstr ""
+msgstr "გამფართოებლის ზომა"
 
 #: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
+#, fuzzy
 msgid "Size of the expander arrow"
-msgstr ""
+msgstr "გამფართოებლის ისრის ზომა"
 
 #: ../widgets/misc/e-expander.c:231
 #, fuzzy
 msgid "Indicator Spacing"
-msgstr "ინტერვალი"
+msgstr "მაჩვენებლის ველები"
 
 #: ../widgets/misc/e-expander.c:232
 #, fuzzy
 msgid "Spacing around expander arrow"
-msgstr "ინტერვალი"
+msgstr "გამფართოებლის ისრის ველები"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:163
 #, fuzzy
 msgid "Advanced Search"
-msgstr "დამატებითი ძებნა"
+msgstr "დეტალური ძებნა"
 
 #: ../widgets/misc/e-filter-bar.c:202
+#, fuzzy
 msgid "_Searches"
-msgstr ""
+msgstr "ძიება"
 
 #: ../widgets/misc/e-filter-bar.c:204
 #, fuzzy
 msgid "Searches"
-msgstr "ძებნები"
+msgstr "ძიება"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:227
@@ -21213,17 +22260,17 @@ msgstr "შენახვა ძებნა."
 #: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 #, fuzzy
 msgid "_Edit Saved Searches..."
-msgstr "რედაქტირება."
+msgstr "რედაქტირება შენახულია ძიება."
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "_Advanced Search..."
-msgstr "დამატებითი ძებნა."
+msgstr "დეტალური ძებნა."
 
 #: ../widgets/misc/e-image-chooser.c:172
 #, fuzzy
 msgid "Choose Image"
-msgstr "არჩევა სურათი"
+msgstr "გამოსახულება"
 
 #: ../widgets/misc/e-map.c:627
 msgid "World Map"
@@ -21243,7 +22290,7 @@ msgstr ""
 #: ../widgets/misc/e-pilot-settings.c:111
 #, fuzzy
 msgid "Sync Private Records:"
-msgstr "პრივატი:"
+msgstr "პირადი:"
 
 #: ../widgets/misc/e-pilot-settings.c:120
 #, fuzzy
@@ -21251,16 +22298,18 @@ msgid "Sync Categories:"
 msgstr "კატეგორიები:"
 
 #: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#, fuzzy
 msgid "Empty message"
-msgstr ""
+msgstr "ცარიელი"
 
 #: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr ""
 
 #: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#, fuzzy
 msgid "Column width"
-msgstr ""
+msgstr "სვეტი სიგანე"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
@@ -21275,7 +22324,7 @@ msgstr "_ძებნა"
 #: ../widgets/misc/e-search-bar.c:594
 #, fuzzy
 msgid "_Find Now"
-msgstr "ძებნა"
+msgstr "ძიება ახლა"
 
 #: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
@@ -21314,7 +22363,7 @@ msgstr "კურსორი"
 #: ../widgets/table/e-tree-selection-model.c:818
 #, fuzzy
 msgid "Cursor Column"
-msgstr "კურსორი"
+msgstr "კურსორი სვეტი"
 
 #: ../widgets/misc/e-selection-model.c:214
 msgid "Sorter"
@@ -21323,7 +22372,7 @@ msgstr ""
 #: ../widgets/misc/e-selection-model.c:221
 #, fuzzy
 msgid "Selection Mode"
-msgstr "არჩეული რეჟიმი"
+msgstr "მონიშვნის რეჟიმი"
 
 #: ../widgets/misc/e-selection-model.c:229
 #, fuzzy
@@ -21335,9 +22384,8 @@ msgid "When de_leted:"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:1
-#, fuzzy
 msgid "<b>Delivery Options</b>"
-msgstr "<b> ოფციები</b>"
+msgstr "<b>გაგზავნის ოფციები</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
@@ -21346,7 +22394,7 @@ msgstr "<b>პასუხები</b>"
 #: ../widgets/misc/e-send-options.glade.h:3
 #, fuzzy
 msgid "<b>Return Notification</b>"
-msgstr "<b> შეტყობინება</b>"
+msgstr "<b> დაბრუნება ნოიფიკაცია</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:4
 #, fuzzy
@@ -21354,53 +22402,61 @@ msgid "<b>Status Tracking</b>"
 msgstr "<b> სტატუსი</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
+#, fuzzy
 msgid "A_uto-delete sent item"
-msgstr ""
+msgstr "A წაშლა გაგზავნილი"
 
 #: ../widgets/misc/e-send-options.glade.h:6
+#, fuzzy
 msgid "C_lassification"
-msgstr ""
+msgstr "C"
 
 #: ../widgets/misc/e-send-options.glade.h:7
+#, fuzzy
 msgid "Creat_e a sent item to track information"
-msgstr ""
+msgstr "e a გაგზავნილი -სკენ"
 
 #: ../widgets/misc/e-send-options.glade.h:8
+#, fuzzy
 msgid "Deli_vered and opened"
-msgstr ""
+msgstr "და"
 
 #: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
 msgstr "ზოგადი პრამეტრები"
 
 #: ../widgets/misc/e-send-options.glade.h:10
+#, fuzzy
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr ""
+msgstr "არა მიღება"
 
 #: ../widgets/misc/e-send-options.glade.h:12
+#, fuzzy
 msgid ""
 "Public\n"
 "Private\n"
 "Confidential\n"
-msgstr ""
+msgstr "საზოგადო არა"
 
 #: ../widgets/misc/e-send-options.glade.h:16
+#, fuzzy
 msgid "R_eply requested"
-msgstr ""
+msgstr "R მოთხოვნილი"
 
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:19
+#, fuzzy
 msgid ""
 "Undefined\n"
 "High\n"
 "Standard\n"
 "Low"
-msgstr ""
+msgstr "დაუდგენელი"
 
 #: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
@@ -21428,20 +22484,23 @@ msgid "_All information"
 msgstr "სრული ინფორმაცია"
 
 #: ../widgets/misc/e-send-options.glade.h:29
+#, fuzzy
 msgid "_Delay message delivery"
-msgstr ""
+msgstr "დაყოვნება"
 
 #: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:32
+#, fuzzy
 msgid "_Set expiration date"
-msgstr ""
+msgstr "თარიღი"
 
 #: ../widgets/misc/e-send-options.glade.h:33
+#, fuzzy
 msgid "_Until:"
-msgstr ""
+msgstr "მდე:"
 
 #: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
@@ -21469,24 +22528,26 @@ msgstr "-სკენ -სკენ URL"
 #: ../widgets/misc/gal-categories.glade.h:2
 #, fuzzy
 msgid "Edit Master Category List..."
-msgstr "რედაქტირება კატეგორია სია."
+msgstr "რედაქტირება პირველადი კატეგორია სია."
 
 #: ../widgets/misc/gal-categories.glade.h:3
+#, fuzzy
 msgid "Item(s) belong to these _categories:"
-msgstr ""
+msgstr "ელემენტი წმ -სკენ:"
 
 #: ../widgets/misc/gal-categories.glade.h:4
 #, fuzzy
 msgid "_Available Categories:"
-msgstr "მისაწვდომია კატეგორიები:"
+msgstr "ხელმისაწვდომი კატეგორიები:"
 
 #: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr ""
 
 #: ../widgets/table/e-cell-combo.c:177
+#, fuzzy
 msgid "popup list"
-msgstr ""
+msgstr "სია"
 
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
@@ -21495,52 +22556,59 @@ msgstr "%l:%M %p"
 #: ../widgets/table/e-cell-pixbuf.c:397
 #, fuzzy
 msgid "Selected Column"
-msgstr "მონიშნულია"
+msgstr "მონიშნული სვეტი"
 
 #: ../widgets/table/e-cell-pixbuf.c:404
+#, fuzzy
 msgid "Focused Column"
-msgstr ""
+msgstr "სვეტი"
 
 #: ../widgets/table/e-cell-pixbuf.c:411
+#, fuzzy
 msgid "Unselected Column"
-msgstr ""
+msgstr "სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1749
+#, fuzzy
 msgid "Strikeout Column"
-msgstr ""
+msgstr "ხაზგადასმული სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1756
 #, fuzzy
 msgid "Underline Column"
-msgstr "ხაზგასმული"
+msgstr "ხაზგასმული სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1763
 #, fuzzy
 msgid "Bold Column"
-msgstr "მუქი"
+msgstr "მუქი სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1770
 #, fuzzy
 msgid "Color Column"
-msgstr "ფერი"
+msgstr "ფერი სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1784
+#, fuzzy
 msgid "BG Color Column"
-msgstr ""
+msgstr "ფერი სვეტი"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:1
+#, fuzzy
 msgid "<- _Remove"
-msgstr ""
+msgstr "ამოშლა"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
+#, fuzzy
 msgid "A_vailable Fields:"
-msgstr ""
+msgstr "A:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
+#, fuzzy
 msgid "Ascending"
-msgstr ""
+msgstr "ზრდადობის მიხედვით"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
@@ -21557,36 +22625,35 @@ msgstr "კლებადობით"
 #: ../widgets/table/e-table-config.glade.h:7
 #, fuzzy
 msgid "Group Items By"
-msgstr "ჯგუფი"
+msgstr "ჯგუფი ელემენტები"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
-#, fuzzy
 msgid "Move _Down"
-msgstr "გადატანა"
+msgstr "ჩადი ქ_ვემოთ"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
-#, fuzzy
 msgid "Move _Up"
 msgstr "ადი _ზევით"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:11
+#, fuzzy
 msgid "Sh_ow these fields in order:"
-msgstr ""
+msgstr "-:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
 #: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 #, fuzzy
 msgid "Show Fields"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:11
 #, fuzzy
 msgid "Show field in View"
-msgstr "ანახე ხედი"
+msgstr "ჩვენება ველი - ჩვენება"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:12
@@ -21597,7 +22664,7 @@ msgstr "სორტირება"
 #: ../widgets/table/e-table-config.glade.h:13
 #, fuzzy
 msgid "Sort Items By"
-msgstr "სორტირება"
+msgstr "სორტირება ელემენტები"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:16
 #: ../widgets/table/e-table-config.glade.h:14
@@ -21605,8 +22672,9 @@ msgid "Then By"
 msgstr ""
 
 #: ../widgets/table/e-table-config-no-group.glade.h:17
+#, fuzzy
 msgid "_Add ->"
-msgstr ""
+msgstr "დამატება"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
@@ -21619,13 +22687,13 @@ msgid "_Sort..."
 msgstr "_სორტირება..."
 
 #: ../widgets/table/e-table-config.c:150
-#, fuzzy
 msgid "State"
 msgstr "მდგომარეობა"
 
 #: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#, fuzzy
 msgid "(Ascending)"
-msgstr ""
+msgstr "ზრდადობის მიხედვით"
 
 #: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
 #, fuzzy
@@ -21637,13 +22705,14 @@ msgid "Not sorted"
 msgstr ""
 
 #: ../widgets/table/e-table-config.c:355
+#, fuzzy
 msgid "No grouping"
-msgstr ""
+msgstr "არა"
 
 #: ../widgets/table/e-table-config.c:584
 #, fuzzy
 msgid "Available Fields"
-msgstr "მისაწვდომია"
+msgstr "ხელმისაწვდომი"
 
 #: ../widgets/table/e-table-config.glade.h:17
 #, fuzzy
@@ -21653,7 +22722,7 @@ msgstr "ჯგუფი."
 #: ../widgets/table/e-table-config.glade.h:19
 #, fuzzy
 msgid "_Show these fields in order:"
-msgstr "ანახე:"
+msgstr "ჩვენება -:"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
@@ -21668,7 +22737,7 @@ msgstr ""
 #: ../widgets/table/e-table-header-item.c:1818
 #, fuzzy
 msgid "Full Header"
-msgstr "სრული"
+msgstr "სრული ზედა კოლონტიტული"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 #, fuzzy
@@ -21676,14 +22745,16 @@ msgid "Add a column..."
 msgstr "დამატება a."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
+#, fuzzy
 msgid "Field Chooser"
-msgstr ""
+msgstr "ველი"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:2
+#, fuzzy
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
-msgstr ""
+msgstr "ვის დამატება a -სკენ ცხრილი - -სკენ."
 
 #: ../widgets/table/e-table-group-container.c:346
 #, c-format
@@ -21720,8 +22791,9 @@ msgstr "ფერები"
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
 #: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
+#, fuzzy
 msgid "Horizontal Draw Grid"
-msgstr ""
+msgstr "ჰორიზონტალური ასახვა ბადე"
 
 #: ../widgets/table/e-table-group-container.c:911
 #: ../widgets/table/e-table-group-container.c:912
@@ -21729,8 +22801,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#, fuzzy
 msgid "Vertical Draw Grid"
-msgstr ""
+msgstr "ვერტიკალური ასახვა ბადე"
 
 #: ../widgets/table/e-table-group-container.c:918
 #: ../widgets/table/e-table-group-container.c:919
@@ -21738,8 +22811,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#, fuzzy
 msgid "Draw focus"
-msgstr ""
+msgstr "ასახვა"
 
 #: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-container.c:926
@@ -21748,7 +22822,7 @@ msgstr ""
 #: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 #, fuzzy
 msgid "Cursor mode"
-msgstr "კურსორი"
+msgstr "კურსორი რეჟიმი"
 
 #: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-container.c:933
@@ -21766,8 +22840,9 @@ msgstr "არჩეული"
 #: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
 #: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
 #: ../widgets/table/e-tree.c:3260
+#, fuzzy
 msgid "Length Threshold"
-msgstr ""
+msgstr "სიგრძე"
 
 #: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-container.c:947
@@ -21776,8 +22851,9 @@ msgstr ""
 #: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
 #: ../widgets/table/e-tree.c:3292
+#, fuzzy
 msgid "Uniform row height"
-msgstr ""
+msgstr "რიგი სიმაღლე"
 
 #: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-container.c:954
@@ -21789,17 +22865,17 @@ msgstr "გაყინული"
 #: ../widgets/table/e-table-header-item.c:1466
 #, fuzzy
 msgid "Customize Current View"
-msgstr "გამართვა ხედი"
+msgstr "გამართვა მიმდინარე ჩვენება"
 
 #: ../widgets/table/e-table-header-item.c:1486
 #, fuzzy
 msgid "Sort Ascending"
-msgstr "სორტირება"
+msgstr "სორტირება ზრდადობის მიხედვით"
 
 #: ../widgets/table/e-table-header-item.c:1487
 #, fuzzy
 msgid "Sort Descending"
-msgstr "სორტირება"
+msgstr "სორტირება კლებადობით"
 
 #: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
@@ -21808,7 +22884,7 @@ msgstr ""
 #: ../widgets/table/e-table-header-item.c:1490
 #, fuzzy
 msgid "Group By This Field"
-msgstr "ჯგუფი"
+msgstr "ჯგუფი ველი"
 
 #: ../widgets/table/e-table-header-item.c:1491
 #, fuzzy
@@ -21818,30 +22894,31 @@ msgstr "ჯგუფი"
 #: ../widgets/table/e-table-header-item.c:1493
 #, fuzzy
 msgid "Remove This Column"
-msgstr "წაშლა"
+msgstr "ამოშლა სვეტი"
 
 #: ../widgets/table/e-table-header-item.c:1494
 #, fuzzy
 msgid "Add a Column..."
-msgstr "დამატება a."
+msgstr "დამატება a სვეტი."
 
 #: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "განთავსება"
 
 #: ../widgets/table/e-table-header-item.c:1497
+#, fuzzy
 msgid "Best Fit"
-msgstr ""
+msgstr "საუკეთესო"
 
 #: ../widgets/table/e-table-header-item.c:1498
 #, fuzzy
 msgid "Format Columns..."
-msgstr "ფორმატი."
+msgstr "ფორმატი სვეტები."
 
 #: ../widgets/table/e-table-header-item.c:1500
 #, fuzzy
 msgid "Customize Current View..."
-msgstr "გამართვა ხედი."
+msgstr "გამართვა მიმდინარე ჩვენება."
 
 #: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
@@ -21857,65 +22934,70 @@ msgstr "სორტირება ინფორმაცია"
 #: ../widgets/table/e-table-header-item.c:1846
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
-#, fuzzy
 msgid "Tree"
 msgstr "განშტოება"
 
 #: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#, fuzzy
 msgid "Table header"
-msgstr ""
+msgstr "ცხრილი თავსართი"
 
 #: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#, fuzzy
 msgid "Table model"
-msgstr ""
+msgstr "ცხრილი"
 
 #: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #, fuzzy
 msgid "Cursor row"
-msgstr "კურსორი"
+msgstr "კურსორი რიგი"
 
 #: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
 #: ../widgets/table/e-tree.c:3299
 #, fuzzy
 msgid "Always search"
-msgstr "ყოველთვის"
+msgstr "ყოველთვის ძიება"
 
 #: ../widgets/table/e-table.c:3322
 #, fuzzy
 msgid "Use click to add"
-msgstr "-სკენ"
+msgstr "გამოყენება -სკენ დამატება"
 
 #: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#, fuzzy
 msgid "ETree table adapter"
-msgstr ""
+msgstr "ცხრილი"
 
 #: ../widgets/table/e-tree.c:3305
+#, fuzzy
 msgid "Retro Look"
-msgstr ""
+msgstr "შეხედვა"
 
 #: ../widgets/table/e-tree.c:3306
 #, fuzzy
 msgid "Draw lines and +/- expanders."
-msgstr "და."
+msgstr "ასახვა და."
 
 #: ../widgets/text/e-entry-test.c:49
+#, fuzzy
 msgid "Minicard Test"
-msgstr ""
+msgstr "ტესტი"
 
 #: ../widgets/text/e-entry-test.c:50
 #, fuzzy
 msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "საავტორო უფლებები C."
+msgstr "C კოდი."
 
 #: ../widgets/text/e-entry-test.c:52
+#, fuzzy
 msgid "This should test the minicard canvas item"
-msgstr ""
+msgstr "ტილო"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
 #: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 #, fuzzy
 msgid "Event Processor"
-msgstr "შემთხვევა პროცესორი"
+msgstr "მოვლენა პროცესორი"
 
 #: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
 msgid "Font"
@@ -21927,8 +23009,9 @@ msgstr ""
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
 #: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
+#, fuzzy
 msgid "Justification"
-msgstr ""
+msgstr "მორგება"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
 #: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
@@ -21945,12 +23028,13 @@ msgstr ""
 #: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 #, fuzzy
 msgid "Line wrap"
-msgstr "სტრიქონი"
+msgstr "სტრიქონების გადატანა"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 #: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#, fuzzy
 msgid "Break characters"
-msgstr ""
+msgstr "შეწყვეტა ასო-ნიშნები"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
 #: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
@@ -21962,22 +23046,25 @@ msgstr "მაქსიმალური"
 #: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 #, fuzzy
 msgid "Allow newlines"
-msgstr "დაუშვი"
+msgstr "ნების დართვა"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
 #: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#, fuzzy
 msgid "Draw borders"
-msgstr ""
+msgstr "ასახვა"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
 #: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#, fuzzy
 msgid "Draw background"
-msgstr ""
+msgstr "ასახვა"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
 #: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
+#, fuzzy
 msgid "Draw button"
-msgstr ""
+msgstr "ასახვა"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
 #: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
@@ -21986,25 +23073,28 @@ msgid "Cursor position"
 msgstr "კურსორი"
 
 #: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+#, fuzzy
 msgid "Emulate label resize"
-msgstr ""
+msgstr "წარწერა"
 
 #: ../widgets/text/e-text.c:2721
 #, fuzzy
 msgid "Input Methods"
-msgstr "შესავალი"
+msgstr "შეტანის პარამეტრები"
 
 #: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "მუქი"
 
 #: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
+#, fuzzy
 msgid "Strikeout"
-msgstr ""
+msgstr "ხაზგადასმული"
 
 #: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
+#, fuzzy
 msgid "Anchor"
-msgstr ""
+msgstr "ღუზა"
 
 #: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 #, fuzzy
@@ -22021,63 +23111,99 @@ msgid "Clip"
 msgstr ""
 
 #: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
+#, fuzzy
 msgid "Fill clip rectangle"
-msgstr ""
+msgstr "შევსება"
 
 #: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
+#, fuzzy
 msgid "X Offset"
-msgstr ""
+msgstr "X წანაცვლება"
 
 #: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#, fuzzy
 msgid "Y Offset"
-msgstr ""
+msgstr "Y წანაცვლება"
 
 #: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 #, fuzzy
 msgid "Text width"
-msgstr "ტექსტი"
+msgstr "ტექსტის სიგანე"
 
 #: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 #, fuzzy
 msgid "Text height"
-msgstr "ტექსტი"
+msgstr "ტექსტის სიმაღლე"
 
 #: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 #, fuzzy
 msgid "IM Context"
-msgstr "მოკ-შე"
+msgstr "მოკ-შე კონტექსტი"
 
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 #, fuzzy
 msgid "Handle Popup"
 msgstr "მხტუნავი"
 
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
 "are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
 "because your connection is already secure."
-msgstr ""
+msgstr "Evolution -სკენ SSL TLS - a -თვის მაგალითი და LDAP a ეთ Evolution -სკენ SSL TLS."
+
+#, fuzzy
+msgid "(%ld seconds)"
+msgstr "წამი"
+
+msgid "(%d %s %d %s)"
+msgstr "(%d·%s·%d·%s)"
+
+msgid "(%d %s)"
+msgstr "(%d·%s)"
+
+msgid " %u second"
+msgstr " %u წამი"
+
+msgid " %u seconds"
+msgstr " %u წამი"
+
+msgid " %u minute"
+msgstr " %u წუთი"
+
+msgid " %u minutes"
+msgstr " %u წუთი"
+
+msgid "%u hour"
+msgstr "%u საათი"
+
+msgid "%u hours"
+msgstr "%u საათი"
 
 #, fuzzy
 msgid "Task Table"
-msgstr "ამოცანა"
+msgstr "ამოცანა ცხრილი"
 
 #, fuzzy
 msgid "Memo Table"
-msgstr "ამოცანა"
+msgstr "ცხრილი"
 
 #, fuzzy
 msgid "Timezone Button"
 msgstr "დროის ზონა ღილაკი"
 
 #, fuzzy
+msgid "(%d seconds)"
+msgstr "წამი"
+
+#, fuzzy
 msgid "The Evolution Groupware Suite"
 msgstr "Evolution"
 
 #, fuzzy
 msgid "Mail Accounts Table"
-msgstr "ანგარიშები"
+msgstr "ფოსტა ანგარიშები ცხრილი"
 
 #, fuzzy
 msgid "Attachment Button"
@@ -22090,8 +23216,9 @@ msgstr "არა"
 msgid "Filters"
 msgstr "ფილტრები"
 
+#, fuzzy
 msgid "_Show animated images"
-msgstr ""
+msgstr "ჩვენება"
 
 msgid "<b>%s (%s)</b>"
 msgstr "<b>%s (%s)</b>"
@@ -22101,7 +23228,7 @@ msgstr "<b>%s</b>"
 
 #, fuzzy
 msgid "Message List"
-msgstr "შეტყობინება სია"
+msgstr "შეტყობინების სია"
 
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">ავტომატური კონტაქტები</span>"
@@ -22109,8 +23236,9 @@ msgstr "<span weight=\"bold\">ავტომატური კონტაქ�
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">კონფლიქტების ძებნა</span>"
 
+#, fuzzy
 msgid "_All day Event"
-msgstr ""
+msgstr "ყველა დღე მოვლენა"
 
 msgid "Previous Button"
 msgstr "წინა ღილაკი"
@@ -22119,9 +23247,8 @@ msgstr "წინა ღილაკი"
 msgid "Text Date Entry"
 msgstr "ტექსტი თარიღი"
 
-#, fuzzy
 msgid "Date Button"
-msgstr "თარიღი ღილაკი"
+msgstr "თარიღის ღილაკი"
 
 #, fuzzy
 msgid "Search Text Entry"
diff --git a/po/lt.po b/po/lt.po
index dc58086d5d..9d6de5681b 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -4,20 +4,16 @@
 # Tomas Kuliavas <tokul@users.sourceforge.net>, 2004
 # Žygimantas Beručka <zygis@gnome.org>, 2004-2006.
 # 
-# „In the beginning back in nineteen fifty five
-# Man didn't know 'bout a rock 'n' roll show
-# 'N all that jive
 # The white man had the schmaltz, the black man had the blues
 # No one knew what they was gonna do
 # But Tschaikovsky had the news, he said "Let there be rock"“
 #
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-23 18:17+0300\n"
-"PO-Revision-Date: 2006-07-23 18:24+0300\n"
+"POT-Creation-Date: 2006-07-21 19:43+0300\n"
+"PO-Revision-Date: 2006-07-21 20:03+0300\n"
 "Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +23,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution adresų knyga"
 
@@ -41,13 +37,13 @@ msgstr "Naujas kontaktas"
 msgid "New Contact List"
 msgstr "Naujas kontaktų sąrašas"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "esamame adresų knygos aplanke %s yra %d kortelė"
-msgstr[1] "esamame adresų knygos aplanke %s yra %d kortelės"
-msgstr[2] "esamame adresų knygos aplanke %s yra %d kortelių"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "esamame adresų knygos aplanke yra %d kortelė"
+msgstr[1] "esamame adresų knygos aplanke yra %d kortelės"
+msgstr[2] "esamame adresų knygos aplanke yra %d kortelių"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -66,32 +62,32 @@ msgstr "Kontaktas: "
 msgid "evolution minicard"
 msgstr "evolution mini kortelė"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Jame yra perspėjimų."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Jame yra pasikartojimų."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Yra susitikimas."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendoriaus įvykis: santrauka yra %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendoriaus įvykis: santraukos nėra."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "kalendoriaus vaizdo įvykis"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Pagriebti fokusavimą"
 
@@ -120,9 +116,7 @@ msgstr "Eiti į datą"
 msgid "a table to view and select the current time range"
 msgstr "lentelė skirta žiūrėti ir pasirinkti dabartiniam laiko rėžiui"
 
-#. 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -130,38 +124,30 @@ msgstr[0] "Turi %d įvykį."
 msgstr[1] "Turi %d įvykius."
 msgstr[2] "Turi %d įvykių."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Neturi įvykių."
 
-#. 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Darbo savaitės vaizdas: %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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dienos vaizdas: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "kalendoriaus vaizdas darbo savaitei"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "kalendoriaus vaizdas vienai ar daugiau dienų"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -172,20 +158,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:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
 #: ../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:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
@@ -193,10 +177,10 @@ msgstr "%a, %Y %b %d"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%Y %b %d"
 
@@ -206,11 +190,9 @@ msgstr "%Y %b %d"
 #. 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:732
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%b %d"
 
@@ -340,14 +322,6 @@ msgstr "Aktyvuoti numatytąjį"
 msgid "Popup Menu"
 msgstr "Iššokantis meniu"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Įjungti/išjungti priedų juostą"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "įjungti"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -521,9 +495,9 @@ msgid ""
 msgstr ""
 "Jūsų {0} kontaktai bus neprieinami, kol Evolution nebus perleista iš naujo."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Pridėti"
@@ -533,7 +507,7 @@ msgid "_Discard"
 msgstr "_Atsikratyti"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -573,9 +547,9 @@ msgstr "Čia konfigūruojamas automatinis užbaigimas"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontaktai"
 
@@ -615,8 +589,8 @@ msgstr "Čia valdykite Jūsų S/Mime sertifikatus"
 #. 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:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -631,13 +605,12 @@ msgstr "Šiame kompiuteryje"
 #. 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:600
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Asmeninis"
 
@@ -664,7 +637,7 @@ msgid "Create a new contact list"
 msgstr "Sukurti naują kontaktų sąrašą"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Nauja adresų knyga"
 
@@ -680,73 +653,72 @@ msgstr "Sukurti naują adresų knygą"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Nepavyko atnaujinti adresų knygos nustatymų ar aplankų."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Pagrindas"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipas:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Nukopijuoti knygos turinį į nuosavą kompiuterį darbui neprisijungus"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:2003
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Esmė"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Serverio informacija"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalės"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Paieška"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Atsiuntimas"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Adresų knygos savybės"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Perkeliama..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Perkeliama „%s“:"
@@ -821,35 +793,35 @@ msgstr "Aplanko varde negali būti simbolio „/“"
 msgid "A Folder with this name already exists"
 msgstr "Aplankas tokiu pavadinimu jau egzistuoja"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Nauja adresų knyga"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Ištrinti"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Išsaugoti kaip Vcard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Savybės..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Kontaktų šaltinio parinkiklis"
 
@@ -858,12 +830,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Susisiekiama su LDAP serveriu anonimiškai"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Autorizacija nepavyko.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Įveskite %s slaptažodį (naudotojas %s)"
@@ -909,7 +881,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Aplanko, paskutinį kartą naudoto vardų parinkimo dialoge, adresas."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Vertikalaus skydelio pozicija"
 
@@ -938,7 +910,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentikacija</b>"
 
@@ -1188,9 +1160,9 @@ msgstr "_Prisijungimo metodas:"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Vardas:"
 
@@ -1203,7 +1175,7 @@ msgid "_Search scope:"
 msgstr "_Paieškos sritis:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Serveris:"
@@ -1223,7 +1195,7 @@ msgstr "kortelės"
 #: ../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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
@@ -1232,222 +1204,243 @@ msgid "minutes"
 msgstr "minučių"
 
 #: ../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/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>El. paštas</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Namai</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Skubios žinutės</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Darbas</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Įvairūs</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Kita</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefonas</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Tinklalapis</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Darbas</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Kontaktas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2407
 msgid "Contact Editor"
 msgstr "Kontaktų redaktorius"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Pil_nas vardas..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Paveikslėlis"
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "El. pašto adresas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Slapyvardis:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefonas"
 
 #. 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:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Darbinis"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Adresas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Jubiliejus:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Asistentas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Gimtadienis:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1707
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/itip-formatter/itip-view.c:1654
 msgid "_Calendar:"
 msgstr "_Kalendorius:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Kategorijos..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Kategorijos"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Miestas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Kompanija:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Valstybė:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Padalinys:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "Į_rašyti į:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Laisvas/užsiėmęs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Namų tinklapis:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Vadybininkas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Pastabos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Biuras:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Pašto dėžutė:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Profesija:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Sutuoktinis:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Valstija/provincija:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Titulas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Video pokalbis:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Nori gauti HTML laiškus"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Internetinis žurnalas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Kur:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Pašto kodas:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Adresas"
 
@@ -1455,17 +1448,17 @@ msgstr "Adresas"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1814 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Redaguojamas"
 
@@ -2441,7 +2434,7 @@ msgstr "Zimbabvė"
 #: ../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
+#: ../plugins/save-attachments/save-attachments.c:371
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Vardas"
@@ -2452,7 +2445,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2462,7 +2455,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2471,7 +2464,7 @@ msgid "Service"
 msgstr "Paslauga"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2483,28 +2476,26 @@ msgstr "Naudotojo vardas"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:204
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Namų"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "Kitas"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2533,20 +2524,20 @@ msgid "Changed"
 msgstr "Pakeista"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktų redaktorius - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2780
 msgid "Please select an image for this contact"
 msgstr "Prašau parinkti šiam kontaktui paveikslėlį"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
-msgid "_No image"
-msgstr "_Nėra paveikslėlio"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2781
+msgid "No image"
+msgstr "Nėra paveikslėlio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3065
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2554,23 +2545,23 @@ msgstr ""
 "Kontakto duomenys netinkami:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ yra netinkamo formato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3076
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ yra netinkamo formato"
 
-#: ../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:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3102
 #, c-format
 msgid "%s'%s' is empty"
-msgstr "%s'%s' yra tuščias"
+msgstr "%s„%s“ yra tuščias"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3117
 msgid "Invalid contact."
 msgstr "Netinkamas kontaktas."
 
@@ -2587,7 +2578,7 @@ msgid "_Full name"
 msgstr "_Visas vardas"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+msgid "E-_mail"
 msgstr "E_l. paštas"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
@@ -2598,7 +2589,7 @@ msgstr "_Pasirinkti adresų knygą"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Ar tikrai norite\n"
 "ištrinti kontaktų sąrašą (%s)?"
@@ -2615,7 +2606,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Ar tikrai norite\n"
 "ištrinti kontaktą (%s)?"
@@ -2628,105 +2619,104 @@ msgstr ""
 "Ar tikrai norite\n"
 "ištrinti šiuos kontaktus?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresas _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Miestas:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Valst_ybė:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Pilnas adresas"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP kodas:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Miss"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Mr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Mrs."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Ms."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Vardas:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Pavardė:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "Vi_durinis:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Galūnė:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Pridėti SŽ abonentą"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Abonento vardas:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_SŽ paslauga:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2737,62 +2727,62 @@ msgstr "_Vieta:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Pridėti el.pašto adresą į sąrašą"
 
-#: ../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:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Kontaktų sąrašo redaktorius"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "Įterpti el. pašto adresus iš adresų knygos"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Nariai"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Pašalinti el. pašto adresą iš sąrašo"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Paslėpti adresus siunčiant laiškus šiam sąrašui"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Rodomas vardas:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "_Pasirinkti"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../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 ""
 "Įrašykite _el. pašto adresą arba nutempkite kontaktą į žemiau esantį sąrašą:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "Knyga"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Tai naujas sąrašas"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Nariai"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Susisiekti su sąrašo nariais"
 
@@ -2833,18 +2823,25 @@ msgstr ""
 "Šio kontakto el. pašto adresas arba vardas jau yra šiame\n"
 "aplanke.  Ar vis tiek norėtum jį pridėti?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Bet kuriame laukelyje yra"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Kategorija yra"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "El. paštas prasideda"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Vardas prasideda"
@@ -2863,7 +2860,7 @@ msgstr[2] "%d kontaktų"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
@@ -2879,7 +2876,7 @@ msgstr "Klaida gaunant knygos peržiūrą"
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Modelis"
 
@@ -2887,114 +2884,113 @@ msgstr "Modelis"
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortelę"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Šaltinis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2069
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Išsaugoti kaip VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Atverti"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Naujas kontaktas..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Naujas kontaktų _sąrašas..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "Iš_saugoti kaip VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Persiųsti kontaktą"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Persiųsti kontaktus"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Siųsti _laišką kontaktui"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Siųsti _laišką į konferenciją"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Siųsti _laišką kontaktams"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "Kopi_juoti į adresų knygelę..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "P_erkelti į adresų knygelę..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Iškirp_ti"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "Į_dėti"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1804
 msgid "Print cards"
 msgstr "Spausdinti korteles"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
 msgid "Assistant"
 msgstr "Asistento"
 
@@ -3035,7 +3031,7 @@ msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:783
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "El. paštas"
@@ -3081,22 +3077,20 @@ msgid "Journal"
 msgstr "Žurnalas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
 msgid "Manager"
 msgstr "Vadybininkas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobilusis telefonas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Nickname"
 msgstr "Pravardė"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Pastaba"
 
@@ -3105,7 +3099,7 @@ msgid "Office"
 msgstr "Ofisas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -3138,7 +3132,6 @@ msgid "Role"
 msgstr "Rolė"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
 msgid "Spouse"
 msgstr "Sutuoktinis"
 
@@ -3169,7 +3162,7 @@ msgid "Web Site"
 msgstr "Tinklapis"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3180,12 +3173,12 @@ msgstr "Tinklapis"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Plotis"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3195,12 +3188,12 @@ msgstr "Plotis"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Aukštis"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "Sufokusuotas"
 
@@ -3276,139 +3269,76 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapteris"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "Darbo el. paštas"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "Namų el. paštas"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "Kitas el. paštas"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "Parinkta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "Su kursoriumi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Atverti nu_orodą naršyklėje"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Kopijuoti nuorodą"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-msgid "_Send New Message To ..."
-msgstr "_Siųsti naują laišką į..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Kopijuoti _el. pašto adresą"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(žemėlapis)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:310
-#: ../addressbook/gui/widgets/eab-contact-display.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "žemėlapis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:461
-#: ../addressbook/gui/widgets/eab-contact-display.c:761
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Parodyti sąrašą"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "El. paštas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
-msgid "Department"
-msgstr "Padalinys"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Profession"
-msgstr "Profesija"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Postas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-msgid "Video Chat"
-msgstr "Vaizdo pokalbis"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Vaizdo konferencijos"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Kalendorius"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "Laisvas/užsiėmęs"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefonas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Faksas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
-msgid "Home Page"
-msgstr "Namų tinklalapis"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "darbo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-msgid "Web Log"
-msgstr "Žiniatinklio žurnalas"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
-msgid "Birthday"
-msgstr "Gimtadienis"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Žurnalas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-msgid "Anniversary"
-msgstr "Jubiliejus"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "asmeninis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:779
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Pareigos"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Namų puslapis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:818
-msgid "Blog"
-msgstr "Žurnalas"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3439,7 +3369,7 @@ msgstr "Nenurodytas savas kontaktas"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Priėjimas uždraustas"
 
@@ -3464,7 +3394,7 @@ msgstr "Protokolas nepalaikomas"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2385
 msgid "Canceled"
 msgstr "Atšaukta"
 
@@ -3597,7 +3527,7 @@ msgid "Error adding list"
 msgstr "Klaida pridedant sąrašą"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Klaida įtraukiant kontaktą"
 
@@ -3614,7 +3544,7 @@ msgid "Error removing list"
 msgstr "Klaida pašalinant sąrašą"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Klaida šalinant kontaktą"
 
@@ -3636,7 +3566,7 @@ msgstr[2] ""
 "Bandymas atverti %d kontaktų sukurs %d naujų langų.\n"
 "Ar Jūs tikrai norite peržiūrėti visus šiuos kontaktus vienu metu?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3645,15 +3575,15 @@ msgstr ""
 "%s jau egzistuoja.\n"
 "Ar nori įrašyti vietoj jo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "Perrašyti"
 
 #. 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontaktas"
@@ -3661,49 +3591,49 @@ msgstr[1] "kontaktai"
 msgstr[2] "kontaktų"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "kortele.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Pasirinkti adresų knygą"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "sąrašas"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Perkelti kontaktą į"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Nukopijuoti kontaktą į"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Perkelti kontaktus į"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Nukopijuoti kontaktus į"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Keletas VCard kortelių"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Kontakto informacija"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s kontakto informacija"
@@ -3799,12 +3729,12 @@ msgstr "Evolution VCard importavimas"
 msgid "Print envelope"
 msgstr "Spausdinti voką"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Spausdinti kontaktus"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Spausdinti kontaktą"
 
@@ -3853,7 +3783,7 @@ msgstr "Formatas"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Antraštė"
@@ -3957,7 +3887,7 @@ msgstr "Pustoniai"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4185,17 +4115,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Ar tikrai norite pašalinti šį susitikimą?"
 
 #: ../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 "Ar tikrai norite ištrinti šį žurnalo įrašą?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ar tikrai norite pašalinti šį susitikimą?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Ar tikrai norite pašalinti šią užduotį?"
 
@@ -4330,17 +4257,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution kalendorius netikėtai užsidarė."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Evolution raštelis netikėtai užsidarė."
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution užduotys netikėtai užsidarė."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalendorius nepažymėtas naudojimui atsijungus."
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "Jūsų pasirinktas kalendorius yra tik skaitomas"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "Raštelių sąrašas nepažymėtas naudojimui atsijungus"
@@ -4408,62 +4335,50 @@ msgstr ""
 "serveris turėtų būti atnaujintas iki palaikomos versijos."
 
 #: ../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 ""
-"Turite pasirinkę kalendoriaus šaltinį, kuris yra tik skaitymui. Persijunkite "
-"į kalendoriaus rodinį ir pažymėkite kalendorių galintį priimti paskyrimus."
-
-#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Jūs pakeitėte šį paskyrimą, bet pakeitimų dar neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr "Jūs pakeitėte šią užduotį, bet pakeitimų dar neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Jūs pakeitėte šį raštelį, bet pakeitimų dar neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Jūsų kalendoriai bus neprieinami kol Evolution nebus paleista iš naujo."
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "Jūsų rašteliai nebus prieinami, kol Evolution nebus paleista iš naujo."
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Jūsų užduotys nebus prieinamos, kol Evolution nebus paleista iš naujo."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "_Atsisakyti pakeitimų"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "Iš_saugoti"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "Iš_saugoti pakeitimus"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "_Siųsti perspėjimą"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
@@ -4480,8 +4395,8 @@ msgstr "Išskaidyti kelių dienų įvykius:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Nepavyko paleisti evolution-data-server"
 
@@ -4515,12 +4430,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Nepavyko įrašyti piloto ToDo programos bloko"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "Calendar and Tasks"
 msgstr "Kalendorius ir užduotys"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalendoriai"
 
@@ -4551,7 +4466,7 @@ msgstr "Evolution kalendoriaus komponentas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
-msgstr "Evolution raštelių komponentas"
+msgstr "Evolution užrašų komponentas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
@@ -4559,24 +4474,24 @@ msgstr "Evolution užduočių komponentas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
-msgstr "_Rašteliai"
+msgstr "_Užrašai"
 
 #: ../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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
-msgstr "Rašteliai"
+msgstr "Užrašai"
 
 #: ../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/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Užduotys"
@@ -4594,17 +4509,17 @@ msgstr "_Užduotys"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution kalendoriaus perspėjimo pranešimo tarnyba"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutė"
 msgstr[1] "minutes"
 msgstr[2] "minučių"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4614,7 +4529,7 @@ msgstr[0] "valanda"
 msgstr[1] "valandos"
 msgstr[2] "valandų"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:275
 msgid "Start time"
 msgstr "Pradžios laikas"
 
@@ -4625,10 +4540,10 @@ msgstr "Paskyrimai"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "Location:"
 msgstr "Vieta:"
 
@@ -4638,16 +4553,16 @@ msgstr "Snūs_telėjimo laikas:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Keisti"
 
@@ -4659,31 +4574,32 @@ msgstr "_Snūstelti"
 msgid "location of appointment"
 msgstr "paskyrimo vieta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Nėra jokios santraukos."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Nėra jokio aprašymo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Nėra vietos informacijos."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Jūs turite %d perspėjimus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4695,7 +4611,7 @@ msgstr ""
 "siųstų laišką.  Evolution vietoj to parodys normalų\n"
 "užuominos dialogą."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4712,7 +4628,7 @@ msgstr ""
 "\n"
 "Ar esate tikri, kad ši komanda turi būti paleista?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Kitą kartą nebeklausti apie šią programą."
 
@@ -4817,104 +4733,92 @@ msgid "Default reminder value"
 msgstr "Numatytoji priminimo reikšmė"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Įvykio perėjimas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Įvykio permatomumas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "„Laisvas/užsiėmęs“ serverio URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "„Laisvas/užsiėmęs“ šablono URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Įvykių perėjimas kalendoriaus vaizde."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Paslėpti užbaigtas užduotis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Paslėpti užduočių vienetus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Paslėpti užduoties reikšmę"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Horizontalaus skyriaus pozicija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Paskutinė darbo dienos valanda, dvidešimt keturių valandų formatu, 0 iki 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Pirma darbo dienos valanda, dvidešimt keturių valandų formatu, 0 iki 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervalai minutėmis rodomi Dienos ir Darbo savaitės rodiniuose."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Paskutinio perspėjimo laikas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Sąrašas serverių URL skirtų „laisvas/užsiėmęs“ informacijos skelbimui."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Marko Beinso linija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marko Beinso linijos spalva - Dienos rodinys"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marko Beinso linijos spalva - Laiko juosta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Paskutinė darbo dienos minutė, nuo 0 iki 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Pirma darbo dienos minutė, nuo 0 iki 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Mėnesio rodinio horizontalaus skydelio pozicija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Mėnesio rodinio vertikalaus skydelio pozicija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Vienetų skaičius nurodantis numatytąjį priminimą."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Vienetų skaičius nustantis kada reikia paslėpti užduotis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Vėluojamų atlikti užduočių spalva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4922,7 +4826,7 @@ msgstr ""
 "Horizontalaus skyriaus, tarp datos navigatoriaus kalendoriaus ir užduočių "
 "sąrašo, kada esama ne mėnesio rodinyje, pozicija taškais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4930,15 +4834,7 @@ msgstr ""
 "Horizontalaus skyriaus, tarp vaizdo ir datos navigatoriaus kalendoriaus bei "
 "užduočių sąrašo, kada esama mėnesio rodinyje, pozicija taškais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Vertikalaus polangio padėtis tarp kalendoriaus sąrašų ir datos navigatoriaus "
-"kalendoriaus."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4946,7 +4842,7 @@ msgstr ""
 "Vertikalaus skyriaus, tarp užduočių sąrašo ir užduočių peržiūros, pozicija "
 "taškais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4954,7 +4850,7 @@ msgstr ""
 "Vertikalaus skyriaus, tarp vaizdo ir datos navigatoriaus kalendoriaus, ir "
 "užduočių sąrašo mėnesio rodinyje, pozicija taškais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4962,65 +4858,65 @@ msgstr ""
 "Vertikalaus skyriaus, tarp vaizdo ir datos navigatoriaus kalendoriaus, ir "
 "užduočių sąrašo ne mėnesio rodinyje, pozicija taškais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programos, kurios gali būti paleistos perspėjimų."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Rodyti įvykių/užduočių/susitikimų redaktoriuje RSVP laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Rodyti įvykių/užduočių/susitikimų redaktoriuje vaidmens laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Rodyti paskyrimų pabaigos laikus savaitės ir mėnesio rodiniuose"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Rodyti įvykių/užduočių/susitikimų redaktoriuje kategorijų laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Rodyti ekrano perspėjimus perspėjimų skydelyje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Rodyti įvykių/užduočių/susitikimų redaktoriuje būsenos juostą"
 
-#: ../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.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Rodyti „Peržiūros“ skyrių"
 
-#: ../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.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Rodyti „Peržiūros“ skyrių."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Rodyti įvykių/susitikimų redaktoriuje laiko juostos laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Rodyti įvykių/užduočių/susitikimų redaktoriuje tipo laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Rodyti savaičių numerius datos navigatoriuje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Užduočių, kurias reikia atlikti iki šiandien, spalva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Užduočių vertikalaus skydelio pozicija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5030,7 +4926,7 @@ msgstr ""
 "skelbimo variantas, %u yra pakeičiama naudotojo el. pašto adreso dalimi ir %"
 "d yra pakeičiama domenu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5038,60 +4934,52 @@ msgstr ""
 "Numatytoji laiko juosta naudojama datoms ir laikui kalendoriuje, taip kaip "
 "yra neišverstoje Olseno laiko juostų duomenų bazėje. Pvz. „America/New York“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Laiko atkarpos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Paskutinio įvykdyto perspėjimo data, time_t vienetais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Laiko juosta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Įvykių permatomumas kalendoriaus rodinyje (reikšmė tarp 0 ir 10, jei "
-"nenurodyta kitaip - nepermatoma)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Dvidešimt keturių valandų laiko formatas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Numatytojo priminimo vienetai, „minutes“, „hours“ arba „days“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "Vienetai užduočių paslėpimo nurodymui, „minutes“, „hours“, „days“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Savaitės pradžia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Savaitės pradžios diena, nuo sekmadienio (0) iki šeštadienio (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Ar perspėjimų rodymui naudoti pranešimų vietą."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Ar klausti patvirtinimo trinant paskyrimus ar užduotis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Ar klausti patvirtinimo išvalant paskyrimus ar užduotis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5099,84 +4987,76 @@ msgstr ""
 "Ar suspausti savaitgalius mėnesio rodinyje. Nustačius, rodomi šeštadienis ir "
 "sekmadienis užima vienos dienos vietą."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Ar rodyti įvykių pabaigos laikus savaitės ir mėnesio rodiniuose."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Ar piešti kalendoriuje Marko Beinso liniją (dabarties laiko linija)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Ar užduočių rodinyje paslėpti atliktas užduotis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Ar nurodyti numatytąjį paskyrimų priminimą."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Ar įvykių/užduočių/susitikimų redaktoriuje rodyti RSVP laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Ar įvykių/susitikimų redaktoriuje rodyti kategorijų laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Ar įvykių/užduočių/susitikimų redaktoriuje rodyti vaidmens laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Ar įvykių/užduočių/susitikimų redaktoriuje rodyti būsenos laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Ar laikas turi būti rodomas 24 valandų formatu, vietoje am/pm formato."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Ar įvykių/susitikimų redaktoriuje rodyti laiko juostos laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Ar įvykių/užduočių/susitikimų redaktoriuje rodyti tipo laukelį"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Ar datos navigatoriuje rodyti savaičių numerius."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Ar naudoti dienos šviesos taupymo laiką rodant įvykius."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Darbo dienos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Paskutinė darbo dienos valanda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Paskutinė darbo dienos minutė"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Pirma darbo dienos valanda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Pirma darbo dienos minutė"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "dienos šviesos taupymo laikas"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Santraukoje yra"
@@ -5185,15 +5065,15 @@ msgstr "Santraukoje yra"
 msgid "Description contains"
 msgstr "Aprašyme yra"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentare yra"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Vietoje yra"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Neatitinkantys"
 
@@ -5204,6 +5084,20 @@ msgstr "Neatitinkantys"
 msgid "Print"
 msgstr "Spausdinti"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Kalendorius"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5219,10 +5113,10 @@ msgstr "Ištrinti įvykius senesnius nei"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "dienų"
 
@@ -5230,89 +5124,89 @@ msgstr "dienų"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Tinkle"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Gimtadieniai ir jubiliejai"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Oras"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "_Naujas kalendorius"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Nepavyko atnaujinti kalendorių."
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nepavyko atverti kalendoriaus „%s“ įvykių bei susitikimų įrašymui"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nėra sukurta kalendoriaus naudojamo įvykių bei susitikimų saugojimui"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Kalendoriaus šaltinio parinkiklis"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Naujas paskyrimas"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "P_askyrimas"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Sukurti naują paskyrimą"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Naujas susitikimas"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Susitikimas"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Sukurti naują susitikimo užklausimą"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Naujas visos dienos paskyrimas"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Visos dienos _paskyrimas"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Sukurti naują visos dienos paskyrimą"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Naujas kalendorius"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Kale_ndorius"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Sukurti naują kalendorių"
 
@@ -5464,25 +5358,26 @@ msgid "A_dd"
 msgstr "Pri_dėti"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Perspėjimai"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Pasiūlyti automatinį priedo parodymą"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../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 "Pasiūlyti automatinį priedo parodymą"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Prisegti rinkmeną.as)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Pasirinkti kalendoriai perspėjimams"
 
@@ -5508,7 +5403,7 @@ msgstr ""
 "<i>%u ir %d bus pakeisti naudotojo vardu ir domenu iš el.pašto adreso.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Perspėjimai</span>"
 
@@ -5518,7 +5413,7 @@ msgstr ""
 "<span weight=\"bold\">Numatytasis laivas/užimtas informacijos serveris</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Esminiai</span>"
@@ -5535,25 +5430,27 @@ msgstr "<span weight=\"bold\">Laikas</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Darbo savaitė</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Pritaikyti dienos šviesos ta_upymo laikui"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Diena _baigiasi:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Vaizdavimas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:586
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Laisvas/užsiėmęs"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5563,13 +5460,13 @@ msgstr ""
 "Valandos\n"
 "Dienos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5587,227 +5484,227 @@ msgstr ""
 "Šeštadienis\n"
 "Sekmadienis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Pasirinkite spalvą"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "S_ek"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Select the calendars for alarm notification"
 msgstr "Pasirinkite kalendorius perspėjimų rodymui"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Sh_ow a reminder"
 msgstr "R_odyti priminimą"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Show week _numbers in date navigator"
 msgstr "Rodyti savaičių _numerius datos navigatoriuje"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_asks due today:"
 msgstr "Ši_andienos užduotis:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "T_hu"
 msgstr "_Ket"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Template:"
 msgstr "Šablonas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Laiko _juosta:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Time format:"
 msgstr "Laiko formatas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Wee_k starts on:"
 msgstr "Sa_vaitė prasideda:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Work days:"
 msgstr "Darbo dienos:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_12 hour (AM/PM)"
 msgstr "_12 valandų (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_24 hour"
 msgstr "_24 valandų"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Ask for confirmation when deleting items"
 msgstr "P_aprašyti patvirtinimo trinant elementus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Compress weekends in month view"
 msgstr "_Suspausti savaitgalius mėnesio rodinyje"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Day begins:"
 msgstr "_Diena prasideda:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Fri"
 msgstr "Pe_n"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Hide completed tasks after"
 msgstr "_Paslėpti užbaigtas užduotis po"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Mon"
 msgstr "_Pir"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Overdue tasks:"
 msgstr "_Praleistos užduotys:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Sat"
 msgstr "Š_eš"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Show appointment end times in week and month view"
 msgstr "_Rodyti paskyrimų pabaigos laikus savaitės ir mėnesio rodiniuose"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Time divisions:"
 msgstr "Laiko a_tkarpos:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Tue"
 msgstr "_Ant"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Wed"
 msgstr "_Tre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "before every appointment"
 msgstr "prieš kiekvieną paskyrimą"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr ""
-"_Kopijuoti kalendoriaus turinį į vietinį kompiuterį darbui neprisijungus"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Nukopijuoti aplanko turinį į nuosavą kompiuterį darbui neprisijungus"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "K_opijuoti užduočių sąrašą į vietinį kompiuterį darbui neprisijungus"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Nukopijuoti užduočių sąrašą į nuosavą kompiuterį darbui neprisijungus"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr ""
-"Ko_pijuoti raštelių sąrašo turinį į vietinį kompiuterį darbui neprisijungus"
+"Nukopijuoti raštelių sąrašo turinį į savo kompiuterį darbui neprisijungus"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Sp_alva:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
 msgstr "Užduočių sąrašas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memo List"
-msgstr "Raštelių sąrašas"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
+msgstr "Užrašų sąrašas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Kalendoriaus savybės"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Naujas kalendorius"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Užduočių sąrašo savybės"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
-msgstr "Naujas raštelių sąrašas"
+msgstr "Naujas užrašų sąrašas"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Pridėti kalendorių"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Pridėti užduočių sąrašą"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Pridėti kalendorių"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Pridėti užduočių sąrašą"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "_Atnaujinti:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5882,15 +5779,15 @@ msgstr " (Iki "
 msgid "Due "
 msgstr "Iki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Prisegtas laiškas - %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:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5898,14 +5795,14 @@ msgstr[0] "Prisegtas laiškas"
 msgstr[1] "%d prisegti laiškai"
 msgstr[2] "%d prisegtų laiškų"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Perkelti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Atšaukti _tempimą"
 
@@ -5913,7 +5810,7 @@ msgstr "Atšaukti _tempimą"
 msgid "Could not update object"
 msgstr "Nepavyko atnaujinti objekto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5926,97 +5823,97 @@ msgid "Hide Attachment _Bar"
 msgstr "Paslėpti prie_dų juostą"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Rodyti prie_dų juostą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Pašalinti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Savybės"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Prisegti priedą..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Rodyti priedus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Norėdami perjungti priedų skydelio matomumą paspauskite tarpą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Keisti paskyrimą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Susitikimas - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Paskyrimas -- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Priskirta užduotis - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Užduotis -- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnalo įrašas -- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Nėra apžvalgos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:310
 msgid "attachment"
 msgstr "priedas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Pakeitimai padaryti šiame punkte bus prarasti, jei atsiras atnaujinimai"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Nepavyko paleisti turimos versijos!"
 
@@ -6032,10 +5929,6 @@ msgstr "Nepavyko atverti paskirties vietos"
 msgid "Destination is read only"
 msgstr "Paskirties vieta yra tik skaitoma"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Ištrinti šį elementą iš visų kitų gavėjų dėžučių?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Dėl corba klaidos nepavyko ištrinti įvykio"
@@ -6097,11 +5990,11 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "Įvesti, kam pavedama"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:559
 msgid "Appoint_ment"
 msgstr "Paskyri_mas"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:563
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Pasikartojimas"
@@ -6112,9 +6005,8 @@ msgid "This event has alarms"
 msgstr "Šiam įvykiui yra perspėjimas"
 
 #: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../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 "Or_ganizatorius:"
@@ -6136,7 +6028,6 @@ msgid "Event with no end date"
 msgstr "Įvykis be pabaigos datos"
 
 #: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Klaidinga pradžios data"
@@ -6154,13 +6045,11 @@ msgid "End time is wrong"
 msgstr "Klaidingas pabaigos laikas"
 
 #: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Pasirinktas organizatorius nebeturi sąskaitos."
 
 #: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Organizatorius yra būtinas."
@@ -6209,19 +6098,24 @@ msgid "Customize"
 msgstr "Prisitaikyti"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: ../calendar/gui/dialogs/event-page.c:2963
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1691
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1507 ../widgets/misc/e-dateedit.c:1721
 msgid "None"
 msgstr "Nėra"
 
@@ -6238,7 +6132,8 @@ msgid "15 minutes before appointment"
 msgstr "15 minučių prieš paskyrimą"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "D_alyviai..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6259,12 +6154,16 @@ msgstr "A_prašymas:"
 msgid "Event Description"
 msgstr "Įvykio aprašymas"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+msgid "Locat_ion:"
+msgstr "V_ieta:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "S_uvestinė:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Alarm"
 msgstr "_Perspėjimas"
 
@@ -6332,7 +6231,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Būsena"
 
@@ -6353,81 +6252,62 @@ msgid "Organizer"
 msgstr "Organizatorius"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizatorius:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
 msgid "Memo"
-msgstr "Raštelis"
+msgstr "Užrašas"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "Nepavyko atverti „%s“ raštelių."
-
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "Kam"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "P_radžios data:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "S_uvestinė"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-msgid "T_o:"
-msgstr "_Kam:"
+msgstr "Nepavyko atverti „%s“ užrašų."
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupė:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
-msgstr "_Raštelio turinys:"
+msgstr "_Užrašo turinys:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendoriaus nustatymai</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Sukurti naują kalendorių"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Kalendoriaus grupė"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Kalendoriaus vieta"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Kalendoriaus pavadinimas"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Užduočių sąrašo nustatymai</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Sukurti naują užduočių sąrašą"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Užduočių sąrašo grupė"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Užduočių sąrašo vardas"
 
@@ -6573,7 +6453,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Išimtys</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>Peržiūra</b>"
 
@@ -6638,15 +6518,15 @@ msgstr "<span weight=\"bold\">Būsena</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Užbaigta"
 
 #: ../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-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Aukštas"
 
@@ -6655,20 +6535,20 @@ msgstr "Aukštas"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2379
 msgid "In Progress"
 msgstr "Vykdoma"
 
 #: ../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-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Žemas"
 
 #: ../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-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normalus"
 
@@ -6676,7 +6556,7 @@ msgstr "Normalus"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2376
 msgid "Not Started"
 msgstr "Nepradėta"
 
@@ -6689,7 +6569,7 @@ msgid "Stat_us:"
 msgstr "Būs_ena:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Nenurodyta"
 
@@ -6698,7 +6578,7 @@ msgid "_Date completed:"
 msgstr "Pabaigimo _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:31
 msgid "_Priority:"
 msgstr "_Svarbumas:"
 
@@ -6724,10 +6604,6 @@ msgstr "Galutinio termino data klaidinga"
 msgid "Unable to open tasks in '%s'."
 msgstr "Nepavyko atverti „%s“ užduočių."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "D_alyviai..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Kategor_ijos..."
@@ -6736,6 +6612,10 @@ msgstr "Kategor_ijos..."
 msgid "Or_ganiser:"
 msgstr "Or_ganizatorius:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "P_radžios data:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Laiko juosta:"
@@ -6744,46 +6624,46 @@ msgstr "Laiko juosta:"
 msgid "_Due date:"
 msgstr "_Reikia iki:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Laisvas/užsiėmęs k_alendoriai</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Publikacijų dažnumas</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>Pub_likacijų vieta</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Laisvas/užsiėmęs skelbimo nustatymai"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "Kas_dien"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Savarankiškai"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_Slaptažodis:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "P_risiminti slaptažodį"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "Naudotojo _vardas:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "Kas _savaitę"
 
@@ -6866,42 +6746,35 @@ msgid "%s for an unknown trigger type"
 msgstr "%s yra skirtas nežinomam daviklio tipui"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Spragtelėkite norėdami atverti %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
-msgid "Untitled"
-msgstr "Bevardė"
-
-#: ../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
-msgid "Start Date:"
-msgstr "Pradžios data:"
-
-#: ../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
-msgid "Description:"
-msgstr "Aprašymas:"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "Užrašas:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Tinklalapis:"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Bevardė"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Apžvalga:"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "Pradžios data:"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Kada reikia:"
@@ -6911,7 +6784,7 @@ msgstr "Kada reikia:"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:907
 msgid "Status:"
 msgstr "Būsena:"
 
@@ -6919,18 +6792,26 @@ msgstr "Būsena:"
 msgid "Priority:"
 msgstr "Prioritetas:"
 
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Aprašymas:"
+
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Viešas"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Asmeniškas"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Konfidencialus"
 
@@ -6939,25 +6820,24 @@ msgid "End Date"
 msgstr "Pabaigos data"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "Pradžios 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:5 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Apžvalga"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Laisvas"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Užimtas"
 
@@ -6971,17 +6851,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Taip"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ne"
@@ -6992,21 +6872,21 @@ msgstr "Ne"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1716
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:669
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Pasikartojantis"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Priskirtas"
 
@@ -7014,7 +6894,7 @@ msgstr "Priskirtas"
 msgid "Save As..."
 msgstr "Išsaugoti kaip..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Pasirinkite aplanką, kuriame išsaugoti pasirinktus priedus..."
 
@@ -7023,9 +6903,9 @@ msgstr "Pasirinkite aplanką, kuriame išsaugoti pasirinktus priedus..."
 msgid "untitled_image.%s"
 msgstr "neįvardintas_paveikslėlis.%s"
 
-#: ../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:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Iš_saugoti kaip..."
 
@@ -7043,79 +6923,74 @@ msgstr "_Išsaugoti pažymėtus"
 msgid "Open in %s..."
 msgstr "Atverti su %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Trinami pasirinkti objektai"
 
-#: ../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:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Atnaujinami objektai"
 
-#: ../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:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Išsaugoti kaip..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Nauja _užduotis"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Atverti Tinklapį"
 
-#: ../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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7123,52 +6998,44 @@ msgstr "Atverti Tinklapį"
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: ../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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iškirpti"
 
-#: ../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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Į_dėti"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Priskirti užduotį"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Persiųsti kaip iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
-msgstr "_Pažymėti kaip pabaigtą"
+msgstr "_Pažymėti užbaigta"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pažymėti Pasirinktas Užduotis kaip Užbaigtas"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Pažymėti kaip nebaigtą"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Pažymėti pasirinktas užduotis kaip nebaigtas"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Ištrinti pažymėtas užduotis"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Norėdami pridėti užduotį, spauskite čia"
@@ -7178,7 +7045,7 @@ msgstr "Norėdami pridėti užduotį, spauskite čia"
 msgid "% Complete"
 msgstr "% baigta"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Užbaigta"
 
@@ -7203,101 +7070,105 @@ msgstr "Pradžios data"
 msgid "Task sort"
 msgstr "Užduočių rikiavimas"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Perkeliami elementai"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopijuojami elementai"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Naujas į_vykis..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos įvykis"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Naujas _susitikimas"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Nauja _užduotis"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Esamas vaizdas"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Pažymėti šian_dieną"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "Pa_sirinkite datą..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_juoti į kalendorių..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Per_kelti į kalendorių..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Paskirti susitikimą..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Suplanuoti susitikimą..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Persiųsti kaip iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Atsakyti"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Padaryti šį pasitaikymą perkelia_mu"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Ištrinti _visus pasitaikymus"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizatorius: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizatorius: %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:2053 ../calendar/gui/print.c:2349
 #, c-format
 msgid "Location: %s"
 msgstr "Vieta: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Laikas: %s %s"
@@ -7327,7 +7198,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minučių padalos"
@@ -7338,21 +7209,19 @@ msgstr "%02i minučių padalos"
 #. 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:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1538
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:858
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:860
 msgid "pm"
 msgstr " "
@@ -7451,12 +7320,10 @@ msgstr "iCalendar klaida"
 
 #: ../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:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Nežinomas asmuo"
 
@@ -7471,22 +7338,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Accepted"
 msgstr "Priimtas"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Tentatively Accepted"
 msgstr "Negalutinis sutikimas"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Declined"
 msgstr "Atmestas"
 
@@ -7707,7 +7574,7 @@ msgid "Attendee status updated\n"
 msgstr "Dalyvio būsena atnaujinta\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1080
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Dalyvio statusas negali būti atnaujintas, nes pasirinktas elementas "
@@ -7756,35 +7623,48 @@ msgid "Send Latest Information"
 msgstr "Nusiųsti Paskutinę Informaciją"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--kam--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalendoriaus žinutė"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Įkeliamas kalendorius"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Įkeliamas kalendorius..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Serverio žinutė:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "pabaigos-data"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "pradžios-data"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
@@ -7803,65 +7683,65 @@ msgid "Resources"
 msgstr "Resursai"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individas"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupė"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Resursas"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Kambarys"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Pirmininkas"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Būtinas dalyvis"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Nebūtinas dalyvis"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ne dalyvis"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Reikalauja veiksmo"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Negalutinis"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1713
 msgid "Delegated"
 msgstr "Pavestas"
 
@@ -7870,14 +7750,14 @@ msgstr "Pavestas"
 msgid "Attendee                          "
 msgstr "Dalyvis"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Vykdomas"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y m. %B %e"
 
@@ -7885,95 +7765,95 @@ msgstr "%A, %Y m. %B %e"
 #. 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:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 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:450
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Nesu darbe"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Nėra informacijos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "D_alyviai..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "N_ustatymai"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Rodyti tik _darbo valandas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Rodyti _atitrauktą"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Atnaujinti laisvas/užimtas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Automatiškai parinkti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Visi žmonės ir resursai"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Visi ž_monės ir vienas resursas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Būtini žmonės"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Būtini žmonės ir _vienas resursas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Pradžios laikas:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "P_abaigos laikas:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
-msgstr "_Ištrinti pažymėtus raštelius"
+msgstr "_Ištrinti pažymėtus užrašus"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
-msgstr "Spragtelėkite norėdami pridėti raštelį"
+msgstr "Spragtelėkite norėdami pridėti užrašą"
 
 #: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Memo sort"
-msgstr "Raštelių rūšiavimas"
+msgstr "Užrašų rūšiavimas"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7984,14 +7864,14 @@ msgstr ""
 
 #: ../calendar/gui/e-memos.c:772
 msgid "Loading memos"
-msgstr "Įkeliami rašteliai"
+msgstr "Įkeliami užrašai"
 
 #: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
-msgstr "Atveriami %s rašteliai"
+msgstr "Atveriami %s užrašai"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Trinami pasirinkti objektai..."
 
@@ -8000,20 +7880,20 @@ msgstr "Trinami pasirinkti objektai..."
 msgid "Enter the password for %s"
 msgstr "Įveskite „%s“ slaptažodį"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Įkeliamos užduotys"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos užduotys %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Užbaigiamos užduotys..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Išvaloma"
 
@@ -8024,48 +7904,42 @@ msgstr "Pasirinkite laiko juostą"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../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:329 ../calendar/gui/print.c:1522
 msgid "%d %B"
 msgstr "%B %d"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Atnaujinama užklausa"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "_Kitoks vaizdas"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "Iš_saugoti kitokį vaizdą"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Nurodyti vaizdus..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Įkeliami %s paskyrimai"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Įkeliamos %s užduotys"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, c-format
-msgid "Loading memos at %s"
-msgstr "Įkeliami %s rašteliai"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
-msgstr "Atveriama %s"
+msgstr "Atidaroma %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Išvaloma"
 
@@ -8179,19 +8053,15 @@ msgstr "iCalendar informacija"
 msgid "You must be an attendee of the event."
 msgstr "Jūs turite būti įvykio dalyvis."
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "_Naujas raštelių sąrašas"
-
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
-msgstr[0] "%d raštelis"
-msgstr[1] "%d rašteliai"
-msgstr[2] "%d raštelių"
+msgstr[0] "%d užrašas"
+msgstr[1] "%d užrašai"
+msgstr[2] "%d užrašų"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8200,56 +8070,44 @@ msgstr[0] ", pasirinkta %d"
 msgstr[1] ", pasirinkta %d"
 msgstr[2] ", pasirinkta %d"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "Raštelių atnaujinti nepavyko."
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Nepavyko įvykių ir susitikimų kūrimui atverti raštelių sąrašo „%s“"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "Nėra kalendoriaus, kuriame galima būtų kurti raštelius"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Raštelių šaltinio parinkiklis"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Naujas raštelis"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
 msgstr "_Raštelis"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Sukurti naują raštelį"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "Naujas viešinamas raštelis"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "_Viešinamas raštelis"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "Sukurti naują viešinamą raštelį"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Naujas raštelių sąrašas"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
-msgstr "Raštelių _sąrašas"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
+msgstr "Rašt_elių sąrašas"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Sukurti naują raštelių sąrašą"
 
@@ -8462,7 +8320,7 @@ msgstr "%a %b %d"
 
 #: ../calendar/gui/print.c:1962
 msgid "%a %d %Y"
-msgstr "%a %d, %Y"
+msgstr "%a %d %Y"
 
 #: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
 #: ../calendar/gui/print.c:1969
@@ -8589,14 +8447,14 @@ msgid "New task list"
 msgstr "Naujas užduočių sąrašas"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "Užduoč_ių sąrašas"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Sukurti naują užduočių sąrašą"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8608,11 +8466,11 @@ msgstr ""
 "\n"
 "Tikrai ištrinti šias užduotis?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Daugiau nebeklausti."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Spausdinti užduotis"
 
@@ -9188,7 +9046,7 @@ msgid "America/Nassau"
 msgstr "Amerika/Nasau"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerika/Niujorkas"
 
@@ -10189,25 +10047,25 @@ msgid "Pacific/Yap"
 msgstr "Didysis_vandenynas/Japas"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
+#: ../widgets/misc/e-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
+#: ../widgets/misc/e-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
+#: ../widgets/misc/e-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:974
 msgid "Attachment Bar"
 msgstr "Priedų juosta"
 
@@ -10215,43 +10073,43 @@ msgstr "Priedų juosta"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:242 ../widgets/misc/e-attachment.c:258
+#: ../widgets/misc/e-attachment.c:446 ../widgets/misc/e-attachment.c:462
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nepavyko prisegti rinkmenos %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:250 ../widgets/misc/e-attachment.c:454
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Negaliu prisegti rinkmenos %s: ne paprasta rinkmena"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Priedo savybės"
 
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Rinkmenos vardas:"
 
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME tipas:"
 
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Paskirties vieta"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Pasirinkite aplanką, kuriame bus patalpintas laiškas."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Paspausk čia, jei reikia adresų knygelės"
 
@@ -10262,45 +10120,45 @@ msgstr "Paspausk čia, jei reikia adresų knygelės"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Atsakyti-kam:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "Nu_o:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Tema:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Kam:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Įveskite laiško gavėjus"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Įveskite adresus, kuriais bus išsiųsta šio laiško kopiją"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10311,15 +10169,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Skelbti į:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Norėdami pasirinkti aplankus, kuriuose skelbti, spauskite čia"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Skelbti į:"
 
@@ -10327,18 +10185,18 @@ msgstr "Skelbti į:"
 msgid "A_ttach"
 msgstr "Prise_gti"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Prisegti priedą"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Nepavyko pasirašyti išsiunčiamo laiško: Nenustatytas šio abonento parašo "
 "sertifikatas"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10346,52 +10204,52 @@ msgstr ""
 "Nepavyko užšifruoti išsiunčiamo laiško: Nenustatytas šio abonento šifravimo "
 "sertifikatas"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Paslėpti prie_dų juostą"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Rodyti prie_dų juostą"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Nežinomas priežastis"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Nepavyko atverti rinkmenos."
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti laiško iš redaktoriaus"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Neupavadintas laiškas"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Atverti rinkmeną"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Autogeneruotas"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Pa_rašas:"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Rašyti laišką"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10541,7 +10399,7 @@ msgstr "Iš_saugoti laišką"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10562,7 +10420,6 @@ msgid "calendar information"
 msgstr "kalendoriaus informacija"
 
 #: ../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"
@@ -10573,17 +10430,14 @@ msgstr ""
 "Ar norite ją pakeisti į „Darbe“? "
 
 #: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Nebuvimo darbe žinutė:</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Būklė:</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"
@@ -10593,12 +10447,10 @@ msgstr ""
 "atsiųs Jums laišką tuo metu, kai Jūsų nebus darbe.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr "Manęs šiuo metu nėra darbe"
 
 #: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Manęs šiuo metu nėra darbe"
 
@@ -10607,24 +10459,26 @@ msgid "No, Do not Change Status"
 msgstr "Ne, nepakeisti būsenos"
 
 #: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
 msgstr "Nebuvimo darbe pagalbininkas"
 
 #: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
 msgstr "Taip, pakeisti būseną"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Gaunamas paštas</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Siunčiamas paštas:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10634,31 +10488,31 @@ msgstr ""
 "<small>Šis puslapis valdo Evolution darbą su laiškų perskaitymo pranešimais "
 "bei užklausų apie skaitymą siuntimus.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Visada išsiųsti perskaitymo patvirtinimą"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Paklausti ar galima siųsti perskaitymo pranešimą"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Niekada nesiųsti perskaitymo pranešimo"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Skaitymo pranešimai"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Prašyti skaitymo patvirtinimo kiekviename siunčiamame laiške"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Jei žinutė yra siųsta į susirašinėjimo sąrašą, o ne asmeniškai"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10666,7 +10520,7 @@ msgstr ""
 "Ką Evolution turi daryti Jums gavus laišką su prašymu patvirtinti "
 "perskaitymą?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10674,28 +10528,28 @@ msgstr ""
 "Rinkmena tokiu vardu jau yra.\n"
 "Perrašyti ją?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Perrašyti rinkmeną."
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution klaida"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution įspėjimas"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution informacija"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution užklausa"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Vidinė klaida, užklausta nežinoma klaida „%s“"
@@ -10797,24 +10651,24 @@ msgstr "%Y %m %d"
 msgid "Select a time to compare against"
 msgstr "Pasirinkit laiką, su kuriuo palyginti"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Pasirinkite rinkmeną"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Svarbus"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Darbai"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Vėliau"
 
@@ -10863,11 +10717,11 @@ msgid "Include threads"
 msgstr "Įtraukti gijas"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Gaunamas"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Išsiunčiamas"
 
@@ -10963,7 +10817,7 @@ msgstr " "
 msgid "months"
 msgstr "mėnesių"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "sekundžių"
 
@@ -11036,22 +10890,22 @@ msgstr "Evolution pašto rašymo nustatymų valdymas"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution pašto nustatymų valdymas"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Paštas"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Pašto abonementai"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Pašto nustatymai"
 
@@ -11078,7 +10932,7 @@ msgstr ""
 "ir jeigu su ja sutinkate, pažymėkite paukščiuką\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Pasirinkite aplanką"
 
@@ -11086,11 +10940,11 @@ msgstr "Pasirinkite aplanką"
 msgid "Ask for each message"
 msgstr "Paklausti kiekvienam laiškui"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Asmenybė"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Pašto gavimas"
 
@@ -11098,11 +10952,11 @@ msgstr "Pašto gavimas"
 msgid "Automatically check for _new mail every"
 msgstr "Automatiškai tinkrinti _naujo pašto kas"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Pašto siuntimas"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Numatytieji"
 
@@ -11121,11 +10975,11 @@ msgstr "Gavimo nustatymai"
 msgid "Checking for New Mail"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Abonementų tvarkyklė"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution abonementų padėjėjas"
 
@@ -11145,22 +10999,22 @@ msgid "[Default]"
 msgstr "[Numatytasis]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Įjungta"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Abonemento vardas"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protokolas"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Bevardis"
 
@@ -11330,7 +11184,7 @@ msgstr "nėra"
 msgid "is not Flagged"
 msgstr "nėra pažymėtas"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Šlamštas"
@@ -11339,7 +11193,7 @@ msgstr "Šlamštas"
 msgid "Junk Test"
 msgstr "Šlamšto testas"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Užrašas"
 
@@ -11383,7 +11237,7 @@ msgstr "Groti garsą"
 msgid "Read"
 msgstr "Skaitytas"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Gavėjai"
 
@@ -11411,11 +11265,11 @@ msgstr "grąžina reikšmę mažesnę už"
 msgid "Run Program"
 msgstr "Paleisti programą"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Įvertis"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Siuntėjas"
 
@@ -11447,11 +11301,11 @@ msgstr "prasideda su"
 msgid "Stop Processing"
 msgstr "Nutraukti filtravimą"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Tema"
@@ -11465,42 +11319,10 @@ msgstr "Atšaukti būseną"
 msgid "<b>Then</b>"
 msgstr "<b>Tada</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Suku_rti paieškos aplangą pagal paiešką..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Visi laiškai"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Neskaityti laiškai"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Be užrašo"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Perskaityti laiškai"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Naujausi laiškai"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Paskutinių 5 dienų laiškai"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Laiškai su priedais"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Laiškai ne šlamštas"
-
 #. 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
@@ -11519,7 +11341,7 @@ msgstr[1] "Neskaitytos žinutės:"
 msgstr[2] "Neskaitytų žinučių:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Aplanko savybės"
 
@@ -11536,7 +11358,7 @@ msgid "Folder _name:"
 msgstr "Aplanko _vardas:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Paieškos aplankai"
 
@@ -11551,7 +11373,7 @@ msgstr "Juodraščiai"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Gauti laiškai"
 
@@ -11567,77 +11389,77 @@ msgstr "Išsiųsti"
 msgid "Loading..."
 msgstr "Įkeliama..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Pašto aplankų medis"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Perkialiamas aplankas %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopijuojamas aplankas %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Laiškai perkeliami į aplanką %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Laiškai kopijuojami į aplanką %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nepavyko perkelti žinutės(čių) į aukščiausią aukštą"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopijuoti į aplanką"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Perkelti į aplanką"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankai, esantys „%s“"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "R_odymas"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Atverti _naujame lange"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Kopijuoti..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Perkelti..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Naujas aplankas..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Išt_uštinti šiukšlinę"
 
@@ -11646,14 +11468,13 @@ msgstr "Išt_uštinti šiukšlinę"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopijuojama „%s“ į „%s“"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Pasirinkite aplanką"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opijuoti"
 
@@ -11675,168 +11496,158 @@ msgstr "Sukurti aplanką"
 msgid "Specify where to create the folder:"
 msgstr "Nurodykite, kur sukurti aplanką:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "P_ersiųsti"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Redaguoti kaip naują laišką..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "S_ugrąžinti"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Pe_rkelti į aplanką..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Pažymėti s_kaitytu"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Pažymėti nes_kaitytu"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Pažymėti svarb_iu"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "Pažymėti kaip nes_varbų"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Pažymėti kaip š_lamštą"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Pažymėti kaip _ne šlamštą"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Pažymėti _tęsiniui..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Užrašas"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Nėra"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Pažymėti pabai_gtu"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Atša_ukti pažymėjimą"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Sukur_ti taisyklę iš žinutės"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Paieškos aplankas pagal _temą"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Paieškos aplankas pagal siu_ntėją"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Paieškos aplankas pagal _gavėjus"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Paieškos aplankas pagal _konferenciją"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtruoti pagal t_emą"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtruoti pagal si_untėją"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtruoti pagal ga_vėjus"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtruoti pagal k_onferenciją"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Numatytasis"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Spausdinti laišką"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Nepavyko gauti laiško"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Kopijuoti nuorodą"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Sukurti _paieškos aplanką"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Iš šio adreso"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "Ši_uo adresu"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Norėdami išsiųsti %s, paspauskite čia"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Norėdami paslėpti/parodyti adresus, paspauskite čia"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:503
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Atitinka: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "Rasti:"
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "_Atitikti registrą"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Nepasirašytas"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11844,11 +11655,11 @@ msgstr ""
 "Šis laiškas nepasirašytas. Nėra jokių garantijų, kad šis laiškas yra "
 "autentiškas."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Tvarkingas parašas"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11856,11 +11667,11 @@ msgstr ""
 "Šis laiškas yra pasirašytas ir yra geras, kas reiškia, jog šis laiškas yra "
 "autentiškas."
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Blogas parašas"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11868,11 +11679,11 @@ msgstr ""
 "Laiško parašas negali būti patikrintas, laiškas galėjo būti pakeistas "
 "persiuntimo metu."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Parašas geras, negalima patikrinti siuntėjo"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11880,11 +11691,11 @@ msgstr ""
 "Laiškas pasirašytas su tvarkingu parašu, bet siuntėjas negali būti "
 "patikrintas."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Neužšifruotas"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11892,11 +11703,11 @@ msgstr ""
 "Šis laiškas neužšifruotas. Jo turinys gali būti perskaitytas siuntimo "
 "Internetu metu."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Silpnai šifruotas"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11906,11 +11717,11 @@ msgstr ""
 "žmogui būtų sunku, bet įmanoma pamatyti šio laiško turinį per pakankamai "
 "trumpą laiko tarpą."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Užšifruotas"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11918,11 +11729,11 @@ msgstr ""
 "Šis laiškas yra užšifruotas. Įsilaužėliui būtų sunku perskaityti laiško "
 "turinį."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Stipriai užšifruotas"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11932,73 +11743,73 @@ msgstr ""
 "žmogui būtų labai sunku pamatyti šio laiško turinį neskiriant iššifravimui "
 "daug laiko."
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Peržiūrėti sertifikatą"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Negalima peržiūrėti šio sertifikato"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Baigta %Y %B %d, %k:%M"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Pavėluotos:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "pagal %Y %B %d, %k:%M"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "Žiūrėti _kontekste"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Slėpti"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Atitikti plotį"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Rodyti _originalų dydį"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priedas"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Pasirinkite aplanką, kuriame išsaugoti visus priedus..."
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "Iš_saugoti pasirinktus..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
 msgstr[0] "%d pri_edas"
 msgstr[1] "%d pri_edai"
 msgstr[2] "%d pri_edų"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "Išs_augoti"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Išs_augoti visus"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Nėra priedų"
 
@@ -12012,88 +11823,94 @@ msgstr "Puslapis %d iš %d"
 msgid "Retrieving `%s'"
 msgstr "Gaunama „%s“"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Parašas tvarkingas, bet negalima patikrinti siuntėjo"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota išorinio karkaso dalis."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodyklė į FTP svetainę (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Rodyklė į vietinę rinkmeną (%s), galiojanti svetainėje „%s“"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodyklė į vietinę rinkmeną (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodyklė į nutolusius duomenis (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formuojamas laiškas"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Nuo"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kam"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Pašto programa"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Naujienų grupės"
@@ -12143,7 +11960,7 @@ msgstr "Kartą per savaitę"
 msgid "Once per month"
 msgstr "Kartą per mėnesį"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12155,47 +11972,47 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nepavyko sukurti naujo aplanko: „%s“: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Nepavyko nukopijuoti aplanko „%s„ į %s: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Skanavimas dėl naujų pašto dėžutčių, esančių „%s“, nepavyko: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nepavyko atverti senų POP keep-on-server duomenų „%s“: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nepavyko sukurti POP3 keep-on-server duomenų aplanko „%s“: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nepavyko nukopijuoti POP3 keep-on-server duomenų „%s“: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nepavyko sukurti vietinio pašto kaupo „%s“: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Nepavyko sukurti vietinių pašto aplankų esančių „%s“: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12212,6 +12029,10 @@ msgstr "_Atsakyti siuntėjui"
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Atverti nu_orodą naršyklėje"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Siųsti naują laišką adresatui..."
@@ -12224,45 +12045,45 @@ msgstr "Įtr_aukti į adresų knygą"
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ši saugykla nepalaiko užsakymų arba jie yra neįjungti."
 
-#: ../mail/em-subscribe-editor.c:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Užsakytos"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Aplankas"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Prašom pasirinkti serverį."
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Nepasirinktas joks serveris"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Kitą kartą neberodyti šios žinutės."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Laiškų filtrai"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "laiškas"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Išsaugoti laišką..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Išsaugoti adresą"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Laiškai nuo %s"
@@ -12271,7 +12092,7 @@ msgstr "Laiškai nuo %s"
 msgid "Search _Folders"
 msgstr "Paieškos _aplankai"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Paieškos aplanko šaltinis"
 
@@ -12304,110 +12125,83 @@ msgid "Composer Window default width"
 msgstr "Rašymo lango numatytasis plotis"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Suspausti adresų rodymą TO/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Suspausti adresų rodymą TO/CC/BCC iki skaičiaus nurodyto address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Koduotė, kuri yra naudojama kuriant laiškus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Koduotė, kuri yra naudojama kuriant laiškus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Koduotė, kuri yra naudojama skaitant laiškus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Koduotė, kuri yra naudojama skaitant laiškus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Numatytasis persiuntimo stilius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Numatytasis rašymo lango aukštis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Numatytasis laiško lango aukštis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Numatytasis užsisakymo dialogo aukštis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Numatytasis atsakymų stilius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Numatytasis rašymo lango plotis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Numatytasis laiško lango plotis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Numatytasis užsisakymo dialogo plotis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Rodyti rašymo klaidas laiško kūrimo metu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Išeinant ištuštinti šiukšlių aplankus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Išvalyti visus šiukšlių aplankus išeinant iš Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Įjungti žymeklio veikseną, kad skaitant laišką būtų galima matyti žymeklį."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Įjungti arba išjungti rinkimo priekyje paieškos funkciją"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Įjungti šoninio skydelio paieškos funkciją, kad galėtumėte pradėti "
-"interaktyvią paiešką įvedę tekstą. Naudokite tai norėdami lengvai surasti "
-"aplanką šoniniame skydelyje tiesiog įvedę jo pavadinimą ir pasirinkimas "
-"automatiškai peršoka į tą aplanką."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Perjungia žymeklio veikseną"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Laiškų sąrašo skydelio aukštis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Laiškų sąrašo skydelio aukštis."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12415,13 +12209,7 @@ msgstr ""
 "Jeigu naudotojas bando tuo pačiu metu atverti 10 ar daugiau laiškų, "
 "paklausti jo ar jis tikrai nori tai padaryti."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "Jeigu „Peržiūros“ polangis įjungtas, rodyti jį šone, o ne vertikaliai"
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12431,27 +12219,23 @@ msgstr ""
 "peržiūrėti gali būti naudojamas numatytasis bonobo komponentas, susietas su "
 "atitinkamu tipu GNOME mime tipų bazėje."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Išjungia/įjungia paklausimą pažymint keletą laiškų."
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Kada paskutinį kartą buvo išvalyta šiukšlinė"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Etikečių ir su jomis susijusių spalvų sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Priimtų licencijų sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Abonementų sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12459,11 +12243,11 @@ msgstr ""
 "Evolution pašto komponentui žinomų abonementų sąrašas. Šiame sąraše "
 "išvardintos sekos, nurodančios poaplankius esančius /apps/evolution/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Specialių antraščių sąrašas bei jų įjungimo parametrai."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12471,19 +12255,19 @@ msgstr ""
 "Evolution pašto komponentui žinomų žymių sąrašas. Sąraše yra eilutės, "
 "kuriose yra name:color, kur spalvai naudojama HTML šešioliktainis kodas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "mime tipų, tikrinamų tarp bonobo komponentų žiūryklių, sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Protokolų, kurių su kurių licencijomis buvo sutikta, sąrašas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Įkelti išorinius paveikslėlius įterptus per http į HTML laiškus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12493,99 +12277,95 @@ msgstr ""
 "yra: 0 - niekada neįkelti paveikslėlių iš Interneto, 1 - įkelti tik jei "
 "siuntėjas yra adresų knygoje, 2 - visada įkelti paveikslėlius iš Interneto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Registruoti filtro veiksmus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Registruoti filtrų veiksmus į nurodytą žurnalo rinkmeną."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Rinkmena registruojanti filtrų veiksmus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Rinkmena registruojanti filtrų veiksmus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Pažymėti kaip perskaityta po nurodyto laiko tarpo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Pažymėti kaip Perskaityta po nurodyto laiko tarpo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Laiško „Peržiūroje“ pažymėti citatas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Laiško „Peržiūroje“ pažymėti citatas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Žinutės lango numatytasis aukštis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Žinutės lango numatytasis plotis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Laiško rodymo stilius („normal“, „full headers“, „source“)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 "Mažiausias dienų skaičius tarp šiukšlinės išvalymų, kai uždaroma programa"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Mažiausias dienų tarpas tarp šiukšlinės išvalymų, kai uždaroma programa."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Naujo pašto perspėjimų garso rinkmena"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Perspėjimų apie naują paštą tipas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Adresų skaičius rodomas TO/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Užklausti, kai tema nenurodyta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Užklausti patvirtinimo, kai bandoma išvalyti aplanką."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Užklausti patvirtinimo, kai bandoma siųsti laišką nenurodžius temos."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Įspėti vartotoją išvalymo metu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Paklausti patvirtinimo, kai užpildomi tik bcc gavėjų laukai"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Paklausti patvirtinimo, kai bandoma išsiųsti 10 ar daugiau laiškų vienu metu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12593,104 +12373,90 @@ msgstr ""
 "Paklausti, kai siunčiamas HTML laiškas adresatams, kurie gali nenorėti gauti "
 "HTML formato laiškų."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
-"Paklausti patvirtinimo, kai bandoma siųsti HTML laišką to nenorintiems "
+"Užklausti patvirtinimo, kai bandoma siųsti HTML laišką to nenorintiems "
 "adresatams"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "Įspėti naudotoją pažymint keletą laiškų"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Atpažinti nuorodas tekste ir jas pakeisti."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Atpažinti šypsiukus tekste ir juos pakeisti paveikslėliais."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Tikrinti gaunamą paštą dėl galimo šlamšto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Jei nenurodoma kitaip, siųsti laiškus HTML formatu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Jei nenurodoma kitaip, siųsti laiškus HTML formatu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Įjungti animacijas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Leisti judėti prikabintiems animuotiems paveikslėliams."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Laiškų sąraše rodyti ištrintus laiškus (su perbraukimu)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Laiškų sąraše rodyti ištrintus laiškus"
 
-#: ../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 "Rodyti siuntėjo el. paštą laiškų kūrimo stulpelyje laiškų sąraše"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Rodyti siuntėjo el. paštą laiškų stulpelyje laiškų sąraše"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Grojama garso rinkmena, kai gaunamas naujas paštas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Nurodo, kokį perspėjimo apie naujus laiškus tipą vartotojas norėtų naudoti."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Rašybą tikrinti rašymo metu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Užsisakymo dialogo numatytasis aukštis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Užsisakymo dialogo numatytasis plotis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminalo šriftas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Kada paskutinį kartą buvo išvalyta šiukšlinė, dienomis nuo epochos."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Pašto išvedime naudojamas terminalo šriftas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Pašto išvedime naudojamas kintamo pločio šriftas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12701,111 +12467,99 @@ msgstr ""
 "išvedimo principus. XML struktūros formatas yra &lt;antraštė enabled&gt; - "
 "nustatykite enabled, jei antraštė turi būti išvedama peržiūrint laišką."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Tai nustato adresų rodomų numatytame laiškų sąrašo rodinyje skaičių, po "
-"kurio rodomas „...“."
-
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Gijomis suskirstytas laiškų sąrašas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Gijomis suskirstytas laiškų sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Kurti laiškų sąrašo gijas remiantis laiškų temomis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Laiko tarpas, skirtas pažymėti laiškus kaip perskaitytus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Laiko tarpas, skirtas pažymėti laiškus kaip perskaitytus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Numatytojo abonemento UID seka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Naudoti Spamassasin demoną ir klientą"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Naudoti Spamassassin demoną ir klientą (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Naudoti savo šriftus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Naudoti specialius šriftus rodant laiškus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Naudoti tik vietinius šlamšto testus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Naudoti tik vietinius šlamšto testus (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Naudoti šonas šalia šono arba platų išdėstymą"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Kintamo pločio šriftas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Rodyti/Bcc punktas yra įjungtas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Rodyti/Bcc meniu punktas yra įjungtas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Rodyti/Cc meniu punktas yra įjungtas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Rodyti/Cc meniu punktas yra įjungtas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Rodyti/Nuo meniu punktas yra įjungtas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Rodyti/Nuo meniu punktas yra įjungtas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Rodyti/SkirtasKam meniu punktas yra įjungtas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Rodyti/SkirtasKam meniu punktas yra įjungtas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Rodyti/AtsakytiKam meniu punktas yra įjungtas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Rodyti/AtsakytiKam meniu punktas yra įjungtas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12813,14 +12567,6 @@ msgstr ""
 "Ar naudoti gijų rūšiavimą pagal antraštes, jei laiškai neturi In-Reply-To "
 "arba Reference antraščių."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Laiškų sąrašo polangio plotis"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Laiškų sąrašo polangio plotis."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Importuojami Elm duomenys"
@@ -12852,15 +12598,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox formato aplankai"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importuojama „%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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Prašome palaukti"
 
@@ -13046,31 +12792,31 @@ msgstr[0] ", %d neskaitytas"
 msgstr[1] ", %d neskaityti"
 msgstr[2] ", %d neskaitytų"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Naujas elektroninis laiškas"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Laiškas"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Rašyti naują laišką"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Naujas pašto aplankas"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "Pašto _aplankas"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Sukurti naują pašto aplanką"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nepavyko atnaujinti pašto nustatymų ar aplankų."
 
@@ -13098,220 +12844,226 @@ msgstr "_Reikia padaryti"
 msgid "_Later"
 msgstr "_Vėliau"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " Patikrinti, koki_e tipai palaikomi"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL šiame Evolution variante yra nepalaikomas</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Paraša_i</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>Ka_lbos</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Filtras taps patikimesniu, bet kartu ir lėtesniu</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Abonemento informacija</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentikacijos tipas</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentikacija</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Laiškų rašymas</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfigūracija</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Numatytoji elgsena</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Ištrinti paštą</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Rodomos pašto a_ntraštės</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filtravimo nustatymai</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Užrašai ir spalvos</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Paveikslėlių įkėlimas</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Laiškų rodymas</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Laiško šriftai</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Laiško gavimo patvirtinimai</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Perspėjimai apie naujus laiškus</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Papildoma informacija</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Nustatymai</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Atspausdinti šriftai</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Būtina informacija</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Saugi MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Saugumas</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Išsiųsti laiškai ir juodraščiai</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serverio konfigūracija</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Abonemento tvarkymas"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Pridėti na_ują parašą..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Pridėti _scenarijų"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Naudojant šį abonementą vi_sada pasirašyti išsiunčiamus laiškus"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Siunčiant ši_fruotus laiškus, taip pat juos užšifruoti ir sau"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vi_sada siųsti kopija (cc) adresu:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Visada siųsti slaptą kopiją (_bcc) adresu:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Šifruojant visada pasi_tikėti raktais turimais Jūsų raktų rinkinyje"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Kai siunčiami šifruoti laiškai visada juos šifruoti _sau"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Pridėti originalų laišką"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Automat_iškai įterpti šypsiukų paveikslėlius"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltų (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltų (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "Pyptelėti _gavus naują laišką"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "_Koduotė:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Patikrinti, kokie tipai palaikomi"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Tikrinti _gaunamus laiškus dėl galimo šlamšto"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "_Tikrinti žinučių rašybą rašymo metu"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Tikrinti gaunamus laiškus dėl galimo šlamšto"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "Išv_alyti"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Išval_yti"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Klaidingų žodžių spalva:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Spalvos"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "Patvirtinti kai _išvalomas aplankas"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13326,134 +13078,134 @@ msgstr ""
 "\n"
 "Norėdami išsaugoti Jūsų nustatymus, paspauskite „Baigti“."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "Įp_rastas"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Numatytoji simbolių _koduotė:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Skaitmeniniu būdu pasirašyti išsiunčiamus laiškus (numatyta)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Necituoti pradinio laiško"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Baigta"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Juodraščių _aplankas:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "Įju_ngti"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Pašto abonementai"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "El. pašto _adresas:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Išeinan_t ištuštinti šiukšlių aplankus"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Ši_fravimo sertifikatas:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ši_fruoti išsiunčiamus laiškus (numatyta)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Fi_ksuoto pločio šriftas:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fi_ksuotas-plotis:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Šrifto savybės"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Rašyti laišką _HTML formatu"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "_Visas vardas:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML paštas"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Antraštės"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Paryškinti _citatas su "
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "Įtraukti _nuotolinius testus"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Viduje"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Kalbų lentelė"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Pašto nustatymai"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Laiškų antraščių lentelė"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Pašto dėžutės vieta"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Laiškų rašymas"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Pastaba: Jungiantis pirmą kartą Jus paprašys įvesti slaptažodį"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG ra_kto ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Groti garsinę rinkmeną, kai gaunami nauji laiškai"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13461,7 +13213,7 @@ msgstr ""
 "Prašau, žemiau įveskite šį abonementą aprašantį vardą.\n"
 "Šis vardas bus naudojamas tik vaizdavimo tikslais."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13470,7 +13222,7 @@ msgstr ""
 "gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto "
 "paslaugų tiekėjo."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13480,42 +13232,38 @@ msgstr ""
 "laukai žemiau gali likti tušti, nebent norėtumėte įtraukti šią informaciją "
 "Jūsų siunčiamame pašte."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Prašom pasirinkti iš žemiau esančių parinkčių"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Cituoti originalų laišką"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Prisi_minti šį slaptažodį"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "A_tsakyti-Kam:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Prisiminti šį sla_ptažodį"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "P_asirinkti..."
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_end message receipts:"
-msgstr "Siųsti laišk_o gavimo patvirtinimus:"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "S_tandartinis šriftas:"
@@ -13544,58 +13292,62 @@ msgstr "Pasirinkite HTML kintamo pločio šriftą spausdinimui"
 msgid "Select sound file"
 msgstr "Pasirinkite garsinę rinkmeną"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "Siųsti laiško gavimo patvirtinimus:"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Pašto siuntimas"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Išsiųstų _laiškų aplankas:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Pasirašo_mas sertifikatas:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "Par_ašas:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Parašai"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Parašų lentelė"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Nurodykite _rinkmenos vardą:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Rašybos tikrinimas"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "T_ipas: "
 
-#: ../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 ""
 "Pateiktas kalbų sąrašas galioja tik toms kalboms, kurių žodynai yra įdiegti."
 
-#: ../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"
@@ -13605,7 +13357,7 @@ msgstr ""
 "parašas. Nurodytas vardas bus naudojamas tik atvaizdavimo\n"
 "tikslais. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13613,15 +13365,15 @@ msgstr ""
 "Pasirinkite pavadinimą, kuriuo norėtumėte vadinti šį abonementą.\n"
 "Pavyzdžiui, „Darbas“ ar „Asmeniška“."
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Vartotojo _vardas:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Kint_amas-plotis:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13631,72 +13383,68 @@ msgstr ""
 "\n"
 "Norėdami pradėti, spauskite „Pirmyn“. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Pridėti parašą"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "Vis_ada įkelti paveikslėlius iš Interneto"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Neinformuoti apie naujų laiškų gavimą"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Nepasirašyti susitikimų užklausimų (dėl suderinamumo su Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "Pe_rsiuntimo stilius:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "Į_kelti paveikslėlius laiškuose iš kontaktų"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Padaryti šį abonementą numatytuoju"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "Pažy_mėti laiškus skaitytais po"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Niekada neįkelti paveikslėlių iš Interneto"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Kelias:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Paklausti, kai siunčiamas HTML laiškas adresatams, kurie nenori jų gauti"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Siunčiant laiškus su nenurodyta _tema, paklausti patvirtinimo"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Atsakymo stilius:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Scenarijus:"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "_Rodyti paveikslėlių animacijas"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Sutraukti Kam / Cc / Bcc antraštes iki "
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "Na_udoti saugią jungtį:"
@@ -13706,21 +13454,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "Na_udoti tokius šriftus kaip ir kitų programų"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "adresai"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "spalva"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "aprašymas"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Paieškos aplanko šaltiniai</b>"
@@ -13734,63 +13474,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Šifravimas</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Visi aktyvūs nutolę aplankai"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Visi vietiniai ir aktyvūs nutolę aplankai"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Visi vietiniai aplankai"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "_Skirti raidžių dydį"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Užbaigta"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "_Rasti:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Ieškoti laiške"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Pažymėti kaip tęsinį"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Aplankų užsisakymai"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Licencinė sutartis"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Niekas nepasirinkta"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "S_erveris:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Saugumo informacija"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Specifiniai aplankai"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13798,51 +13522,67 @@ msgstr ""
 "Laiškai, kuriuos Jūs pažymėjote kaip tęsinius, yra išvardinti žemiau.\n"
 "Pasirinkite tęsiniams galiojančius veiksmus iš „Žymių“ meniu."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Priimti licenciją"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Terminas iki:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Žymė:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Užsakyti"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_Pažymėkit čia, jeigu sutinkate su licencija"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Atsisakyti"
 
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "tik nurodyti aplankai"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "su visais aktyviais nutolusiais aplankais"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "su visais vietiniais aplankais"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Tikrinamas %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Filtruojamas aplankas"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Gaunamas paštas"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepavyko pritaikyti išeinančių filtrų: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13851,100 +13591,100 @@ msgstr ""
 "Nepavyko įterpti į %s: %s\n"
 "Įterpiama į vietinį „Išsiųstų laiškų“ aplanką."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepavyko įrašyti laiško į „Išsiųstų“ aplanką: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siunčiamas laiškas %d iš %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nepavyko išsiųsti %d iš %d"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Atšaukta."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Užbaigta."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Laiškas išsaugomas į aplanką"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Persiųsti laiškai"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Išvalomas ir saugomas abonementas „%s“"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Saugomas abonementas „%s“"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Išvalomas aplankas"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Išvaloma šiukšlinė esanti „%s“"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Vietiniai aplankai"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Atsiunčiamas laiškas %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -13952,7 +13692,7 @@ msgstr[0] "Atsiunčiamas %d laiškas"
 msgstr[1] "Atsiunčiami %d laiškai"
 msgstr[2] "Atsiunčiama %d laiškų"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -13960,7 +13700,16 @@ msgstr[0] "Saugomas %d laiškas"
 msgstr[1] "Saugomi %d laiškai"
 msgstr[2] "Saugoma %d laiškų"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Nepavyko sukurti išvesties rinkmenos. %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13969,11 +13718,11 @@ msgstr ""
 "Klaida išsaugant laiškus į: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Išsaugomas priedas"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13982,69 +13731,60 @@ msgstr ""
 "Nepavyko sukurti išvesties rinkmenos. %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nepavyko įrašyti duomenų: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Vėl jungiamasi prie %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Atšaukiama..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Siunčiamas ir gaunamas paštas"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "_Atšaukti visus?"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Ieškoma naujo pašto"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Įveskite %s slaptažodį"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Įveskite slaptažodį"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Įveskite %s slaptažodį"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Įveskite slaptažodį"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Naudotojas nutraukė operaciją."
 
@@ -14057,7 +13797,7 @@ msgid "Enter a name for this signature."
 msgstr "Įveskite šio parašo vardą."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Vardas:"
 
@@ -14100,11 +13840,11 @@ msgstr "Atnaujinami paieškos aplankai skirti „%s:%s“"
 msgid "Updating Search Folders for '%s'"
 msgstr "Atnaujinami paieškos aplankai skirti „%s“"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Keisti paieškos aplankus"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Naujas paieškos aplankas"
 
@@ -14122,8 +13862,7 @@ msgid ""
 msgstr ""
 "Ne tuščias aplankas esantis „{1}“ jau egzistuoja.\n"
 "\n"
-"Galite pasirinkti ignoruoti šį aplanką, perrašyti, pridėti jo turinį arba "
-"išeiti."
+"Galite ignoruoti šį aplanką, perrašyti, pridėti jo turinį arba išeiti."
 
 #: ../mail/mail.error.xml.h:5
 msgid ""
@@ -14509,11 +14248,11 @@ msgstr "Toks parašas jau yra"
 
 #: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Sisteminiai aplankai yra reikalingi korektiškam Evolution funkcionavimui ir "
-"negali būti pervadinti, perkelti ar pašalinti."
+"Sisteminiai aplankai yra reikalingi korektiškam Ximian Evolution "
+"funkcionavimui ir negali būti pervadinti, perkelti ar pašalinti."
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -14679,74 +14418,74 @@ msgstr "Išval_yti"
 msgid "_Open Messages"
 msgstr "_Atverti laiškus"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Matytas"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematytų laiškų"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Keletas laiškų"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Žemiausias"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Žemesnis"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Aukštesnis"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Aukščiausias"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Šiandien %H:%M"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2064
 msgid "Messages"
 msgstr "Laiškai"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3446
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
@@ -14766,15 +14505,15 @@ msgstr "Pažymėtas"
 msgid "Follow Up Flag"
 msgstr "Tęsinio žymė"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Originali vieta"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Gautas"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Išsiųsti laiškai"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Dydis"
@@ -14927,7 +14666,7 @@ msgstr "_Atsakant į laiškus automatiškai sukurti įrašus adresų knygoje"
 
 #: ../plugins/bbdb/bbdb.c:460
 msgid "Select Address book for Automatic Contacts"
-msgstr "Pasirinkite adresų knygą automatiniams konaktams"
+msgstr "Pasirinkite adresų knygą automatiniams kontaktams"
 
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
@@ -15053,6 +14792,10 @@ msgstr ""
 "Bandomasis įskiepis, demonstruojantis iššokantį meniu, kurio pagalba galima "
 "nukopijuoti tekstą į iškarpinę."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopijuoti _el. pašto adresą"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Kopijavimo įrankis"
@@ -15166,7 +14909,7 @@ msgid "Change the password for Exchange account"
 msgstr "Pakeisti Exchange abonemento slaptažodį"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Pakeisti slaptažodį"
 
@@ -15238,31 +14981,29 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Du slaptažodžiai nesutampa. Įveskite slaptažodžius iš naujo."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "Patvirtinkite slaptažodį:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "Dabartinis slaptažodis:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "Naujas slaptažodis:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr "Dabartinis Jūsų slaptažodis paseno. Pasikeiskite slaptažodį."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Jūsų slaptažodis baigs galioti po %d dienų"
 
-#. 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
 msgid "Custom"
 msgstr "Kitas"
 
@@ -15382,7 +15123,7 @@ msgstr "Aplanko pavadinimas"
 msgid "Folder Size"
 msgstr "Aplanko dydis"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:304
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Užsisakyti kito naudotojo aplanką"
@@ -15397,14 +15138,14 @@ msgstr "Exchange aplankų medis"
 msgid "Unsubscribe Folder..."
 msgstr "Atsisakyti aplanko..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Tikrai atsisakyti aplanko „%s“?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Atsisakyti „%s“"
@@ -15437,66 +15178,62 @@ msgstr "Pridėti naudotoją:"
 msgid "Add User"
 msgstr "Pridėti naudotoją"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Teisės</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Negali ištrinti"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Negali redaguoti"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Kurti elementus"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Kurti poaplankius"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Ištrinti bet kokius elementus"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Ištrinti nuosavus elementus"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Redaguoti bet kokius elementus"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Redaguoti nuosavus elementus"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Aplanko kontaktas"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Aplanko savininkas"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Aplankas matomas"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Skaityti elementus"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Vaidmuo: "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Ne, nepakeisti būsenos"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 msgid "Select User"
 msgstr "Pasirinkite naudotoją"
@@ -15532,26 +15269,22 @@ msgid "Cannot display folders."
 msgstr "Negalima parodyti aplankų."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Negalima atlikti operacijos."
-
-#: ../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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Pakeitimai Exchange abonementui „{0}“ įsigalios tik po to, kai uždarysite ir "
-"iš naujo paleisite Evolution."
+"Pakeitimai Exchange abonementui įsigalios po to, kai uždarysite ir iš naujo "
+"paleisite Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Nepavyko autentifikuotis prie serverio."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Nepavyko pakeisti slaptažodžio."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15561,55 +15294,55 @@ msgstr ""
 "įvyko nežinoma klaida. Patikrinkite URL, naudotojo\n"
 "vardą bei slaptažodį ir bandykite dar kartą."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Nepavyko prisijungti prie Exchange serverio."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Nepavyko prisijungti prie serverio {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Nepavyko nustatyti delegatų aplankų teisių."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Nepavyko surasti Exchange Web Storage System."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Nepavyko aptikti serverio {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Nepavyko padaryti {0} delegatu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Nepavyko perskaityti aplanko teisių"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Nepavyko perskaityti aplanko teisių."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Nepavyko perskaityti manęs-darbe-nėra būsenos"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Nepavyko atnaujinti aplanko teisių."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Nepavyko atnaujinti manęs-darbe-nėra būsenos"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Exchange abonentas atsijungęs."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15638,28 +15371,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Nepavyko atnaujinti delegatų:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Aplankas jau egzistuoja"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Aplankas neegzistuoja"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Aplankas atjungtas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15667,66 +15400,66 @@ msgstr ""
 "Jeigu OWA veikia kitame kelyje, Jūs tai turite nurodyti abonemento "
 "konfigūravimo lange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0} pašto dėžutės šiame serveryje nėra."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Įsitikinkite, kad URL teisingas ir bandykite dar kartą."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Įsitikinkite, kad serverio vardas parašytas teisingai ir bandykite vėl."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Įsitikinkite, kad naudotojo vardas ir slaptažodis yra teisingi ir bandykite "
 "vėl."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Šiam abonementui nėra sukonfigūruoto Global Catalog serverio."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Naudotojui {0} esančiam {1}, pašto dėžutės nėra."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Naudotojo {0} nėra"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Slaptažodis sėkmingai pakeistas."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Paleiskite Evolution iš naujo norėdami, kad įsigaliotų pakeitimai"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Paleiskite Evolution iš naujo"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Pasirinkite naudotoją."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Serveris atmetė slaptažodį, nes jis per silpnas."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange abonementas bus išjungtas, kai Jūs uždarytsite Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange abonementas bus pašalintas, kai Jūs uždarysite Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange serveris yra nesuderinamas su Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15734,7 +15467,7 @@ msgstr ""
 "Serveryje veikia Exchange 5.5, bet Exchange Connector\n"
 "palaiko tik Microsoft Exchange 2000 ir 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15748,53 +15481,53 @@ msgstr ""
 "\n"
 "Arba Jūs tiesiog įvedėte slaptažodį neteisingai."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Bandykite dar kartą naudodami kitą slaptažodį."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Nepavyko įtraukti naudotojo į priėjimo kontrolės sąrašą:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Nepavyko keisti delegatų."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Nežinoma klaida peržiūrint {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Nežinoma klaida."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Nežinomas tipas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Nepalaikoma operacija"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Jūs artėjate prie kvotos, skirtos saugoti paštui šiame serveryje, "
 "išnaudojimo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Jūs negalite savęs paskirti savo paties delegatu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Jūs viršijote savo kvotą, skirtą saugoti paštui šiame serveryje."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Jūs galite konfigūruoti tik vieną Exchange abonementą."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15802,14 +15535,14 @@ msgstr ""
 "Jūs dabar naudojate: {0} KB. Atlaisvinkite šiek tiek vietos ištrindami "
 "keletą laiškų."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "Jūs dabar naudojate: {0} KB. Dabar Jūs nebegalėsite siųsti arba gauti laiškų."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15817,19 +15550,19 @@ msgstr ""
 "Jūs dabar naudojate: {0} KB. Jūs dabar nebegalėsite siųsti laiškų, kol "
 "neatlaisvinsite šiek tiek vietos ištrindami keletą laiškų."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Jūsų slaptažodis nustojo galioti."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} negali būti pridėtas į priėjimo kontrolės sąrašą"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} jau yra delegatas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} jau yra sąraše"
 
@@ -15854,13 +15587,7 @@ msgstr "Leidžia atsisakyti pašto aplankų, aplankų medžio kontekstiniame men
 msgid "Unsubscribe Folders"
 msgstr "Atsisakyti aplanko"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
-msgid "Notes"
-msgstr "Pastabos"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Sąrašas"
 
@@ -15905,21 +15632,13 @@ msgstr "Į_jungti"
 msgid "_Junk List"
 msgstr "Š_lamšto sąrašas"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
-msgid "Message retracted successfully"
-msgstr "Laiškas sėkmingai atšauktas"
-
-#: ../plugins/groupwise-features/mail-retract.c:60
-msgid "Retract Mail"
-msgstr "Atšaukti paštą"
-
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Pridėti siuntimo nustatymus groupwise žinutėse"
 
 #: ../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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Siuntimo nustatymai"
 
@@ -15935,40 +15654,40 @@ msgstr "Groupwise funkcijos"
 msgid "Accept Tentatively"
 msgstr "Laikinai priimti"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>Naudotojai:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Žinutė"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Viešinamo aplanko pranešimas"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Dalyviai gaus sekančius pranešimus.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Kontaktai..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_Keisti pranešimo žinutę"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Nepaviešinta"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Dalijamasi su ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Viešinimas"
 
@@ -16104,7 +15823,7 @@ msgid "Select Calendar"
 msgstr "Pasirinkite kalendorių"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importuoti"
 
@@ -16163,101 +15882,101 @@ msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "Nepavyko atverti Evolution kalendoriaus duomenų eksportavimui."
 
 #: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Nepavyko įkelti kalendoriaus „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Paskyrimas kalendoriuje „%s“ konfliktuoja su šiuo susitikimu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Paskyrimas rastas kalendoriuje „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:494
 msgid "Unable to find any calendars"
 msgstr "Nepavyko rasti jokių kalendorių"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:501
 msgid "Unable to find this meeting in any calendar"
 msgstr "Nepavyko rasti šio susitikimo jokiame kalendoriuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:505
 msgid "Unable to find this task in any task list"
 msgstr "Nepavyko rasti šios užduoties jokiame užduočių sąraše"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:509
 msgid "Unable to find this journal entry in any journal"
 msgstr "Šio žurnalo įrašo nepavyko rasti jokiame žurnale"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:582
 msgid "Searching for an existing version of this appointment"
 msgstr "Ieškoma egzistuojančios šio paskyrimo versijos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Unable to parse item"
 msgstr "Nepavyko apdoroti elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:833
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nepavyko nusiųsti elemento į kalendorių „%s“.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:844
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Siųsti į kalendorių „%s“ kaip priimtą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:848
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Siųsti į kalendorių „%s“ kaip bandomąjį"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:853
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Siųsti į kelendorių „%s“ kaip atmestą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:858
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Siųsti į kelendorių „%s“ kaip atšauktą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:951
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizatorius pašalino delegatą %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:958
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatui išsiųstas pranešimas apie atšaukimą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nepavyko išsiųsti delegatui pranešimo apie atšaukimą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1045
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Nepavyko atnaujinti dalyvio būsenos, nes būsena yra neteisinga"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nepavyko atnaujinti dalyvio. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1076
 msgid "Attendee status updated"
 msgstr "Dalyvio būsena atnaujinta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1203
 msgid "The calendar attached is not valid"
 msgstr "Prisegtas kalendorius yra netinkamas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1204
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16265,15 +15984,15 @@ msgstr ""
 "Laiške nurodoma, kad jame yra kelendorius, bet kalendorius nėra tinkamas "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "The item in the calendar is not valid"
 msgstr "Elementas kalendoriuje yra netinkamas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1239
+#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1330
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16281,11 +16000,11 @@ msgstr ""
 "Šiame laiške yra kalendorius, bet kalendoriuje nėra jokių įvykių, užduočių "
 "ar laisvas/užsiėmęs informacijos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 msgid "The calendar attached contains multiple items"
 msgstr "Prisegtame kalendoriuje yra keletas elementų"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1265
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16295,273 +16014,273 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "_Delete message after acting"
 msgstr "_Po įvykio laišką ištrinti"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:2061
 msgid "Conflict Search"
 msgstr "Konfliktų paieška"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Pasirinkite kalendorius, kuriuose ieškosite susitikimų konfliktų"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Dabar"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Šiandien %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "Šiandien %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:202
 msgid "Today %l:%M:%S %p"
 msgstr "Šiandien %H:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Rytoj"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Rytoj %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %H:%M:%S"
 msgstr "Rytoj %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "Rytoj %H:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Rytoj %H:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 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:308
+#: ../plugins/itip-formatter/itip-view.c:306
 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:312
+#: ../plugins/itip-formatter/itip-view.c:310
 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:317
+#: ../plugins/itip-formatter/itip-view.c:315
 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:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %Y %B %e, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> per %s paskelbė sekančią susitikimo informaciją:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> paskelbė sekančią susitikimo informaciją:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> Jums paskyrė sekantį susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> per %s pranešė, jog norėtų, kad Jūs dalyvautumėte sekančiame "
 "susitikime:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> norėtų, kad Jūs dalyvautumėte sekančiame susitikime:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> per %s nori, nori papildyti esamą susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> nori papildyti esamą susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> nori gauti naujausią užduoties informaciją sekančiam susitikimui:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> atsiuntė atgal sekantį susitikimo atsakymą:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> per %s atšaukė šį susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> atšaukė šį susitikimą."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> pateikė sekančius susitikimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> per %s atmetė sekančius susitikimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> atšaukė sekančius susitikimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> per %s paskelbė sekančią užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> paskelbė sekančią užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> norėtų, kad %s būtų priskirta sekanti užduotis:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> per %s priskyrė Jums užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> priskyrė Jums užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> per %s nori papildyti esamą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> nori papildyti esamą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -16569,152 +16288,114 @@ msgid ""
 msgstr ""
 "<b>%s</b> nori gauti naujausią sekančios priskirtos užduoties informaciją:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> atsiuntė atgal šį atsakymą į priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> per %s atšaukė šią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> atšaukė šią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> pateikė sekančius užduoties priskyrimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> per %s atmetė sekančią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> atmetė sekančią priskirtą užduotė:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> per %s paskelbė sekantį raštelį:"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> paskelbė sekantį raštelį:"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> per %s nori papildyti esamą raštelį:"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> nori papildyti esamą raštelį:"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> per %s atšaukė šį viešinamą raštelį:"
-
-#: ../plugins/itip-formatter/itip-view.c:497
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> atšaukė šį viešinamą raštelį:"
-
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "_Atverti kalendorių"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "_Atmesti "
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "_Priimti"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "_Atmesti visus"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "_Atmesti "
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "_Laikinai priimti visus"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "_Laikinai priimti"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "_Priimti visus"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "_Siųsti informaciją"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "_Atnaujinti dalyvių būseną"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "_Atnaujinti"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:890
 msgid "Start time:"
 msgstr "Pradžios laikas:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:899
 msgid "End time:"
 msgstr "Pabaigos laikas:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:915
+#: ../plugins/itip-formatter/itip-view.c:965
 msgid "Comment:"
 msgstr "Komentaras:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:979
 msgid "Send u_pdates to attendees"
 msgstr "Siųsti _dalyviams atnaujinimus"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:988
 msgid "A_pply to all instances"
 msgstr "_Pritaikyti visiems atvejams"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "_Užduotys:"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "Rašteliai:"
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "Laiškuose rodo teksto/kalendoriaus dalis."
@@ -16726,8 +16407,8 @@ msgstr "Itip formatuoklis"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr "„{0}“ paskyrė susitikimą. Ar norite pridėti delegatą „{1}“?"
+"&quot;{1}&quot; ?"
+msgstr "{0} paskyrė susitikimą. Ar norite pridėti delegatą?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16815,14 +16496,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Konvertuoti pasirinktą laišką į naują užduotį"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Susisiekti su konferencijos _savininku"
 
 #: ../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 "Gauti konferencijos _archyvą"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Gauti konferencijos _naudojimosi informacija"
 
@@ -16844,14 +16528,17 @@ msgstr ""
 "atsisakyti, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Rašyti laišką į konferenciją"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Užsakyti konferenciją"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Atsisakyti konferencijos"
 
@@ -16935,27 +16622,15 @@ msgstr "_Redaguoti laišką"
 msgid "_Send message"
 msgstr "_Siųsti laišką"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Susisiekti su konferencijos _savininku"
-
 #: ../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 "Susisiekti su konferencijos, kuriai priklauso šis laiškas, savininku"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Gauti konferencijos _archyvą"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Gauti konferencijos _naudojimosi informacija"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Gauti konferencijos, kuriai priklauso šis laiškas, archyvą"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Gauti konferencijos, kuriai priklauso šis laiškas, naudojimosi informaciją"
@@ -16972,25 +16647,13 @@ msgstr "Užsisakyti pašto konferenciją, kuriai priklauso šis laiškas"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Atsisakyti pašto konferencijos, kuriai priklausi šis laiškas"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Rašyti laišką į konferenciją"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Užsakyti konferenciją"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "Atsisak_yti konferencijos"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Pažymėti visus skaitytais"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "Pažy_mėti laiškus skaitytais"
+msgid "Mark me_ssages as read"
+msgstr "Pažymėti visus laiškus skaitytais"
 
 #: ../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"
@@ -17255,12 +16918,12 @@ msgstr "Išssaugoti visus priedus"
 msgid "Select save base name"
 msgstr "Pasirinkite bazinį saugojimo pavadinimą"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:360
 msgid "MIME Type"
 msgstr "MIME tipas"
 
-#: ../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:368
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Išsaugoti"
 
@@ -17370,7 +17033,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF formatas (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Pasirinkite galutinį dokumentą"
 
@@ -17419,19 +17082,19 @@ msgstr ""
 "\n"
 "Norėdami tęsti, spauskite mygtuką „Pirmyn“. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Pasirinkite informaciją, kurią norėtumėte importuoti:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Nuo %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importuojami duomenys."
 
@@ -17519,15 +17182,11 @@ msgstr "Šoninis skydelis yra matomas"
 msgid "Skip development warning dialog"
 msgstr "Praleisti bandomosios versijos perspėjimo langą"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Paleisti neprisijungiant"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Būsenos juosta yra matoma"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17535,19 +17194,19 @@ msgstr ""
 "Evolution konfigūracijos versija, su mažoriniu/minoriniu/konfigūracijos "
 "lygiu (pvz., „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Numatytasis pagrindinio lango aukštis, taškais."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Numatytasis pagrindinio lango plotis, taškais."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Numatytasis šoninio skydelio plotis, taškais."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17555,7 +17214,7 @@ msgstr ""
 "Paskutinė atnaujinta Evolution konfigūracijos versija, su mažoriniu/"
 "minoriniu/konfigūracijos lygiu (pvz., „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17564,45 +17223,41 @@ msgstr ""
 "Lango mygtukų stilius. Gali būti „text“, „icons“, „both“, „toolbar“. Jeigu "
 "nurodyta „toolbar“, mygtukų stilius nurodomas GNOME įrankinės nustatymuose."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Įrankinė yra matoma"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Ar Evolution bus paleidžiama atsijungimo režime, vietoj prisijungimo režimo."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Ar langas turėtų būti išdidintas."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Ar šoninis skydelis turi būti matomas."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Ar būsenos juosta turi būti matoma."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Ar įrankinė turi būti matoma."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Ar perspėjimas apie bandomąją Evolution versiją bus praleidžiamas."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Ar lango mygtukai turi būti matomi."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Lango mygtukų stilius"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Lango mygtukai yra matomi"
 
@@ -17624,11 +17279,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Pasirinkite paleidžiamą importavimo programą:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17642,11 +17297,11 @@ msgstr ""
 "Jei nežinote, galite pasirinkti „Automatiškas“, ir Evolution bandys "
 "susigaudyti pati."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Pasirinkite šio importavimo paskirties vietą"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17658,23 +17313,23 @@ msgstr ""
 "nustatymų. Jei norite bandyti dar kartą,\n"
 "paspauskite mygtuką „Atgal“.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
-msgstr "_Rinkmenos pavadinimas:"
+msgstr "_Rinkmenos vardas:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Pasirinkite rinkmeną"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Rinkmenos _tipas:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importuoti duomenis ir nustatymus iš senesnių programų"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Įmportuoti _vieną rinkmeną"
 
@@ -17736,7 +17391,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "_Dirbti prisijungus"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
@@ -17790,15 +17445,10 @@ msgstr "Nepavyko prisiregistruoti OAF"
 msgid "Configuration Database not found"
 msgstr "Konfigūracijos duombazė nerasta"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Nauja"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Nauja "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Naujas bandymas"
@@ -17850,7 +17500,7 @@ msgstr ""
 "Šis meistras padės Jums įkelti išorines rinkmena. į Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17886,7 +17536,7 @@ msgstr ""
 "Tikimės, kad Jums patiks mūsų sunkaus darbo vaisiai, ir mes\n"
 "nekantriai laukiame Jūsų pagalbos tobulinant šį produktą!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17894,39 +17544,35 @@ msgstr ""
 "Ačiū\n"
 "Evolution komanda\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Daugio to neberodyti"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution paleidimas aktyvuoja nurodytą komponentą"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Paleisti prisijungiant"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Priverstinai uždaryti visus Evolution komponentus"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Priverstinai re-migruoti iš Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Siųsti visų komponentų derinimo išvestį į rinkmeną."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Atjungti bet kokių įskiepių įkėlimą."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolution PIM ir el. pašto klientas"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18692,12 +18338,12 @@ msgstr "Išsaugoti pažymėtus kontaktus kaip VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Išsaugoti kontaktus esančius pasirinktame aplanke kaip VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Pažymėti visus"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Pažymėti _visus"
@@ -18767,7 +18413,7 @@ msgstr "Per_kelti kontaktą į..."
 msgid "_Move Folder Contacts To"
 msgstr "P_erkelti kontaktus aplanke į"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Naujas"
 
@@ -18828,7 +18474,6 @@ msgid "Month"
 msgstr "Mėnesis"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Sekantis"
 
@@ -18837,7 +18482,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Peržiūrėti kalendorių prieš spausdinant"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Praeitas"
 
@@ -18925,11 +18570,11 @@ msgstr "Iškirpti pažymėtą tekstą į atmintinę"
 msgid "Paste from clipboard"
 msgstr "Įdėti iš atmintinės"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Įdėti tekstą iš atmintinės"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Pažymėti visą tekstą"
 
@@ -18964,31 +18609,30 @@ msgstr "Norėdami pamatyti žinyną, spragtelėkite čia"
 msgid "Close"
 msgstr "Užverti"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Įte_rpti"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "P_riedą..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Užverti"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Rinkmena"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Žinynas"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "Įterpt_i"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Parinktys"
@@ -19086,11 +18730,6 @@ msgstr "Nurodo ar laikas užimtas/laisvas"
 msgid "_Alarms"
 msgstr "_Perspėjimai"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorijos"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19156,73 +18795,53 @@ msgid "F_older"
 msgstr "_Aplankas"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Laiško _peržiūra"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Perkelti pažymėtą aplanką į kitą aplanką"
 
 #. 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 "Visam laikui pašalinti visus ištrintus laiškus iš visų aplankų"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Paiešk_os aplankai"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Rodyti laiško _peržiūrą"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Rodyti laiško peržiūrą po laiškų sąrašu"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Rodyti laiško peržiūrą šone laiškų sąrašo"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Rodyti laiško peržiūros langą"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Užsisakyti ar atsisakyti aplankų nutolusiuose serveriuose"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Klasikinis vaizdas"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Kopijuoti aplanką į..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Laiškų _filtrai"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "P_erkelti aplanką į..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Naujas..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Peržiūra"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Prenumeratos"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "_Vertikalus vaizdas"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Keisti šio aplanko pavadinimą"
@@ -19780,10 +19399,6 @@ msgid "_Unread"
 msgstr "_Neskaitytas"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Mastelis"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Pritraukti"
 
@@ -19791,7 +19406,7 @@ msgstr "_Pritraukti"
 msgid "Close this window"
 msgstr "Uždaryti šį langą"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Pagrindinė įrankinė"
 
@@ -19866,6 +19481,11 @@ msgstr "Gauti pranešimą kai bus perskaitytas Jūsų laiškas"
 msgid "HT_ML"
 msgstr "H_TML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Įte_rpti"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Atverti rinkmeną"
@@ -20194,51 +19814,43 @@ msgstr "Piktogramos _ir tekstas"
 msgid "Import data from other programs"
 msgstr "Importuoti duomenis iš kitų programų"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "Išdėst_ymas"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Naujas _langas"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Nustatymai"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Siųsti / gauti"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Siųsti / _gauti"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Išsiųsti laukiantį paštą ir paimti naują paštą"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Valdyti Pilot nustatymus"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Rodyti informaciją apie Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Rodyti šoninį _skydelį"
+msgid "Side _Bar"
+msgstr "Šoninis _skydelis"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Rodyti _būsenos juostą"
+msgid "Status _Bar"
+msgstr "_Būsenos juosta"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Rodyti į_rankinę"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Rodyti informaciją apie Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Išsiųsti pranešimą apie klaidą"
 
@@ -20246,71 +19858,75 @@ msgstr "Išsiųsti pranešimą apie klaidą"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Iš_siųsti pranešimą apie klaidą"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pranešti apie klaidą, naudojant Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Perjungti būklę, ar dirbama atsijungus."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Į_rankinė"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Įrankinės s_tilius"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Rodyti/slėpti šoninį skydelį"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Rodyti/slėpti būsenos juostą"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Apie"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Užverti langą"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "_Užmiršti slaptažodžius"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Slėpti mygtukus"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "_Tik piktogramos"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Trumpa apžvalga"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "Iš_eiti"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Perjungiklio išvaizda"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_Sinchronizavimo nustatymai..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Tik _tekstas"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Langas"
 
@@ -20347,40 +19963,32 @@ msgid "_Work Week View"
 msgstr "_Darbo savaitės vaizdas"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Kaip išsiųstų aplankas plačiam vaiz_dui"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Kaip iš_siųstų aplankas"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Pagal _būseną"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Pagal siu_ntėją"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Pagal _temą"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Pagal tęsinio ž_ymę"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Plačiam _vaizdui"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Laiškai"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
-msgstr "_Rašteliai"
+msgstr "_Užrašai"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
@@ -20390,32 +19998,28 @@ msgstr "Su _data iki kada reikia"
 msgid "With _Status"
 msgstr "Su _būsena"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Laiko juostos</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Pažymėta</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Pasirinkite laiko juostą"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "Laiko juostų sąrašas"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20451,7 +20055,7 @@ msgid "_Edit..."
 msgstr "_Keisti..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20465,11 +20069,11 @@ msgstr "Atvejis"
 msgid "Save Current View"
 msgstr "Išsaugoti dabartinį vaizdą"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "_Sukurti naują vaizdą"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Perrašyti esamą vaizdą"
 
@@ -20504,31 +20108,26 @@ msgstr "Gamykla"
 msgid "Define New View"
 msgstr "Apibrėžti naujus vaizdus"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "Naujo vaizdo pavadinimas:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "Vaizdo tipas"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 msgstr "Vaizdo tipas:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Pasiūlyti automatinį priedo parodymą"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "PATKPŠS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%Y %B"
 
@@ -20538,8 +20137,8 @@ msgstr "Mėnesio kalendorius"
 
 #: ../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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Užpildanti spalva"
 
@@ -20548,16 +20147,16 @@ msgstr "Užpildanti spalva"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "GTK užpildanti spalva"
 
 #: ../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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Užpildantis tušas"
 
@@ -20596,11 +20195,11 @@ msgid "Minimum Width"
 msgstr "Mažiausias plotis"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Laisva erdvė"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Dabar"
 
@@ -20728,14 +20327,6 @@ msgstr "Išskleidžiamas sąrašas pasirinkti laikui"
 msgid "Time"
 msgstr "Laikas"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "_Dabar"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Šiandien"
-
 #. 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"
@@ -20746,23 +20337,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Išplėsta"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Ar teksto plėtiklis yra išskleistas"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Teksto plėtiklio užrašas"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Pabraukti"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20770,80 +20361,64 @@ msgstr ""
 "Jeigu nustatyta, pabraukti simboliai tekste reiškia, kad sekantis simbolis "
 "turėtų būti naudojamas karštųjų klavišų išraiškai"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Erdvė tarp užrašo ir antrinio elemento"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Užrašo valdymo elementas"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Valdymo elementas rodomas vietoje numatytojo plėtiklio užrašo"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Plėtiklio dydis"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Plėtiklio rodyklės dydis"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikatoriaus erdvė"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Erdvė aplink plėtiklio rodyklę"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Išsami paieška"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Išsaugoti paiešką"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Paieškos"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Paieškos"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Išsaugoti paiešką"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "Išsaugoti _paiešką..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Keisti išsaugotas paieškas..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Išsami paieška..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Visi abonementai"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Esamas abonementas"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Esamas aplankas"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Esamas laiškas"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Pasirinkite paveikslėlį"
@@ -20885,50 +20460,50 @@ msgstr "Grįžimo atgal modelis"
 msgid "Column width"
 msgstr "Stulpelio plotis"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Paieška"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Paieška"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Surasti"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "Išval_yti"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Paieškos tipas"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Elemento ID"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "Antrinio elemento ID"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Tekstas"
 
-#. 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:911
-msgid "Show: "
-msgstr "Rodyti: "
-
-#. 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:927
-msgid "Sear_ch: "
-msgstr "Ieš_koti: "
-
-#. 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:939
-msgid " i_n "
-msgstr " k_ur "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "_Surasti"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
-msgstr "Žymeklio eilutė"
+msgstr "Žymeklio iilutė"
 
 #: ../widgets/misc/e-selection-model-array.c:554
 #: ../widgets/table/e-tree-selection-model.c:818
@@ -20972,8 +20547,8 @@ msgid "A_uto-delete sent item"
 msgstr "A_utomatiškai ištrinti išsiųstus elementus"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Klasifikacija"
+msgid "C_lassification"
+msgstr "K_lasifikacija"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -20997,29 +20572,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"Normalus\n"
-"Nuosavybinis\n"
+"Viešas\n"
+"Privatus\n"
 "Konfidencialus\n"
-"Slaptas\n"
-"Labai slaptas\n"
-"Tik Jūsų akims"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "Paprašyta _atsakymo"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "_Būklės sekimas"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -21031,51 +20600,51 @@ msgstr ""
 "Standartinis\n"
 "Žemas"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Kai _priimta:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Kai pa_baigta:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Kai a_tsisakyta:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "R_ibose"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Po:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Visa informacija"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Atidėti laiško pristatymą"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Pristatyta"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "_Nustatyti galiojimo terminą"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Iki:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Kai tinkama"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "_Kai atverta:"
 
@@ -21093,19 +20662,19 @@ msgstr "%s (%d%% užbaigta)"
 msgid "Click here to go to URL"
 msgstr "Norėdami atverti šį URL, spauskite čia"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "Keisti pagrindinių kategorijų sąrašą..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "Elementas(i) priklauso šioms _kategorijoms:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "_Prieinamos kategorijos:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "kategorijos"
 
@@ -21129,23 +20698,23 @@ msgstr "Sufokusuotas stulpelis"
 msgid "Unselected Column"
 msgstr "Nepasirinktas stulpelis"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1786
 msgid "Strikeout Column"
 msgstr "Perbrauktas stulpelis"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1793
 msgid "Underline Column"
 msgstr "Pabrauktas stulpelis"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1800
 msgid "Bold Column"
 msgstr "Paryškintas stulpelis"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Color Column"
 msgstr "Spalvų stulpelis"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1821
 msgid "BG Color Column"
 msgstr "Fono spalvų stulpelis"
 
@@ -21160,7 +20729,6 @@ msgstr "Pri_einami laukeliai:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Didėjančiai"
 
@@ -21171,7 +20739,6 @@ msgstr "Išvalyti visus"
 
 #: ../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 "Descending"
 msgstr "Mažėjančiai"
 
@@ -21269,14 +20836,14 @@ msgstr "_Rodyti šiuos laukelius šia tvarka:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD kodas"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Pilna antraštė"
 
@@ -21296,21 +20863,25 @@ msgstr ""
 "Norėdami pridėti į lentelę stulpelį, nutempkite\n"
 "jį į vietą, kurioje norite, kad jis atsirastų."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d elementas)"
-msgstr[1] "%s : %s (%d elementai)"
-msgstr[2] "%s : %s (%d elementų)"
+msgstr "%s : %s (%d elementas)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d elementai)"
+
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d elementas)"
-msgstr[1] "%s (%d elementai)"
-msgstr[2] "%s (%d elementų)"
+msgstr "%s (%d elementas)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d elementai)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21390,69 +20961,65 @@ msgstr "Numatytasis eilutės aukštis"
 msgid "Frozen"
 msgstr "Nekintamas"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Derinti esamą vaizdą"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Rikiuoti didėjančiai"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Rikiuoti mažėjančiai"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Nerikiuoti"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Grupuoti pagal šį lauką"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Grupuoti pagal dėžutę"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Pašalinti šį stulpelį"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Pridėti stulpelį..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Lygiavimas"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Geriausiai telpantis"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Formatuoti stulpelius..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Prisitaikyti esamą vaizdą..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Rūšiuoti pagal"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Šriftų rinkinys"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Rūšiavimo info"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21504,7 +21071,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Čia turėtų būti testuojamas minikortelės elementas"
 
 #: ../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:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Įvykių procesorius"
 
@@ -21517,57 +21084,57 @@ msgid "GDKFont"
 msgstr "GDKŠriftas"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Lygiavimas"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Naudoti elipsę"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Elipsė"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Eilučių laužymas"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Pertraukimo simboliai"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Daugiausiai eilučių"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Leisti naujas eilutes"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Rodyti rėmelius"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Rodyti foną"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Rodyti mygtuką"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Kursoriaus pozicija"
 
@@ -21575,58 +21142,114 @@ msgstr "Kursoriaus pozicija"
 msgid "Emulate label resize"
 msgstr "Emuliuoti užrašo dydžio keitimą"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Įvesties metodai"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Pastorintas"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Perbrauktas"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Prieraišas"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Paveikslėlio plotis"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Paveikslėlio aukštis"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Paveikslėlis"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Užpildyti paveikslėlio lauką"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "X atitraukimas"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Y atitraukimas"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Teksto plotis"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Teksto aukštis"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "IM turinys"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Išsiskleidžianti rodyklė"
+
+#~ msgid "Cale_ndar:"
+#~ msgstr "Kale_ndorius:"
+
+#~ msgid "Dele_gatees"
+#~ msgstr "Dele_gatai"
+
+#~ msgid "From:"
+#~ msgstr "Nuo:"
+
+#~ msgid "Properties..."
+#~ msgstr "Savybės..."
+
+#~ msgid "(%ld seconds)"
+#~ msgstr "(%ld sekundės)"
+
+#~ msgid "(%d %s %d %s)"
+#~ msgstr "(%d %s %d %s)"
+
+#~ msgid "(%d %s)"
+#~ msgstr "(%d %s)"
+
+#~ msgid " %u second"
+#~ msgstr "%u sekundė"
+
+#~ msgid " %u seconds"
+#~ msgstr "%u sekundės"
+
+#~ msgid " %u minute"
+#~ msgstr "%u minutė"
+
+#~ msgid " %u minutes"
+#~ msgstr "%u minutės"
+
+#~ msgid "%u hour"
+#~ msgstr "%u valanda"
+
+#~ msgid "%u hours"
+#~ msgstr "%u valandos"
+
+#~ msgid "(%d seconds)"
+#~ msgstr "(%d sekundės)"
+
+#~ msgid ""
+#~ "The message was sent via the &quot;sendmail&quot; external application. "
+#~ "Sendmail reports the following error: status 67: mail not sent.\n"
+#~ "The message is stored in the Outbox folder. Check the message for errors "
+#~ "and resend."
+#~ msgstr ""
+#~ "Laiškas buvo išsiųstas su išorine programa „sendmail“. Sendmail pranešė "
+#~ "sekančią klaidą: būsena 67: laiškas neišsiųstas.\n"
+#~ "Laiškas išsaugotas aplanke „Paruošti siųsti“. Patikrinkite ar laiške nėra "
+#~ "klaidų ir siųskite iš naujo."
+
+#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgstr "Jūsų laiškas su tema „{0}“ buvo nepristatytas."
diff --git a/po/lv.po b/po/lv.po
index 2515b96fb8..a6941babf4 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,25 +5,23 @@
 # Pēteris Krišjānis <peteris.krisjanis@os.lv>, 2003.
 # Linux Centrs <info@linux.edu.lv>, 2006.
 # Raivis Dejus <orvils@gmail.com>, 2006.
-#: ../mail/em-format-html-display.c:680
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-19 12:02+0300\n"
-"PO-Revision-Date: 2006-07-19 11:49+0300\n"
+"POT-Creation-Date: 2006-07-22 14:16+0300\n"
+"PO-Revision-Date: 2006-07-22 14:19+0300\n"
 "Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
 "Language-Team: Latvian <locale@laka.lv>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution adrešu grāmata"
 
@@ -37,13 +35,13 @@ msgstr "Jauns kontakts"
 msgid "New Contact List"
 msgstr "Jauns kontaktu saraksts"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "dotajā adrešu grāmatas mapē %s ir %d kontakts"
-msgstr[1] "dotajā adrešu grāmatas mapē %s ir %d kontakti"
-msgstr[2] "dotajā adrešu grāmatas mapē %s ir %d kontaktu"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "dotajā adrešu grāmatas mapē ir %d kontakts"
+msgstr[1] "dotajā adrešu grāmatas mapē ir %d kontakti"
+msgstr[2] "dotajā adrešu grāmatas mapē ir %d kontaktu"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -62,32 +60,32 @@ msgstr "Kontakti: "
 msgid "evolution minicard"
 msgstr "evolution minikarte"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Ir bridinajumi."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Tajā ir atkārtojošies ieraksti."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Tā ir sanāksme."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendāra notikumi: Kopsavilkums ir %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendāra notikumi: Nav kopsavilkuma."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "kalendāra notikumi"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Iegūt fokusu"
 
@@ -116,9 +114,7 @@ msgstr "Iet uz Datumu"
 msgid "a table to view and select the current time range"
 msgstr "tabula pašreizēja laika apskatīšanai un izvelēšanai"
 
-#. 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -126,38 +122,30 @@ msgstr[0] "Ir %d notikums."
 msgstr[1] "Ir %d notikumi."
 msgstr[2] "Ir %d notikumu."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Notikumu nav."
 
-#. 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Darba nedēļas apskats: %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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dienas apskats: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "darba nedēļas kalendāra skats"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "vienas vai vairāku dienu kalendāra skats"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:679
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -168,20 +156,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:190
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -189,10 +175,10 @@ msgstr "%a %d %b %Y"
 #: ../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:703
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/calendar-component.c:716
-#: ../calendar/gui/calendar-component.c:718
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -202,11 +188,9 @@ 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:220
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -336,14 +320,6 @@ msgstr "Uzstādīt noklusētos"
 msgid "Popup Menu"
 msgstr "Uznirstošā izvēlne"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Pārslēgt pielikuma joslu"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "aktivizēt"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -429,8 +405,7 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution adrešu grāmata negaidīti aizvērās."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Bilde, kuru jūs esat izvelējušies ir pārāk liela. Vai vēlaties izmainīt tās "
 "izmēru un saglabāt to?"
@@ -455,8 +430,7 @@ msgstr "Šō adrešu gramatiņa nevar atvērt."
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "This addressbook server does not have any suggested search bases."
-msgstr ""
-"Šim adrešu grāmatu serverim nav nevienas no piedāvātajām meklēšanas bāzēm."
+msgstr "Šim adrešu grāmatu serverim nav nevienas no piedāvātajām meklēšanas bāzēm."
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid ""
@@ -511,13 +485,12 @@ msgid ""
 msgstr "Jūs modificējat šo kontaktu. Vai jūs gribat saglabat izmaiņas?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Jūsu {0} kontakts būs pieejams pēc Evolution pārstartēšanas."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Pievienot"
@@ -527,7 +500,7 @@ msgid "_Discard"
 msgstr "Iz_dzēst"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -567,9 +540,9 @@ msgstr "Konfigurējiet autopabeigšanu šeit"
 
 #. 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:265 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontakti"
 
@@ -609,7 +582,7 @@ msgstr "Apstradājiet jūsu S/MIME sertifikatus šeit"
 #. 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:227
+#: ../calendar/gui/calendar-component.c:209
 #: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
@@ -625,12 +598,12 @@ msgstr "Uz šī datora"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:149
 #: ../addressbook/gui/component/addressbook-migrate.c:491
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../calendar/gui/calendar-component.c:235
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Privāts"
 
@@ -657,7 +630,7 @@ msgid "Create a new contact list"
 msgstr "Izveidot jaunu kontaktu sarakstu"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Jauna Adrešu grāmata"
 
@@ -673,73 +646,72 @@ msgstr "Saveidot jaunu adrešu grāmatu"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Neizdevās uzlabot Adrešu grāmatas iestatījumus vai mapes."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Bāze"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tips:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Kopēt gramatas saturu atsaistes pieejamībai"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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: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:2021
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:2003
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Vispārējs"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Adrešu grāmata"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Servera informācija"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autentifikācija"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaļas"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Meklēšana"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Lejupieladēšana"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Adrešu grāmatas parametri"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Migrē..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrē `%s':"
@@ -815,35 +787,35 @@ msgstr "Mapes nosaukums nevar saturēt '/'"
 msgid "A Folder with this name already exists"
 msgstr "MApe ar šādu nosaukumu jau eksistē"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "Jau_na adrešu grāmata"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:556
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Dzēst"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Saglabāt kā VKarti..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:557
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Rekvizīti..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Kontaktu avota izvelētājs"
 
@@ -852,7 +824,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Izmantoju LDAP serveri anonīmi"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Neizdevās autentificēties.\n"
 
@@ -890,8 +862,7 @@ msgstr "Parādīt priekšskates lauku"
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr ""
-"Simbolu daudzums, ko jāievada pirms Evolution meģinās automātiski pabeigt."
+msgstr "Simbolu daudzums, ko jāievada pirms Evolution meģinās automātiski pabeigt."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -902,7 +873,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Vārdu izvēles dialogā pēdējās lietotās mapes URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Vertikāla paneļa pozīcija"
 
@@ -931,7 +902,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentifikācija</b>"
 
@@ -981,8 +952,7 @@ msgid "Email address"
 msgstr "Epasta adrese"
 
 #: ../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 lietos šo epasta adresi,lai autentificētu jūs ar serveri."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
@@ -1110,8 +1080,7 @@ msgstr ""
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr ""
-"Šis ir pilnais LDAP servera nosaukums. Piemēram, \"ldap.manakompanija.com\"."
+msgstr "Šis ir pilnais LDAP servera nosaukums. Piemēram, \"ldap.manakompanija.com\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
@@ -1179,9 +1148,9 @@ msgstr "_Pieteikšanās metode:"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Vārds:"
 
@@ -1194,7 +1163,7 @@ msgid "_Search scope:"
 msgstr "_Meklēšanas mērogs:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Serveris:"
@@ -1214,7 +1183,7 @@ msgstr "kartes"
 #: ../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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
@@ -1223,220 +1192,243 @@ msgid "minutes"
 msgstr "minūtes"
 
 #: ../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/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Sūtu epastu</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Mājās</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>siņošana</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>darbs</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Aizdomīgs</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Cits</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Tālrunis</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Web Adreses</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Darbs</b> "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Kontakts"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2407
 msgid "Contact Editor"
 msgstr "Kontaktu redaktors"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Pilns_vārds..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Attels"
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Epasta adrese"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Iesauka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Personīga informācija"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefons"
 
 #. 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:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Darbs"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Adrese:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Ikgadējs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Asistents:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Dzimšanas diena:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/itip-formatter/itip-view.c:1654
 msgid "_Calendar:"
 msgstr "_Kalendārs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Kategorijas..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Kategorijas"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Pilsēta:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Kompānija:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Valsts:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Departaments:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Noglabāt zem:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Brīvs/Aizņemts:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Mājas Lapa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Vadītājs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Piezīmes:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Birojs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Pasta Kastīte:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Profesija:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Dzīvesbiedrs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Rajons/štats/province:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Amats/tituls:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Video Čats:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Grib saņemt HTML pastu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Tīmekļa žurnāls:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Kur:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Pasta indekss:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Adrese"
 
@@ -1444,7 +1436,7 @@ msgstr "Adrese"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1452,7 +1444,7 @@ msgstr "Adrese"
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1814 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2430,7 +2422,7 @@ msgstr "Zimbabve"
 #: ../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
+#: ../plugins/save-attachments/save-attachments.c:371
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nosaukums"
@@ -2441,7 +2433,7 @@ msgstr "AOL Ziņotājs"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2451,7 +2443,7 @@ msgstr "Yahhoo ziņotājs"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2460,7 +2452,7 @@ msgid "Service"
 msgstr "Serviss"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2481,17 +2473,17 @@ msgid "Other"
 msgstr "Cits"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2520,20 +2512,20 @@ msgid "Changed"
 msgstr "Izmainīts"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktu redaktors - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2780
 msgid "Please select an image for this contact"
 msgstr "Lūdzu izvēlieties attēlu šim kontaktam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
-msgid "_No image"
-msgstr "_Nav attēla"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2781
+msgid "No image"
+msgstr "Attēla nav"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3066
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2541,23 +2533,23 @@ msgstr ""
 "Kontaktdati ir nederīgi:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ir nederīgā formātā"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3077
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ir nederīgā formātā"
 
-#: ../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:3092
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ir tukšs"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3118
 msgid "Invalid contact."
 msgstr "Nederīgs kontakts."
 
@@ -2574,8 +2566,8 @@ msgid "_Full name"
 msgstr "_Pilnais vārds"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
-msgstr "E_pasts"
+msgid "E-_mail"
+msgstr "E-_pasts"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
 msgid "_Select Address Book"
@@ -2585,7 +2577,7 @@ msgstr "Izvēlētie_s adrešu grāmatu"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Vai jūs tiešām vēlaties\n"
 "dzēst šo kontaktu sarakstu (%s) ?"
@@ -2602,7 +2594,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Vai jūs tiešām vēlaties\n"
 "dzēst šo kontaktu (%s)?"
@@ -2615,105 +2607,104 @@ msgstr ""
 "Vai jūs tiešām vēlaties\n"
 "dzēst šos kontaktus?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adrese _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "Pilsē_ta:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Va_lsts:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Pilna adrese"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Pasta indekss:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esk."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Pilns vārds"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Miss"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Mr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Mrs."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Ms."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sers"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Vārds:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Uzvārds:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Otrais vārds:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Prievārds:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Pievienot IM kontu"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Konta nosaukums:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_IM Serviss:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2724,62 +2715,61 @@ msgstr "_Atrašanās vieta:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Pievienot e-pastu sarakstam"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Kontaktu saraksta redaktors"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Biedri"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Izņemt e-pastu no saraksta"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Slēpt adreses, kad sūtam kādam no šī sarakstu"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Saraksta vā_rds:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "Izvēlētie_s"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../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 ""
-"Ievadiet e-pasta adresi vai pārvelciet kon_taktu uz apakšējajā sarakstā:"
+msgstr "Ievadiet e-pasta adresi vai pārvelciet kon_taktu uz apakšējajā sarakstā:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "Grāmata"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Ir jauns saraksts"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Biedri"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Kontaktu saraksta locekļi"
 
@@ -2820,18 +2810,25 @@ msgstr ""
 "Vārds vai e-pasta adrese šim kontaktam jau eksistē\n"
 "šajā mapē. Vai jūs vēlaties pievienot jebkurā gadījumā?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Jebkuršs lauks satur"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Kategorija ir"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-pasts sākas ar"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Vārds sākas ar"
@@ -2850,7 +2847,7 @@ msgstr[2] "%d kontaktu"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
@@ -2874,11 +2871,11 @@ msgstr "Modelis"
 msgid "Error modifying card"
 msgstr "Kļūda mainot kontaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Avots"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
@@ -2887,96 +2884,96 @@ msgstr "Avots"
 msgid "Type"
 msgstr "Tips"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2069
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Saglabāt kā VKarti..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "Jau_ns kontakts..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Jauns kontaktu _saraksts..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Saglabāt kā VKarti..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Pārsūtīt kontaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Pārsūtīt kontaktus"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Sūtīt vēstuli kontakta_m"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Sūtīt vēstuli saraksta_m"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Sūtīt vēstuli kontaktie_m"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "Kopē_t uz adresu grāmatu..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "Pār_vietot uz adresu grāmatu..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Izgiez_t"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:555
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3152 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "I_evietot"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Jebkura kategorija"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1804
 msgid "Print cards"
 msgstr "Drukāt kartes"
 
@@ -3021,7 +3018,7 @@ msgid "Company Phone"
 msgstr "Kompānijas telefons"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:723
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-pasts"
@@ -3071,7 +3068,7 @@ msgid "Manager"
 msgstr "Menedžeris"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobilais telefons"
 
@@ -3080,7 +3077,7 @@ msgid "Nickname"
 msgstr "Iesauka"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Piezīme"
 
@@ -3089,7 +3086,7 @@ msgid "Office"
 msgstr "Birojs"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organizācija"
 
@@ -3267,89 +3264,68 @@ msgstr "Izvēlētais"
 msgid "Has Cursor"
 msgstr "Ir kursors"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Atvēr saiti pārlūkprogrammā"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "Kopēt saites dislokāciju"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Sūtīt jaunu vēstuli..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Kopēt _epasta adresi"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(karte)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "karte"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:701
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Saraksta locekļi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-pasts"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Pozīcija"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Video Čats"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Video konference"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefons"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fakss"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "darbs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Mājas Lapa"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
-msgstr "Tīmekļa žurnāls"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Tīkla žurnāls"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "personīgs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:719
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Amats"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Mājaslapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:758
-msgid "Blog"
-msgstr "Tīkla žurnāls"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3380,7 +3356,7 @@ msgstr "Nav definēti lietotāja kontakti"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
@@ -3405,7 +3381,7 @@ msgstr "Protokols nav atbalstīts"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2385
 msgid "Canceled"
 msgstr "Atsaukts"
 
@@ -3538,7 +3514,7 @@ msgid "Error adding list"
 msgstr "Kļūda pievienojot sarakstu"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Kļūda pievienojot kontaktu"
 
@@ -3555,7 +3531,7 @@ msgid "Error removing list"
 msgstr "Kļūda izņemot sarakstu"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Kļūda dzēšot kontaktu"
 
@@ -3577,7 +3553,7 @@ msgstr[2] ""
 "%d kontaktu atvēršana atvērs %d jaunus logus.Vai jūs tiešām vēlaties attēlot "
 "visus šos kontaktus?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3586,15 +3562,15 @@ msgstr ""
 "%s jau eksistē\n"
 "Vai tu vēlies to pārrakstīt?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "Pārrakstīt"
 
 #. 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakts"
@@ -3602,49 +3578,49 @@ msgstr[1] "kontakti"
 msgstr[2] "kontaktu"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Izvēlēties adrešu grāmatu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "saraksts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Pārvietot kontaktu uz"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Kopēt kontaktu uz"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Pārvietot kontaktus uz"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Kopēt kontaktus uz"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Vairākas VKartes"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKarte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Kontaktinformācija"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s kontaktinformācija"
@@ -3740,12 +3716,12 @@ msgstr "Evolution VCard importēšana"
 msgid "Print envelope"
 msgstr "Drukāt aploksni"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Drukāt kontaktus"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Drukāt kontaktu"
 
@@ -3794,7 +3770,7 @@ msgstr "Formāts"
 #: ../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-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Galvene"
@@ -3898,7 +3874,7 @@ msgstr "Ēnojums"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -3989,8 +3965,7 @@ msgid "Export in asynchronous mode"
 msgstr "Exportēt nesinhronā režīmā"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "Kāršu skaits vienā izejas failā nesinhronajā režīmā, pēc noklusējuma skaits "
 "100."
@@ -4000,8 +3975,7 @@ msgid "NUMBER"
 msgstr "SKAITS"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Komandrindas argumentu kļūda,lūdzu lietot --help opciju, lai redzētu "
 "palīdzību."
@@ -4059,8 +4033,7 @@ msgstr ""
 "atjaunota."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr "Visa informācija šajā žurnālā tiks dzēsta un nevar tikt atjaunota."
 
 #: ../calendar/calendar.error.xml.h:5
@@ -4071,24 +4044,20 @@ msgstr "Visa informācija par šīm tikšanām tiks dzēsta un nevar tikt atjaun
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Visa informācija par šiem uzdevumiem tiks dzēsta un nevar tikt atjaunota."
+msgstr "Visa informācija par šiem uzdevumiem tiks dzēsta un nevar tikt atjaunota."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "Visa informācija par šo tikšanos tiks dzēsta un nevar tikt atjaunota."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
-msgstr ""
-"Visa informācija par šo žurnāla ierakstu tiks dzēsta un nevar tikt atjaunota."
+msgstr "Visa informācija par šo žurnāla ierakstu tiks dzēsta un nevar tikt atjaunota."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Visa informācija par šo tikšanos tiks dzēsta un nevar tikt atjaunota."
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4105,8 +4074,7 @@ msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo tikšanos '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '{0}'?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
@@ -4114,8 +4082,7 @@ msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo tikšanos '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '{0}'?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
@@ -4126,17 +4093,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo tikšanos?"
 
 #: ../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 "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo žurnāla ierakstu?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo sanāksmi?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo uzdevumu?"
 
@@ -4158,7 +4122,7 @@ msgstr "Dzēst kalendāru '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "Delete memo list '{0}'?"
-msgstr "Dzēst atgādņu sarakstu '{0}'?"
+msgstr "Dzēst pierakstu sarakstu '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:26
 msgid "Delete task list '{0}'?"
@@ -4189,8 +4153,7 @@ msgstr ""
 "apstiprināt šo uzdevumu."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-pasta uzaicinājumi tiks nosutīti visiem dalībniekiem un atļaut viņiem "
 "atbildēt."
@@ -4201,7 +4164,7 @@ msgstr "Kļūda ielādējot kalendāru"
 
 #: ../calendar/calendar.error.xml.h:34
 msgid "Error loading memo list"
-msgstr "Kļūda ielādējot atgādņu sarakstu"
+msgstr "Kļūda ielādējot sarakstu"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
@@ -4277,8 +4240,7 @@ msgstr "Evolution uzdevumi ir negaidīti apstājušies darboties."
 
 #: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
-msgstr ""
-"Kalendārs nav uzstādīts tā, lai to varētu lietot bez interneta pieejas."
+msgstr "Kalendārs nav uzstādīts tā, lai to varētu lietot bez interneta pieejas."
 
 #: ../calendar/calendar.error.xml.h:47
 msgid "The calendar you have selected is read-only"
@@ -4326,8 +4288,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties nosūtīt atsaukumu visiem dalībniekiem?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties nosūtīt atsaukumu visiem dalībniekiem?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
@@ -4339,13 +4300,11 @@ msgstr "Vai jūs vēlaties nosūtīt šo uzdevumu visiem dalībniekiem?"
 
 #: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
-"Vai jūs vēlaties nosūtīt atjaunotu tikšanās informāciju visiem dalībniekiem?"
+msgstr "Vai jūs vēlaties nosūtīt atjaunotu tikšanās informāciju visiem dalībniekiem?"
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
-"Vai jūs vēlaties nosūtīt atjaunotu uzdevumu informāciju visiem dalībniekiem?"
+msgstr "Vai jūs vēlaties nosūtīt atjaunotu uzdevumu informāciju visiem dalībniekiem?"
 
 #: ../calendar/calendar.error.xml.h:62
 msgid ""
@@ -4417,8 +4376,8 @@ msgstr "Sadalīt vairāku dienu notikumus:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Nevarēju sāknēt evolution-data-server"
 
@@ -4452,12 +4411,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Nevar ierakstīt pilot darāmo sarakstu aplikācijas bloku"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "Calendar and Tasks"
 msgstr "Kalendārs un uzdevumi"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1319
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalendāri"
 
@@ -4487,7 +4446,7 @@ msgstr "Evolution Kalendāra komponents"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
-msgstr "Evolution atgādņu komponents"
+msgstr "Evolution Atgādnes komponents"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
@@ -4505,12 +4464,12 @@ msgid "Memos"
 msgstr "Atgādnes"
 
 #: ../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/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/exchange-operations/exchange-folder.c:592
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4530,17 +4489,17 @@ msgstr "_Uzdevumi"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Kalendāra trauksmes ziņojumu serviss"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minūte"
 msgstr[1] "minūtes"
 msgstr[2] "minūšu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4550,7 +4509,7 @@ msgstr[0] "stunda"
 msgstr[1] "stundas"
 msgstr[2] "stundu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:275
 msgid "Start time"
 msgstr "Sākuma laiks"
 
@@ -4561,8 +4520,8 @@ msgstr "Tikšanās"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:882
 msgid "Location:"
@@ -4574,16 +4533,16 @@ msgstr "Snaudas _laiks:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "R_ediģēt"
 
@@ -4595,31 +4554,32 @@ msgstr "_Snauda"
 msgid "location of appointment"
 msgstr "tikšanās vieta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Kopsavilkums nav pieejams."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Atrašanās vieta nav pieejama."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Jums ir %d trauksmes ziņojumi"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4631,7 +4591,7 @@ msgstr ""
 "nokonfigurēta nosūtīt epastu. Evolution tā vietā attēlos\n"
 "normālu atgādinātāja dialoga logu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4648,7 +4608,7 @@ msgstr ""
 "\n"
 "Vai jūs patiešām vēlaties laist šo programmu?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Neprasīt vairāk man par šo programmu."
 
@@ -4717,10 +4677,8 @@ msgid "Calendars to run alarms for"
 msgstr "Kalendāri kuriem uzstādīt trauksmes"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Krāsa, ar ko zīmēt Marcusa Braina Līknes laika joslā (tukša pēc noklusējuma)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Krāsa, ar ko zīmēt Marcusa Braina Līknes laika joslā (tukša pēc noklusējuma)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -4751,102 +4709,90 @@ msgid "Default reminder value"
 msgstr "Noklusētā atgādinātāja vērtības"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Notikuma gradients"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Notikuma caurspīdība"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Brīva/aizņemta servera adrese"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Brīva/aizņemta veidnes adrese"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Notikumu gradients kalendāra skatos."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Slēpt izpildītos uzdevumus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Paslēpt uzdevumu mērvienības"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Paslēpt uzdevumu vērtību"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Horizontālais paneļa novietojums"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Stunda, kurā darba diena beidzas 24 stundu formātā no 0 līdz 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Stunda, kurā darba diena sākas 24 stundu formātā no 0 līdz 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervāli, kas tiek rādīti Dienu un Darba Nedēļu skatījumos, minūtēs."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Pēdējais trauksmes laiks"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Serveru adrešu saraksts priekš brīvās/aizņemtās publicēšanas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Markusa Braina Līkne"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Markusa Braina Līknes Krāsa - Dienas Skatījums"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Markusa Braina Līknes Krāsa - Laika josla"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minūte, kurā darba diena beidzas no 0 līdz 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minūte, kurā darba diena sākas no 0 līdz 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Mēneša skatījuma paneļa horizontālā atrašanās vieta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Mēneša skatījuma paneļa vertikālā atrašanās vieta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Mērvienību skaits lai noteiktu noklusēto atgādinātāju."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Mērvienību skaits lai zinātu, kā dzēst uzdevumus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Nokavētie uzdevumu krāsa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4854,7 +4800,7 @@ msgstr ""
 "Horizontālā paneļa atrašanās vieta starp datu navigācijas kalendāra un "
 "uzdevumu sarakstu, kamēr neatrodas mēneša skatījumā, pikseļos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4862,15 +4808,7 @@ msgstr ""
 "Horizontālā paneļa atrašanās vieta starp skatījumu un datu navigācijas "
 "kalendāra un uzdevumu sarakstu mēneša skatījumā, pikseļos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Vertikālā paneļa atrašanās vieta pikseļos, starp kontaktu un sarakstu "
-"skatiem un priekšskates lauku."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4878,7 +4816,7 @@ msgstr ""
 "Vertikālā paneļa atrašanās vieta uzdevumu sarakstu un uzdevuma "
 "priekšskatījuma paneli, pikseļos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4886,7 +4824,7 @@ msgstr ""
 "Vertikālā paneļa atrašanās vieta starp skatījumu un datu navigācijas "
 "kalendāra un uzdevumu sarakstu mēneša skatījumā, pikseļos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4894,65 +4832,65 @@ msgstr ""
 "Vertikālā paneļa atrašanās vieta starp datu navigācijas kalendāra un "
 "uzdevumu sarakstu, kamēr neatrodas mēneša skatījumā, pikseļos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmas kuras nav atļautas izpildei trauksmes paziņojumos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Rādīt RSVP lauku notikuma/uzdevuma/satikšanās redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Rādīt Lomas lauku notikuma/uzdevuma/satikšanās redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Rādīt tikšanās beigu laikus nedēļas un mēneša skatos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Rādīt kategorijas lauku notikuma/uzdevuma/satikšanās redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Rādīt ekrāna trauksmes paziņojumus paziņojumu joslā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Rādīt statusa lauku notikuma/uzdevuma/satikšanās redaktorā"
 
-#: ../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.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Rādīt \"Priekšskatījuma\" paneli"
 
-#: ../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.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Rādīt \"Priekšskatījuma\" paneli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Rādīt laika joslas lauku notikumu/tikšanās redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Rādīt tipa lauku notikuma/uzdevuma/satikšanās redaktorā"
+msgstr "Rādīt tipu lauku notikuma/uzdevuma/satikšanās redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Parādīt nedēļu numurus datuma navigātorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Šodien iz_pildāmo darbu krāsa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Vertikālā uzdevumu paneļa pozīcijā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4961,7 +4899,7 @@ msgstr ""
 "URL veidne ko lietot kā brīvo/aizņemto datu atkāpsistēmā, %u ir aizvietos "
 "lietotāja daļa no pasta adreses un %d ir aizvietos ar domēnu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4969,64 +4907,53 @@ msgstr ""
 "Noklusētā laika zona ko lieto datums un laiks kalendārā, kā nepārtulkotu "
 "Olsena laika zonas datubāzes atrašanās vietu piemēram\"Amerika/Ņujorka\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Laika vienības"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Laiks kad pēdējā trauksme ir bijusi time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Laika zona"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Notikumu caurspīdība kalendāra skatos (vērtība no 0 līdz 10, pēc noklusējuma "
-"opaque)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24 stundu laika formāts"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Noklusētā atgādinātāja vienības, \"minūtes\".\"stundas\" vai \"dienas\"."
+msgstr "Noklusētā atgādinātāja vienības, \"minūtes\".\"stundas\" vai \"dienas\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Vienības lai noteiktu kad jāslēpj uzdevumi \"minūtes\".\"stundas\" vai "
 "\"dienas\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Nedēļas sākums"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr ""
-"Nedēļas diena ar kuru sākas nedēļa, no Svētdienas (0) līdz Sestdienai (6)."
+msgstr "Nedēļas diena ar kuru sākas nedēļa, no Svētdienas (0) līdz Sestdienai (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Lietot vai nelietot paziņojuma ikonu, lai parādītu trauksmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Dzēšot tikšanos vai uzdevumu, prasīt tam apstiprinājumu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Izstrīpojot tikšanos vai uzdevumu, prasīt tam apstiprinājumu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5034,85 +4961,74 @@ msgstr ""
 "Saspiest nedēļas nogales mēnēša skatā, kas ieliek Sestdienas un Svētdienas "
 "vienas nedēļas dienas vietā."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Rādīt tikšanos beigu laikus nedēļas un mēneša skatos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Zīmēt Markusa Baina Līniju (pašreizējā laika līnija) kalendārā."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Paslēpt izpildītos uzdevumus uzdevumu skatā."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Uzlikt noklusēto atgādinājumu apmeklējumiem."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Parādīt RSVP lauku notikumu/uzdevumu/tikšanos redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Parādīt kategoriju lauku notikumu/tikšanos redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Parādīt lomu lauku notikumu/uzdevumu/tikšanos redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Parādīt statusa lauku notikumu/uzdevumu/tikšanos redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Parādīt laiku 24 stundu formātā tā vietā lai lietotu am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Parādīt Laika zonas lauku notikumu/tikšanos redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Parādīt tipa lauku notikumu/uzdevumu/tikšanos redaktorā"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Rādīt nedēļas numurus datuma navigātorā."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-msgid "Whether to use daylight savings time while displaying events."
-msgstr ""
-"Vai izmantot pulksteņu pārgriešanu dienasgaismas taupīšanai rādot notikumus."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Darba dienas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Darba dienas beigu stunda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Darba dienas beigu minūte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Darba dienas sākuma stunda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Darba dienas sākuma minūte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "dienasgasmas taupīšanas laiks"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Kopsavilkums satur"
@@ -5121,15 +5037,15 @@ msgstr "Kopsavilkums satur"
 msgid "Description contains"
 msgstr "Apraksts satur"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentāri satur"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Atrašanās vieta satur"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Neatbilstoši"
 
@@ -5141,10 +5057,10 @@ msgid "Print"
 msgstr "Drukāt"
 
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:727
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2099
-#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
@@ -5170,10 +5086,10 @@ msgstr "Dzēš notikumus vecākus par"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "dienas"
 
@@ -5181,90 +5097,89 @@ msgstr "dienas"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:253
+#: ../calendar/gui/calendar-component.c:235
 #: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Tīmeklī"
 
-#: ../calendar/gui/calendar-component.c:271 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Dzimšanas dienas & gadadienas"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:277
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Laikapstākļi"
 
-#: ../calendar/gui/calendar-component.c:554
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "Jau_ns kalendārs"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Kļūda uzlabojot kalendāru."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-"Nav iespējams atvērt kalendāru '%s' lai ievietotu notikumus un tikšanās"
+msgstr "Nav iespējams atvērt kalendāru '%s' lai ievietotu notikumus un tikšanās"
 
-#: ../calendar/gui/calendar-component.c:1173
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nav pieejams kalendārs notikumu un tikšanos ievietošanai"
 
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Kalendāra avota atlasītājs"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Jauna tikšanās"
 
-#: ../calendar/gui/calendar-component.c:1490
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "Tikš_anās"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Jauna sanāksme"
 
-#: ../calendar/gui/calendar-component.c:1498
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "Sanāksm_e"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Izveidot jaunu sanāksmes pieprasījumu"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Jauns ieraksts visas dienas tikšanās"
 
-#: ../calendar/gui/calendar-component.c:1506
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Visas dienas t_ikšanās"
 
-#: ../calendar/gui/calendar-component.c:1507
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Ievietot jaunu ierakstu visas dienas tikšanās"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Jauns Kalendārs"
 
-#: ../calendar/gui/calendar-component.c:1514
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Kale_ndārs"
 
-#: ../calendar/gui/calendar-component.c:1515
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Izveidot jaunu kalendāru"
 
@@ -5416,25 +5331,26 @@ msgid "A_dd"
 msgstr "P_ievienot"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Trauksmes"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "Ieteikt automāti_sku piesaistnes attēlošanu"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../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 "Ieteikt automātisku piesaistnes attēlošanu"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Piesaistīt failu(s)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Atzīmētie kalendāri priekš trauksmēm"
 
@@ -5454,13 +5370,11 @@ 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 un %d tiks aizvietots ar lietotāju un domēnu no e-pasta adreses.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u un %d tiks aizvietots ar lietotāju un domēnu no e-pasta adreses.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Trauksmes</span>"
 
@@ -5469,7 +5383,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">noklusēti brīvais/aizņemtais serveris</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Vispārējs</span>"
@@ -5486,31 +5400,27 @@ msgstr "<span weight=\"bold\">Laiks</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Darba nedēļa</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Pielāgot lai tau_pītu dienasgaismu"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Diena _beidzas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Attēlot"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:586
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Brīvs/Aizņemts"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Piekdiena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5520,13 +5430,13 @@ msgstr ""
 "Stundas\n"
 "Dienas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5544,225 +5454,226 @@ msgstr ""
 "Sestdiena\n"
 "Svētdiena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "S_v"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Sesdiena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Select the calendars for alarm notification"
 msgstr "Atzīmēt kalendārus priekš trauksmes ziņošanai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Sh_ow a reminder"
 msgstr "Pa_rādīt atgādinājumu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Show week _numbers in date navigator"
 msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Svēdiena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_asks due today:"
 msgstr "Šodien izpildāmie uz_devumi:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "T_hu"
 msgstr "Ce_t"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Template:"
 msgstr "Veidne:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Ceturdiena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Laika _zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Time format:"
 msgstr "Laika formāts:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Trešdiena"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Wee_k starts on:"
 msgstr "N_edēļa sākas ar:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Work days:"
 msgstr "Darba dienas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_12 hour (AM/PM)"
 msgstr "_12 stundu (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_24 hour"
 msgstr "_24 stundu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Prasīt apstiprinājumu, kad dzēš priekšmetus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Compress weekends in month view"
 msgstr "_Saspiest nedēļas mēneša skatā"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Day begins:"
 msgstr "_Diena sākas:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Fri"
 msgstr "_Piek"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Hide completed tasks after"
 msgstr "_Slēpt izpildītos uzdevumus pēc"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Mon"
 msgstr "_Pir"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Overdue tasks:"
 msgstr "_Nokavētie uzdevumi:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Sat"
 msgstr "_Ses"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Show appointment end times in week and month view"
 msgstr "_Parādīt tikšanos beigu laikus nedēļas un mēneša skatos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Time divisions:"
 msgstr "_Laikadales:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Tue"
 msgstr "_Otr"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Wed"
 msgstr "_Tre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "before every appointment"
 msgstr "pirms katras tikšanās"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Kopē_t kalendāra saturu lokāli darbībai atsaistes režīmā"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Kopēt kalendāra saturu lokāli atslēgtības operācijai"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Kopēt Uzdevuma saraksta saturu lokāli darbībai atsaistes režīmā"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Kopēt Uzdevuma saraksta saturu lokāli atslēgtības operācijai"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Kopēt atgādņu saraksta saturu lokāli darbībai atsaistes režīmā"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Kopēt memo saraksta saturu lokāli atslēgtības operācijai"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "K_rāsa:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Uzdevumu saraksts"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
-msgstr "Atgādņu saraksts"
+msgstr "Memo saraksts"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Kalendāra rekvizīti"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Jauns kalendārs"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Uzdevumu saraksta rekvizīti"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
-msgstr "Jauns atgādņu saraksts"
+msgstr "Jauns memo saraksts"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Pievienot kalendāru"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Pievienot uzdevumu sarakstu"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "Pievienot k_alendāru"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "Pievienot uzdevumu s_arakstu"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "_Atsvaidzināt:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5783,8 +5694,7 @@ msgstr "Šis žurnāla ieraksts ir izdzēsts."
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  jūs esat veicis izmaiņas. Aizmirst šīs izmaiņas un aizvērt redaktoru?"
+msgstr "%s  jūs esat veicis izmaiņas. Aizmirst šīs izmaiņas un aizvērt redaktoru?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
@@ -5806,8 +5716,7 @@ msgstr "Žurnāla ieraksts tika izmainīts."
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt redaktoru?"
+msgstr "%s  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt redaktoru?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
@@ -5839,15 +5748,15 @@ msgstr " (Līdz "
 msgid "Due "
 msgstr "Līdz"
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Pievienots ziņojums - %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:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5855,14 +5764,14 @@ msgstr[0] "Pievienots ziņojums"
 msgstr[1] "Pievienoti ziņojumi"
 msgstr[2] "Pievienotu ziņojumu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Pārvietot"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Atcelt _vilkt"
 
@@ -5870,7 +5779,7 @@ msgstr "Atcelt _vilkt"
 msgid "Could not update object"
 msgstr "Nevarēju atjaunināt objektu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5883,98 +5792,98 @@ msgid "Hide Attachment _Bar"
 msgstr "Paslēpt Piesaistnes _joslu"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Parādīt Piesaistnes _joslu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Izņemt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Rekvizīti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Pievienot piesaitni..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2262
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Parādīt piesaistnes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Spiediet atstarpes taustiņu lai pārslēgtos uz piesaistnes joslu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Rediģēt tikšanos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sanāksme - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tikšanās - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Nozīmētais uzdevumu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:310
 msgid "attachment"
 msgstr "piesaistne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Izmaiņas. izdarītas šajā priekšmetā, varētu tikt atceltas, ja atjauninājums "
 "ierodas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Nav iespējams lietot pašreizējo versiju!"
 
@@ -5990,10 +5899,6 @@ msgstr "Nevar atvērt galamērķi"
 msgid "Destination is read only"
 msgstr "Galamērķis ir ar atļauju tikai lasīt"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Dzest šo informāciju no citu saņēmēju pasta kastēm?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Notikums nevar tikt izdzēsts sakarā ar corba kļūdu"
@@ -6055,11 +5960,11 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt delegātu"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:559
 msgid "Appoint_ment"
 msgstr "Tikš_anās"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:563
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Atkārtošanās"
@@ -6070,7 +5975,7 @@ msgid "This event has alarms"
 msgstr "Šim notikumam ir trauksmes"
 
 #: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6163,19 +6068,24 @@ msgid "Customize"
 msgstr "Pielāgot"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: ../calendar/gui/dialogs/event-page.c:2963
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
-#: ../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:1691
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1507 ../widgets/misc/e-dateedit.c:1721
 msgid "None"
 msgstr "Nekas"
 
@@ -6192,7 +6102,8 @@ msgid "15 minutes before appointment"
 msgstr "15 minūtes pirms tikšanās"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "Apme_klētāji..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6213,12 +6124,16 @@ msgstr "A_praksts:"
 msgid "Event Description"
 msgstr "Notikums Apraksts"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+msgid "Locat_ion:"
+msgstr "Lokāc_ija:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Ko_psavilkums:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Alarm"
 msgstr "_Trauksmes"
 
@@ -6286,7 +6201,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Statuss"
 
@@ -6307,18 +6222,18 @@ msgid "Organizer"
 msgstr "Organizators"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizators:"
 
 #: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
 msgid "Memo"
-msgstr "Atgādne"
+msgstr "Memo"
 
 #: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "Nav iespējams atvērt atgādnes iekš '%s'."
+msgstr "Nav iespējams atvērt memo iekš '%s'·"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
@@ -6328,41 +6243,41 @@ msgstr "_Grupa:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
-msgstr "_Atgādnes saturs:"
+msgstr "_Memo saturs:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendāra opcijas</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Pievienot jaunu kalendāru"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Kalendārs grupa"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Kalendāra atrāsanās vieta"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Kalendārs vārds"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Uzdevumu saraksta opcijas</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Pievienot jaunu uzdevumu sarakstu"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Uzdevumu saraksta grupa"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Uzdevumu saraksta vārds"
 
@@ -6379,10 +6294,8 @@ msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Jūs modificējat atkārtojošos uzdevumu. Ko jūs vēlētos modificēt?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
-"Jūs modificējat atkārtojošos žurnāla ierakstu. Ko jūs vēlētos modificēt?"
+msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "Jūs modificējat atkārtojošos žurnāla ierakstu. Ko jūs vēlētos modificēt?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6509,7 +6422,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Izņēmumi</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>Pirmsapskate</b>"
 
@@ -6574,15 +6487,15 @@ msgstr "<span weight=\"bold\">Statuss</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Pabeigts"
 
 #: ../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:1029
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Augsts"
 
@@ -6591,20 +6504,20 @@ msgstr "Augsts"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2379
 msgid "In Progress"
 msgstr "Tiek izpildīts"
 
 #: ../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:1027
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Zems"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normāls"
 
@@ -6612,7 +6525,7 @@ msgstr "Normāls"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2376
 msgid "Not Started"
 msgstr "Nav iesākts"
 
@@ -6625,7 +6538,7 @@ msgid "Stat_us:"
 msgstr "Stat_uss:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Nedefinēts"
 
@@ -6634,7 +6547,7 @@ msgid "_Date completed:"
 msgstr "_Izpildes datums:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioritāte:"
 
@@ -6660,10 +6573,6 @@ msgstr "Izpildes datums ir nepareizs"
 msgid "Unable to open tasks in '%s'."
 msgstr "Nevar atvērt uzdevumu iekš '%s'·"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "Apme_klētāji..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Kategor_ijas..."
@@ -6684,46 +6593,46 @@ msgstr "Laika zona:"
 msgid "_Due date:"
 msgstr "Izpil_des datums:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Brīvs/Aizņemts K_alendārs</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Izdošanas biežums</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>Izdošanas _vieta</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Brīvs/aizņemts izdošanas uzstādijumi"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "Ik_dienas"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Pašrocīga"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_Parole:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "_Atcerēties paroli"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_Lietotājvārds:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_iknedēļas"
 
@@ -6806,14 +6715,14 @@ msgid "%s for an unknown trigger type"
 msgstr "%s nezināma trigera tipam"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikšķināt, lai atvērtu %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:166
 msgid "Memo:"
-msgstr "Atgādne:"
+msgstr "memo:"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
@@ -6826,7 +6735,7 @@ msgstr "Nenosaukts"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kopsavilkums:"
 
@@ -6854,24 +6763,24 @@ msgstr "Prioritāte:"
 
 #: ../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-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 "Apraksts:"
 
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Publisks"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Privāts"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Konfidenciāls"
 
@@ -6885,19 +6794,19 @@ msgstr "Sākuma datums"
 
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Kopsavilkums"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Brīvs"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Aizņemts"
 
@@ -6911,17 +6820,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Jā"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nē"
@@ -6932,21 +6841,21 @@ msgstr "Nē"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1716
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:669
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Periodisks"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Asignēts"
 
@@ -6954,7 +6863,7 @@ msgstr "Asignēts"
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2110
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Atzīmēt mapi lai saglabātu atzīmētās piesaistnes..."
 
@@ -6963,9 +6872,9 @@ msgstr "Atzīmēt mapi lai saglabātu atzīmētās piesaistnes..."
 msgid "untitled_image.%s"
 msgstr "nenosaukts_attēls.%s"
 
-#: ../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:846
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Saglabāt kā..."
 
@@ -6983,79 +6892,74 @@ msgstr "_saglabāt atzīmēto"
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Dzēšu izvēlētos objektus"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Atjaunināt objektus"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Saglabāt kā..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Jauns _uzdevums"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Atvērt _tīmekļa lappusi"
 
-#: ../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:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7063,52 +6967,44 @@ msgstr "Atvērt _tīmekļa lappusi"
 msgid "_Print..."
 msgstr "_Drukāt..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "I_zgriezt"
 
-#: ../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:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Ievietot"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Nozīmēt uzdevumu"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Pārsūtīt kā iKalendāru"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Atzīmēt kā Izpildītus"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Atzīmēt izvēlētos uzdevumus kā izpildītus"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Atzīmēt kā nepabeigtu"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Atzīmēt izvēlētos uzdevumus kā nepabeigtus"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Dzēst izvēlētos uzdevumus"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
@@ -7118,7 +7014,7 @@ msgstr "Klikšķināt, lai pievienotu uzdevumu"
 msgid "% Complete"
 msgstr "% izpildīts"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Izpildīts"
 
@@ -7143,101 +7039,105 @@ msgstr "Sākuma datums"
 msgid "Task sort"
 msgstr "Uzdevumu kārtošana"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Pārvietoju priekšmetus"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopēju priekšmetus"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "J_auna tikšanās..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Jauns visas di_enas notikums"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Jauna _sanāksme"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Jauns _uzdevums"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Pašreizējais Skats"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Izvēlēties Š_odienu"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "Izvēlētie_s datumu..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Kopē_t uz kalendāru..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Pār_vietot uz kalendāru..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Deliģēt sanāksmi..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Plānot sanāksmi..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Pārsūtīt kā iKalendāru..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Atbildēt"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "_Atbildēt visiem"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Padarīt šo gadījumu pārvietoja_mu"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Izdzēst š_o gadījumu"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Izdzēst visus g_adījumus"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizators: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizators: %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:2053 ../calendar/gui/print.c:2349
 #, c-format
 msgid "Location: %s"
 msgstr "Atrašanās vieta: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Laiks: %s %s"
@@ -7267,7 +7167,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minūšu sadaļas"
@@ -7278,21 +7178,19 @@ msgstr "%02i minūšu sadaļas"
 #. 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:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1538
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:858
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "pm"
@@ -7409,22 +7307,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Accepted"
 msgstr "Apstiprināts"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Tentatively Accepted"
 msgstr "Pagaidām akceptēts"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Declined"
 msgstr "Noliegts"
 
@@ -7435,10 +7333,8 @@ msgid ""
 msgstr "Sanāksme ir atcelta,bet tas varētu būt neredzams jūsu kalendārā"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Uzdevums ir atcelta,bet tas varētu būt neredzams jūsu uzdevumu sarakstā"
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Uzdevums ir atcelta,bet tas varētu būt neredzams jūsu uzdevumu sarakstā"
 
 #: ../calendar/gui/e-itip-control.c:1305
 #, c-format
@@ -7635,15 +7531,14 @@ msgstr "Šī atbilde nav no pašreizējā apmeklētāja. Pievienot kā apmeklēt
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
+msgstr "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
 #: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1080
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts, tāpēc ka priekšmets vairāk "
@@ -7692,35 +7587,48 @@ msgid "Send Latest Information"
 msgstr "Sūtīt pēdīgo informāciju"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--uz--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalendāra ziņojums"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Datums:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Ielādēju kalendāru"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Ielādēju Kalendāru..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Servera ziņojums:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "datums-sākums"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "datums-beigas"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Vadošās personas"
@@ -7739,65 +7647,65 @@ msgid "Resources"
 msgstr "Resursi"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individuāli"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupa"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Resurss"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Istaba"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Krēsls"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Pieprasītais dalībnieks"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Iespējamais dalībnieks"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Nepiedalās"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Pieprasa darbību"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Pagaidu"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1713
 msgid "Delegated"
 msgstr "Deleģēts"
 
@@ -7806,14 +7714,14 @@ msgstr "Deleģēts"
 msgid "Attendee                          "
 msgstr "Apmeklētājs                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Procesā"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7821,86 +7729,86 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Neatrodas Birojā"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Nav Informācijas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Apmeklētāji..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pcijas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Parādīt _tikai darba stundas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Parādīt ama_zinātu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Atjaunināt brīvs/aizņemts informāciju"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Autoizvēle"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Visi cilvēki un resursi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Visi _cilvēki un ciens resurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Piep_rasītie cilvēki"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Pieprasītie cilvēki un _viens resurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Sākuma laiks:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "B_eigu laiks:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Dzēst izvēlētās atgādnes"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klikšķiniet šeit, lai pievienotu atgādni"
 
@@ -7908,8 +7816,8 @@ msgstr "Klikšķiniet šeit, lai pievienotu atgādni"
 msgid "Memo sort"
 msgstr "Atgādņu veids"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2543
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7925,9 +7833,9 @@ msgstr "Ielādēju atgādnes"
 #: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
-msgstr "Atver atgādnes no %s"
+msgstr "Atveru atgādnes  uz %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Dzēšam izvēlētos objektus..."
 
@@ -7936,20 +7844,20 @@ msgstr "Dzēšam izvēlētos objektus..."
 msgid "Enter the password for %s"
 msgstr "Ievadiet paroli priekš %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Ielādēju uzdevumus"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atvērt uzdevumus uz %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Izpildam uzdevumus..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Iztīru"
 
@@ -7960,43 +7868,42 @@ msgstr "Izvēlieties laika joslu"
 #. 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:329 ../calendar/gui/print.c:1522
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:781
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Atjaunoju pieprasījumu"
 
-#: ../calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "_Patvaļīgs skats"
 
-#: ../calendar/gui/gnome-cal.c:2223
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_Saglabāt patvaļīgu skatu"
 
-#: ../calendar/gui/gnome-cal.c:2228
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Definēt skatus..."
 
-#: ../calendar/gui/gnome-cal.c:2388
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ielādēju tikšanās %s"
 
-#: ../calendar/gui/gnome-cal.c:2407
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ielādēju uzdevumus %s"
 
-#: ../calendar/gui/gnome-cal.c:2511
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Atveru %s"
 
-#: ../calendar/gui/gnome-cal.c:3384
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Dzēšu"
 
@@ -8110,10 +8017,6 @@ msgstr "iKalendāra informācija"
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "Jau_ns atgādņu saraksts"
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
@@ -8127,7 +8030,7 @@ msgstr[2] "%d atgādņu"
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
-msgstr[0] ", %d izdzēsts"
+msgstr[0] ", %d izvēlēta"
 msgstr[1] ", %d izvēlētas"
 msgstr[2] ", %d izvēlētu"
 
@@ -8150,11 +8053,11 @@ msgstr "Atgādņu avota selektors"
 
 #: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
-msgstr "Jauna atgādne"
+msgstr "Jaunas atgādne"
 
 #: ../calendar/gui/memos-component.c:1156
-msgid "Mem_o"
-msgstr "Mem_o"
+msgid "_Memo"
+msgstr "Atgād_ne"
 
 #: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
@@ -8162,11 +8065,11 @@ msgstr "Izveidot jaunu atgādni"
 
 #: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
-msgstr "Jaunus atgādņu saraksts"
+msgstr "Jaunu atgādņu saraksts"
 
 #: ../calendar/gui/memos-component.c:1164
-msgid "Memo li_st"
-msgstr "Atgādņu _saraksts"
+msgid "Memo l_ist"
+msgstr "Atgādņu sara_ksts"
 
 #: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
@@ -8508,14 +8411,14 @@ msgid "New task list"
 msgstr "Jauns uzdevumu saraksts"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "Uzdevumu sara_ksts"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Izveidot jaunu uzdevumu sarakstu"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8527,11 +8430,11 @@ msgstr ""
 "\n"
 "Tiešām izdzēst šos uzdevumus?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Neprasiet man vēlreiz."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Drukāt uzdevumus"
 
@@ -9107,7 +9010,7 @@ msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerika/Ņujorka"
 
@@ -10108,25 +10011,25 @@ msgid "Pacific/Yap"
 msgstr "Klusais/Yap"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
+#: ../widgets/misc/e-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
+#: ../widgets/misc/e-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
+#: ../widgets/misc/e-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:974
 msgid "Attachment Bar"
 msgstr "Pielikuma josla"
 
@@ -10134,43 +10037,43 @@ msgstr "Pielikuma josla"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:242 ../widgets/misc/e-attachment.c:258
+#: ../widgets/misc/e-attachment.c:446 ../widgets/misc/e-attachment.c:462
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nevar piesaistīt failu %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:250 ../widgets/misc/e-attachment.c:454
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nevar piesaistīt failu %s: nav parasts fails"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Piesaistnes rekvizīti"
 
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Faila nosaukums:"
 
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME tips:"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Publicējuma mērķis"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Izvēlieties mapi, kur novietot ziņojumu."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Uz adrešu grāmatu"
 
@@ -10181,45 +10084,45 @@ msgstr "Uz adrešu grāmatu"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "A_tibldēt-uz:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "N_o:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "T_emats:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Kam:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules adresātus"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ievadiet adreses kuras saņems vēstules kopiju"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10230,15 +10133,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Ziņot uz:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "spiediet šeit, lai izvēlētos mapi uz kuru ziņot"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Publicēts uz:"
 
@@ -10246,75 +10149,72 @@ msgstr "Publicēts uz:"
 msgid "A_ttach"
 msgstr "Pievieno_t"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Pievienot pielikumu"
 
-#: ../composer/e-msg-composer.c:827
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:828
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Nevar parakstīt izejošo vēstuli: paraksta sertifikāts nav uzstādīts šim "
 "kontam"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr ""
-"Nevar iekodēt izejošo vēstuli: kodēšanas sertifikāts nav uzstādīts šim kontam"
+msgstr "Nevar iekodēt izejošo vēstuli: kodēšanas sertifikāts nav uzstādīts šim kontam"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Slēpt pielikum_a joslu"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Rādīt pielikum_a joslu"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Nezināms iemesls"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Nevar atvērt failu"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Nenosaukta vēstule"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Atvērt failu"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Autoģenerēts"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Para_ksts:"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Rakstīt vēstuli"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr ""
-"<b>(Sacerētājs satur neteksta vēstules ķermeni, kas nevar tikt rediģēts.)<b>"
+msgstr "<b>(Sacerētājs satur neteksta vēstules ķermeni, kas nevar tikt rediģēts.)<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -10459,7 +10359,7 @@ msgstr "_Saglabāt vēstuli"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10527,14 +10427,18 @@ msgid "Yes, Change Status"
 msgstr "Jā, nomainīt statusu"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Saņemu e-pastu</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Sūtu e-pastu</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10545,33 +10449,33 @@ msgstr ""
 "jūsu sūtītais ziņojums ir izlasīts, un norādīt, ko darīt, kad kāds cits "
 "pieprasa vēstules izlasīšanas apstiprinājumu no Jums.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Vienmēr nosūtiet vēstules izlasīšanas apstiprinājumu"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr ""
 "Jautājiet man, vai es vēlos nosūtīt atpakaļ vēstules izlasīšanas "
 "apstiprinājumu"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Nekad nesūtiet atpakaļ vēstules izlasīšanas apstiprinājumu"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Izlasīšanas apstiprinājumi"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Pieprasīt izlasīšanas apstiprinājumu visām vēstulēm, ko es sūtu"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Ja vien vēstule tikusi sūtīta abonentu sarakstam, nevis man personīgi"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10579,7 +10483,7 @@ msgstr ""
 "Kad jūs saņemat e-pastu ar izlasīšanas apstiprinājuma pieprasījumu, ko "
 "Evolution vajadzētu darīt?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10587,28 +10491,28 @@ msgstr ""
 "Fails ar šadu nosaukumu jau eksistē.\n"
 "Pārrakstīt to?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Pārrakstīt failu?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution kļūda "
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution brīdinājums"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution informācija"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution jautājums"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Iekšēja kļūda, nezināma kļūda '%s' pieprasīts"
@@ -10710,24 +10614,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Izvēlieties laiku ar ko salīdzināt"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Izvēlieties failu"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Svarīgs"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Darāmais"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Vēlāk"
 
@@ -10776,11 +10680,11 @@ msgid "Include threads"
 msgstr "Iekļaut pavedienus"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Ienākošais"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Izejošais"
 
@@ -10876,7 +10780,7 @@ msgstr "atpakaļ"
 msgid "months"
 msgstr "mēneši"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "sekundes"
 
@@ -10909,15 +10813,12 @@ msgid "Composer Preferences"
 msgstr "Sacerētāja preferences"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Šeit konfigurējiet pasta preferences, ieskaitot drošību un vēstuļu attēlošanu"
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Šeit konfigurējiet pasta preferences, ieskaitot drošību un vēstuļu attēlošanu"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Šeit konfigurējiet pareizrakstības pārbaudi, parakstus un vēstuļu sacerētājam"
+msgstr "Šeit konfigurējiet pareizrakstības pārbaudi, parakstus un vēstuļu sacerētājam"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -10947,22 +10848,22 @@ msgstr "Evolution epasta redaktora konfigurācijas panelis"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution epasta uzstādījumu panelis"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pasts"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Pasta konti"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Pasta preferences"
 
@@ -10989,7 +10890,7 @@ msgstr ""
 "un atķeksējiet rūtiņu, ja peikrītat tiem\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Izvēlēties mapi"
 
@@ -10997,11 +10898,11 @@ msgstr "Izvēlēties mapi"
 msgid "Ask for each message"
 msgstr "Jautāt pēc katra paziņojuma"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identitāte"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Saņem epastu"
 
@@ -11009,16 +10910,16 @@ msgstr "Saņem epastu"
 msgid "Automatically check for _new mail every"
 msgstr "Automātiski parbaudīt jau_no pastu"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Sūtu epastu"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Noklusētie"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Drošība"
@@ -11032,11 +10933,11 @@ msgstr "Saņemšanas opcijas"
 msgid "Checking for New Mail"
 msgstr "Pārbaudu jauno pastu"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontu redaktors"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontu asistents"
 
@@ -11056,22 +10957,22 @@ msgid "[Default]"
 msgstr "[Noklusētais]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Aktivizēts"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Konta nosaukums"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protokols"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Bezvārda"
 
@@ -11241,7 +11142,7 @@ msgstr "nav"
 msgid "is not Flagged"
 msgstr "nav atzīmēts"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Draza"
@@ -11250,7 +11151,7 @@ msgstr "Draza"
 msgid "Junk Test"
 msgstr "Drazas tests"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Marķējums"
 
@@ -11294,7 +11195,7 @@ msgstr "Spēlēt skaņu"
 msgid "Read"
 msgstr "Lasīt"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Adresāti"
 
@@ -11322,11 +11223,11 @@ msgstr "atgriež mazāu kā"
 msgid "Run Program"
 msgstr "Palaist programmu"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Rezultāts"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Sūtītajs"
 
@@ -11358,11 +11259,11 @@ msgstr "sākas ar"
 msgid "Stop Processing"
 msgstr "Apturēt procesēšanu"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Temats"
@@ -11376,42 +11277,10 @@ msgstr "Noņemt statusu"
 msgid "<b>Then</b>"
 msgstr "<b>Tad</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "_Izveidot meklējuma Mapi no meklējuma..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Visus ziņojumus"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Neizlasīti ziņojumi"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Nav marķējums"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Lasītās vēstules"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Nesenās vēstuli"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Pēdējo 5 dienu ziņojums"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Vēstules ar pielikumu"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Vēstule nav draza"
-
 #. 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
@@ -11430,7 +11299,7 @@ msgstr[1] "Neizlasīti ziņojumi:"
 msgstr[2] "Neizlasītu ziņojumu:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Mapes uzstādījumi"
 
@@ -11447,7 +11316,7 @@ msgid "Folder _name:"
 msgstr "Mapes _nosaukums:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Meklēt mapi"
 
@@ -11462,7 +11331,7 @@ msgstr "Melnraksti"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Iesūtne"
 
@@ -11478,77 +11347,77 @@ msgstr "Nosūtītās"
 msgid "Loading..."
 msgstr "Ielādēju..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Pasta mapes koks"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Pārvietoju mapi %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopēju mapi %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Pārvietoju ziņojumu uz mapi  %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopēju paziņojumu uz mapi %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nevar nomest ziņojumus virsējā līmeņa glabātuvē"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopēt uz mapi"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Pārvietot uz mapi"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanēju mapes \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Skatīt"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Atvērt jau_nā logā"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Kopēt..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Pārvietot..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "Jau_na mape..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "Pā_rsaukt..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Iztīrīt atkritumus"
 
@@ -11557,14 +11426,13 @@ msgstr "_Iztīrīt atkritumus"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopēju no '%s' uz '%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opēt"
 
@@ -11586,168 +11454,158 @@ msgstr "Izveidot mapi"
 msgid "Specify where to create the folder:"
 msgstr "Norādīt, kur izveidot mapi:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā jaunu ziņojumu..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Atjaunot"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Pārvietot uz _mapi..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz mapi..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Atzīmēt _kā lasītu"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _nelasītas"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "Atzīmēt kā ne _mazsvarīgu"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Atzīmēt kā _drazu"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Atzīmēt kā _vērtīgs"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Atzīmēt priekš turpinājuma..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Etiķete"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Nekas"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Karodziņš pabei_gts"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Notīrī_t karodziņu"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Izveidot no_teikumu no vēstules"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Meklēt mapi priekš Tēma_s"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Meklēt mapi priekš Sū_tītājiem"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Meklēt mapi priekš Saņē_mējiem"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Meklēt mapi priekš Adresātu saraksta"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz sub_jektu"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz sūtītāju"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz saņēmējiem"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz adresātu sarakstu"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Noklusētais"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Drukāt vēstuli"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Nespēju saņemt vēstuli"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "Kopēt saites dislokāciju"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Izveidot meklēšana_s mapi"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_No šīs adreses "
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "Uz šo adresi"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikšķināt uz vēstuli %s"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Kliksķiniet, lai parādītu/paslēptu adreses"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:502
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Atbilstība: %d"
 
-#: ../mail/em-format-html-display.c:645
-msgid "Find:"
-msgstr "Meklēt:"
-
-#: ../mail/em-format-html-display.c:676
-msgid "M_atch case"
-msgstr "Precīzs _meklējums"
-
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Neparakstīts"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11755,22 +11613,21 @@ msgstr ""
 "Šī vēstule nav digitāli parakstīta. Nav garantija ka šī vēstule ir "
 "autentiska."
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Derīgs paraksts"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
-msgstr ""
-"Šī vēstule ir digitāli parakstīta, ļoti ticams ka šī vēstule ir autnetiska."
+msgstr "Šī vēstule ir digitāli parakstīta, ļoti ticams ka šī vēstule ir autnetiska."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Nederīgs paraksts"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11778,11 +11635,11 @@ msgstr ""
 "Šī ziņojuma parakstu nevar pārbaudīt, iespējams tas ir izmainīts sūtīšanas "
 "procesā."
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Derīgs paraksts, nevar pārbaudīt sūtītāju"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11790,11 +11647,11 @@ msgstr ""
 "Šī vēstule ir parakstīta ar autentisku parakstu,bet nosūtītājs šai vēstulei "
 "nevar tikt pārbaudīts."
 
-#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Nešifrēts"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11802,11 +11659,11 @@ msgstr ""
 "Šī vēstule nav šifrēta. Šīs vēstules saturs var tikt apskatīts pārsūtīšanas "
 "laikā."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Šifrēts, vāji. "
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11816,22 +11673,21 @@ msgstr ""
 "grūti, bet neneiespējami apskatīt šīs vēstules saturu noteiktā laika "
 "intervālā."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Šifrēts"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr ""
-"Šī vēstule ir šifrēta. Nepiederošiem būs grūti apskatīt šīs vēstules saturu."
+msgstr "Šī vēstule ir šifrēta. Nepiederošiem būs grūti apskatīt šīs vēstules saturu."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Šifrēts, spēcīgi"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11841,57 +11697,57 @@ msgstr ""
 "personai būs ļoti grūti apskatīt šīs  vēstules saturu noteiktā laika "
 "intervālā."
 
-#: ../mail/em-format-html-display.c:1037 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Skatīt sertifikātu"
 
-#: ../mail/em-format-html-display.c:1052
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Sertifikāts vēl nav apskatāms"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Pabeikts %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Nokavētie:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "par %B %d, %Y, %l:%M %P"
 
-#: ../mail/em-format-html-display.c:1442
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Skatīt iekļauti"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "Slēpt"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Pielāgot _platumam"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Rādīt _oriģinālo Izmēru"
 
-#: ../mail/em-format-html-display.c:1864 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Piesaistne"
 
-#: ../mail/em-format-html-display.c:2071
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Izvēlēties mapi kurā saglabāt piesaistnes..."
 
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Saglabāt Izvēlētos..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2185
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
@@ -11899,15 +11755,15 @@ msgstr[0] "%d piesaist_ne"
 msgstr[1] "%d piesaist_nes"
 msgstr[2] "%d piesaist_ņu"
 
-#: ../mail/em-format-html-display.c:2192 ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Saglabāt"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "S_aglabāt visu"
 
-#: ../mail/em-format-html-display.c:2264
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Nav piesaistnes"
 
@@ -11921,94 +11777,94 @@ msgstr "Lapa no %d līdz %d"
 msgid "Retrieving `%s'"
 msgstr "Atgūstu '%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Derīgs paraksts, bet nevar noteikt sūtītāju"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Sliktformēta ārējā ķermeņa daļa."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Norāde uz lokālu failu (%s) atļautu saitē \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Norāde uz lokālu failu (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Norāde uz attālinātiem datiem (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formatēju vēstuli"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "No"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Atbildēt-Uz"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Pastnieks"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Datums"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Intereškopa"
@@ -12058,7 +11914,7 @@ msgstr "Vienreiz nedēļā"
 msgid "Once per month"
 msgstr "Vienreiz mēnesī"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12070,47 +11926,47 @@ msgstr ""
 "\n"
 " Lūdzu uzgaidiet kamēr Evolution sakārto tavas mapes..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nevar izveidot jaunu mapi ' %s':' %s'"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Nevar nokopēt mapi ' %s' uz '%s':'%s'"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nevar sameklēt eksistējošas pastakastītes iekš '%s':%s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nespēju atvērt vecā POP servera datus'%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Neizdevās atvērt POP3 datu direktoriju '%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nevarēju nokopēt POP3 servera datus '%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Neizdevās izveidot lokālo pasta glabātuvi '%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Neizdevās izveidot lokālo pasta mapi iekš '%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12127,6 +11983,10 @@ msgstr "_Atbildēt sūtītājam"
 msgid "Reply to _List"
 msgstr "Atbildēt uz _sarakstu"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Atvēr saiti pārlūkprogrammā"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Sūtīt jaunu vēstuli..."
@@ -12139,45 +11999,45 @@ msgstr "Pievienot _adrešu grāmatu"
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Šī krātuve neatbalsta pasūtīšanu vai arī tā nav ieslēgta."
 
-#: ../mail/em-subscribe-editor.c:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Pierastītās"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Mape"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Lūdzu izvēlieties serveri."
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Vairs nekad šo ziņu nerādīt."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Vēstules filtrs"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "vēstule"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Saglabāt vēstuli..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Pievienot dresi"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Vēstule no %s"
@@ -12186,7 +12046,7 @@ msgstr "Vēstule no %s"
 msgid "Search _Folders"
 msgstr "Meklēt _mapi"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Meklēt mapes sakni"
 
@@ -12219,110 +12079,82 @@ msgid "Composer Window default width"
 msgstr "Vēstules komponista loga noklusētais platums"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Saspiest KAM/CC/BCC adreses"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Saspiest KAM/CC/BCC adreses līdz address_count mainīgajā norādītajam adrešu "
-"skaitam."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Vēstules komponista noklusētā simbolu virkne"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Vēstules komponista noklusētā simbolu virkne."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Vēstuļu attēlošanas noklusētā simbolu virkne"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Vēstuļu attēlošanas noklusētā simbolu virkne."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Noklusētais pārsūtīšanas stils"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Vēstules komponista loga noklusētais augstums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Vēstules loga noklusētais augstums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Dialoga loga noklusētais augstums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Noklusētais atbildes stils"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Vēstules komponista loga noklusētais platums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Vēstules loga noklusētais platums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Dialoga loga noklusētais platums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Rādīt kļūdaina vārda paziņojumus uzreiz pie ievades."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Iztukšot atkritumu mapes pie iziešanas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Iztukšot  visas atkritumu mapes pie iziešanas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Ieslēgt caret režīmu, lai lasot vēstules būtu redzams kursors."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Aktivizēt vai deaktivizet automātiskās pabeigšanas funkciju meklēšanai"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Aktivizēt sānu joslas meklēšanas funkciju, lai jūs varētu sākt interaktīvu "
-"meklešanu vienkārši sākot rakstīt tekstu. Šīs funkcijas pielietojums ir "
-"tāds, ka sākot rakstīt kādas mapes nosaukumu iezīmējums automātiski pārlec "
-"uz atbilstoso mapes nosaukumu."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Ieslēgt/izslēgt caret režīmu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Vēstuļu saraksta izvēlnes augstums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Vēstuļu saraksta izvēlnes augstums."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12330,15 +12162,7 @@ msgstr ""
 "Ja lietotājs mēģina atvērt vairāk par 10 vēstulēm vienlaicīgi, tad paprasīt "
 "vai viņš to tiešām vēlas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Ja ir aktivizēts \"Pirmskates\" panelis rādīt to malu-pie-malas nevis "
-"vertikāli."
-
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12348,28 +12172,23 @@ msgstr ""
 "mime tipi, kas parādās šajā sarakstā, kas ved uz bonobo komponenšu skatītāju "
 "GNOME mime tipu datubāzē var tikt izmantoti, lai atēlotu saturu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-"Tas aktivizē/deaktivizē paziņojumu, kad tiek iezīmētas vairāki ziņojumi."
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Pēdējā reizē, kad tika tīrīts atkritumu grozs "
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Virsrakstu saraksts, ar tiem pievienotajām krāsām"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Apstiprināto licenču saraksts"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Pasta kontu saraksts"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12377,11 +12196,11 @@ msgstr ""
 "Evolution vēstuļu komponistam zināmo kontu saraksts. Saraksts iekļauj "
 "apakšdirektorijas zem /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Saraksts, kurā atspoguļoti citi virsraksti un vai tie ir aktivizēti."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12389,19 +12208,19 @@ msgstr ""
 "Evolution vēstuļu komponistam zināmo kontu saraksts. Saraksts iekļauj "
 "virknes ar saturu nosaukums:krāsa, kur krāsa izmanto HTML hex kodējumu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "mime tipu saraksts, lai pārbaudītu bonobo komponenšu skatītājus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Protokolu nosaukumu saraksts, kuru licences ir apstiprinātas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Ielādēt atēlus priekš HTML caur http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12411,102 +12230,97 @@ msgstr ""
 "neielādēt atēlus no tīkla 1 - Ielādēt atēlus pastā no kontaktiem 2 - Vienmēr "
 "ielādēt attēlus no tīkla"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Reģistrēt filtra darbības"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Reģistrēt filtra darbības atbilstošajā log failā."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Log faila uz log filtru darbības"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Log faila uz log filtru darbības."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Atzīmēt kā Apskatīts pēc noteikta laika intervāla"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Atzīmēt kā Apskatīts pēc noteikta laika intervāla."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Atzīmēt citātus vēstulē \"Piemērs\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Atzīmēt citātus vēstulē \"Piemērs\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Vēstules loga noklusētais augstums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Vēstules loga noklusētais platums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Vēstules attēlošanas stils (\"standarts\"pilni virsraksti\", \"neko nemainīt"
 "\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimālais dienu skaits, kad tīrīt atkritumu grozu izejot"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimālais laiks, kad tīrīt atkritumu grozu izejot skaitot dienās."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Skaņas fails, kas ziņo par jaunu vēstuli"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Veids, kā tiek ziņots par jaunu vēstuli"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "KAM/CC/BCC laikos rādāmo adrešu skaits"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Prasīt apstiprinājumu, ja vēstules temats ir atstāts tukšs "
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prasīt apstiprinājumu, ja lietotājs mēģina izņemt mapi."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prasīt apstiprinājumu, ja lietotājs mēģina sūtīt vēstuli, kurai nav norādīts "
 "temats."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Prasīt apstiprinājumu, ja lietotājs tiek izņemts"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Prasīt apstiprinājumu, ja lietotājs aizpilda tikai Bcc sadaļu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Ja lietotājs mēģina atvērt vairāk par 10 vēstulēm vienlaicīgi, tad paprasīt "
 "vai viņš to tiešām vēlas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12514,105 +12328,91 @@ msgstr ""
 "Prasīt apstiprinājumu, ja lietotājs mēģina sūtīt HTML vēstules kontaktiem, "
 "kuri to nevēlas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Prasīt apstipriājumu, ja lietotājs mēģina sūtīt vēstules tikai ar norādītiem "
 "bcc adresātiem."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Prasīt apstiprinājumu, ja lietotājs mēģina sūtīt HTML vēstules kontaktiem, "
 "kuri to nevēlas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "Prasīt apstiprinājumu, ja tiek atzīmētas vairākas vēstules"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Atpazīt linkus tekstā un aizvietot tos."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Atpazīt tekstā 'smaidiņus' un aizvietot tos ar attēliem."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Pārbaudīt ienākošo pastu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Sūtīt pastu HTML formātā pēc noklusējuma"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Sūtīt pastu HTML formātā pēc noklusējuma."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Rādīt kustīgos attēlus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Rādīt kustīgos attēlus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vēstuļu sarakstā dzēstās vēstules rādīt ar pārsvītrotu svītru."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Rādīt izdzēstās vēstules vēstuļu sarakstā"
 
-#: ../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 "Rādīt sūtītāja epastu vēstuļu saraksta vēstuļu kolonā"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Rādīt sūtītāja epastu vēstuļu saraksta vēstuļu kolonā"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Atskaņot skaņas failu, kad tiek saņemts jauns pasts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Lieto lietot;aja izvēlēto paziņojuma veidu, saņemot jaunu vēstuli."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Pareizrakstības pārbaude pa vienai rindai"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Dialoga loga noklusētais augstums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Dialoga loga noklusētais platums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Beigu fonts"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Pēdējā reize, kad tika tīrīti atkritumi."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Vēstuļu attēlošanas beigu fonts"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Mainīgā platums attēlojot vēstules"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12623,124 +12423,104 @@ msgstr ""
 "un norāda kad tie būtu jārāda. XML struktūras formāts ir &lt;rādīt "
 "virsrakstu&gt; - rādīt virsrakstu vēstules skatā."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Šis uzstāda noklusēto adrešu skaitu, kas tiks rādīts vēstules saraksta "
-"skatā, pēc šīm adresēm tiek rādrīts '...'."
-
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Ievietot vēstuļu sarakstu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Ievietot vēstuļu sarakstu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Ievietot vēstuļu sarakstu, pēc temata"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Pēc cik ilga laika atzīmēt vēstuli kā Redzēta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Pēc cik ilga laika atzīmēt vēstuli kā Redzēta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID rinda par noklusēto kontu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Lietot Spamaiznīcinātāju un klientu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Lietot Spamaiznīcinātāju un klientu (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Lietot izvēlētos fontus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Lietot izvēlētos fontus attēlojot vēstuli"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Lietot tikai lokāli pieejamos spama testus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Lietot tikai lokāli pieejamos spama testus. (ne DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Lietot malu-pie-malas vai plato izklājumu"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Fontu platums"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Skatīt/Bcc izvēlne ir pārbaudīta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Skatīt/Bcc izvēlne ir pārbaudīta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Skatīt/Cc izvēlne ir pārbaudīta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Skatīt/Cc izvēlne ir pārbaudīta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Skatīt/No izvēlnes izvēlne ir pārbaudīta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Skatīt/No izvēlnes izvēlne ir pārbaudīta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Skatīt/Sūtīt uz izvēlne ir pārbaudīta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Skatīt/Sūtīt uz izvēlne ir pārbaudīta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Skatīt/Atbildēt izvēlne ir pārbaudīta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Skatīt/Atbildēt izvēlne ir pārbaudīta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "Padot vai nepadot vēstules, kuras nesatur atbildes pazīmes virsrakstā."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Vēstuļu saraksta paneļā platums"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Vēstuļu saraksta paneļā platums."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Importējam Elm datus"
@@ -12772,15 +12552,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importēt Berkeley Pasta kastīšu formāta folderus"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importējam `%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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Lūdzu uzgaidiet"
 
@@ -12967,31 +12747,31 @@ msgstr[0] "%d nelasīta"
 msgstr[1] "%d nenosūtītas"
 msgstr[2] "%d nenosūtītu"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Jauna pasta vēstule"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Pasta vēstule"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Sacerēt jaunu pasta vēstuli"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Jauna Vēstuļu Mape"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "Vēstuļu _Mape"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Izveidot jaunu vēstuļu mapi"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Kļūda atjaunojot Vēstuļu uzstādījumus vai folderus."
 
@@ -13019,220 +12799,226 @@ msgstr "_Darāmais"
 msgid "_Later"
 msgstr "_Vēlāk"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "...."
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " _Pārbaudīt atbalstītos tipus"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL vēl nav atbalstīts šajā Evolution versijā</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>_Paraksti</b> "
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Valodas</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Tas padarīs filtru drošāku, bet lēnāku</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Lietotāja konta informācija</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Identitātes Tips</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Identitāte</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Vēstuļu komponists</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfigurācija</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Noklusētā uzvedība</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Izdzēst pastu</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Attēlotie Pasta_Virsraksti</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filtru Opcijas</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Apzīmējumi un krāsas</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Ielādē Attēlus</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Vēstulēs Attēlošana</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Vēstules fonti</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Vēstules saņēmējs</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Paziņojums Par Jaunu Pastu</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Papildus Informācija</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Iespējas</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">\"Ļoti labs drošums</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Drukātie Fonti</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Obligātā informācija</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Garantētais MIME</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Drošība</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Nosūtītās un melnraksta vēstules</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Servera Konfigurācija</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Lietotāja Kontu pārvaldība"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Pievienot _Jaunu parakstu..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Pievienot _Skriptu"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad tiek izmantots šis konts"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Vienmēr kodēt un to pašu, sūtot kodētu pastu"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Vienmēr nosūtīt kopiju (Cc) uz:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Vienmēr _nosūtīt aklo kopiju (bcc) uz:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Kodējot, vienmēr _uzticēties atslēgām manā atslēgu sarakstā"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "_Vienmēr kodēt uz to pašu, sūtot kodētu pastu"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Pievienot oriģinālo vēstuli"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Automātiski ievietot _smaidiņu attēlus"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltijas (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltijas (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "_Ziņot ar skaņas signālu, kad saņemts jauns pasts"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Rakst_zīmju kopa:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr " _Pārbaudīt atbalstītos tipus"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Pārbaudīt ienākošo pastu"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Pārbaudīt pareizrakstību kāmēr es _rakstu"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Atzīmēt ienākošās vēstulēs, kuras ir spams"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Tīrs"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "_Tīrs"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Krāsa _kļūdainajiem vārdiem:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Krāsas"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "Apstiprināt, _iztīrot mapi"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13248,135 +13034,134 @@ msgstr ""
 "\n"
 "Klikšķināt \"Apstiprināt\" lai saglabātu jūsu uzstādījumus."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "Nokl_usētais"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Noklusētais rakstzīmju ko_dējums:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Necitēt oriģinālo vēstuli"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Izdarīts"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Melnrakstu _mape:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "A_ktivizēt"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Epasta konti"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "Epasta _adrese:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Iztukšot atkritumu mapes pie i_ziešanas"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikāta kriptēšana:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Vienmēr pārrakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Fiksē_ts fontu platums:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fiksē_ts-platums:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Fontu rekvizīti"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formatēt vēstules _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "Pilns vār_ds:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML pasts"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Galvene"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Izcelt _citātus ar"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "Ie_kļaut attālinātu testu"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Iekļaut"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Valodas plāksne"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Pasta konfigurācija"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Pasta galvenes plāksne"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašanās vieta"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Vēstuļu sacerētājs"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr ""
-"Piezīme: jums nepieprasīs ievadīt paroli līdz jūs savienosieties pirmo reizi"
+msgstr "Piezīme: jums nepieprasīs ievadīt paroli līdz jūs savienosieties pirmo reizi"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Or_ganizācija:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Atslēgas ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Spēlēt skaņas failu, kad tiek saņe_mts jauns pasts"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13384,7 +13169,7 @@ msgstr ""
 "Lūdzu ieraxtiet aprakstošo vārdu priekš šī konta norādītajā apakšlaukā.\n"
 "Šis vārds tiks lietots tikai priekš uzdevuma."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13393,7 +13178,7 @@ msgstr ""
 "pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet servisa "
 "piegādātājam."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13403,115 +13188,115 @@ msgstr ""
 "tikt neaizpildīti, kāmēr jūs nevēlaties iekļaut šo informāciju epastā ko "
 "nosūtāt."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Lūdzu izvēlieties starp sekojošām opcijām"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citēt oriģinālo vēstuli"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citēts"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "A_tcerēties paroli"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "At_bildēt-Uz:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Atcerēties _paroli"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "I_zvēlēties..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "S_tandarta fonts:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "Izvēlēties..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "Izvēlieties HTML fiksēta platuma fontu"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "Izvēlieties HTML fiksēta platuma fontu drukāšanai"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "Izvēlieties HTML mainīga platuma fontu"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "Izvēlieties skaņas failu"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "Sūtīt vēstuli uz saraksti:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Sūtot pastu"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Nosūtīto ziņu _mape:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "Servera _tips: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Ķēdē paš_parakstīts sertifikāts:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_Paraksts:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Paraksti"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Parakstu tabula"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Norādiet _faila nosaukumu:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Pareizrakstības pārbaude"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "T_ips: "
 
-#: ../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."
@@ -13519,7 +13304,7 @@ msgstr ""
 "Valodu saraksts šeit parāda tikai tās valodas, kurām jums ir uzstādīta "
 "vārdnīca."
 
-#: ../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"
@@ -13529,7 +13314,7 @@ msgstr ""
 "paraksts. Nosaukums, kuru norādīsiet, tiks\n"
 "izmantots tikai attēlošanas nolūkos. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13537,15 +13322,15 @@ msgstr ""
 "Ievadiet nosaukumu, kādu jūs gribētu piešķirt šim kontam.\n"
 "Piemēram: \"Darbs\" vai \"Personīgi\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "M_ainīgs platums:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13555,71 +13340,67 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākamais\" lai sāktu. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "Pievienot p_arakstu"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Vienmēr ielādēt attēlus no interneta"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neziņojiet _man, kad ierodas jauns pasts"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Neārrakstīt _sanāksmju pieprasījumus (savietojamībai ar Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Pārsūtīšanas stils:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Ielādēt bildes pastā no kontaktiem"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Padarīt šo par manu noklusēto kontu"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā lasītas pēc"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Nekad neielādēt attēlus no internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Ceļš:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "_Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Norādīt, kad sūta vēstules ar tukšu subjekta rindu"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Atbildes stils:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skripts:"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "_Rādīt kustīgos attēlus"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Saspiest KAM / Cc / Bcc galvenes līdz"
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Lietot drošu savienojumu:"
@@ -13629,21 +13410,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "Lie_tot tos pašus fontus ko citās aplikācjās"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "adreses"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "krāsa"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "apraksts"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "...."
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Atrast mapes avotus</b>"
@@ -13657,63 +13430,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Šifrēšana</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Visām akīvajām attālinātajām mapēm"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Visām lokālajām un aktīvajām attālinātajām mapēm"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Visām lokālām mapēm"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "Abstraktais _testpiemērs"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Pa_beigts"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "_Meklēt:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Meklēt vēstulē"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Karogs sekojumam"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Pārvaldītījumu mape"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Licences nosacījumi"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Nav izvēlēts"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "S_erveris:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Slepenā informācija"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Specifiskas mapes"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13721,51 +13478,67 @@ msgstr ""
 "Vēstules, kuras jūs izvēlējaties sekojumam, ir sakārtotas zemāk.\n"
 "Lūdzu izvēlieties sekojuma darbību zem \"Karogs\" izvēlnes."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Apstiprināta licence"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Līdz:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "Ka_rodziņš:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Parakstīties"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "A_tzīmēt šo lai apstiprinātu licences vienprātigumu"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Atrakstīties"
 
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "tikai specifiskas mapes"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "ar visām akīvajām attālinātajām mapēm"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "ar visām lokālajām un aktīvajām attālinātajām mapēm"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "ar visām lokālām mapēm"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Ehotestējam %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Filtrējam mapi"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Pasta saņemšana"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neizdevās saglabāt izejošos filtrus: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13774,100 +13547,100 @@ msgstr ""
 "Neizdevās pievienot pie %s: %s\n"
 "Tā vietā pievienoju lokālajai `Nosūtītie' mapei."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neizdevās saglabāt pastu 'Nosūtītie' mapē: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam %d. vēstuli no %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Neizdevās nosūtīt %d no %d vēstulēm"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Pārtraukts."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Saglabāju vēstuli mapē"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveru mapi %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveru glabātuvi %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemu mapi %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Izsvītroju un saglabāju kontu '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Uzglabāt kontu '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Atjauninu mapi"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Iztīru mapi"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Iztukšojam atkritumus iekš '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Lokālās mapes"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemu vēstuli %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -13875,7 +13648,7 @@ msgstr[0] "Saņemu %d vēstuli"
 msgstr[1] "Saņemu %d vēstules"
 msgstr[2] "Saņemu %d vēstules"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -13883,7 +13656,16 @@ msgstr[0] "Saglabāju %d vēstuli"
 msgstr[1] "Saglabāju %d vēstules"
 msgstr[2] "Saglabāju %d vēstules"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Nevaru izveidot izejas failu: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13892,11 +13674,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Saglabājam piesaistni"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13905,69 +13687,60 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojos no %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojos ar %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Pārbaudam servisu"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Atsaucu..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Sūtīt un saņemt pastu"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "Atcelt _Visu"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Atjauninu..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Gaidu..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Pārbaudam jauno pastu"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Ievadiet %s paroli"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Ievadiet paroli"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
@@ -13980,7 +13753,7 @@ msgid "Enter a name for this signature."
 msgstr "Ievadiet nosaukumu šim parakstam."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nosaukums:"
 
@@ -14023,19 +13796,17 @@ msgstr "Atjauninu meklēšanas mapes priekš: '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Atjauninu meklēšanas mapes priekš '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Izvēlēties meklēšanas mapi"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Jauna meklēšanas mape"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr ""
-"Mape ar nosaukumu &quot;{1}&quot; jau eksistē. Lūdzū lietojiet citu vārdu."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr "Mape ar nosaukumu &quot;{1}&quot; jau eksistē. Lūdzū lietojiet citu vārdu."
 
 #: ../mail/mail.error.xml.h:2
 msgid ""
@@ -14074,16 +13845,14 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu un visas pilnvaras?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu un visas pilnvaras?"
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu?"
 
 #: ../mail/mail.error.xml.h:10
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties atslēgt un izdzēst šo kontu?"
 
 #: ../mail/mail.error.xml.h:11
@@ -14426,11 +14195,11 @@ msgstr "Paraksts jau eksistē"
 
 #: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Sistēmas mapei vajadzīgs Evolution, lai funkcionētu pareizi un nevarētu "
-"pārsaukt, pārvietot vai izdzēst."
+"Sistēmas mapei vajadzīgs Ximian Evolution, lai funkcionētu pareizi un "
+"nevarētu pārsaukt, pārvietot vai izdzēst."
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -14494,12 +14263,10 @@ msgstr ""
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr ""
-"Ziņojumu nevar nosūtīt, jo konts, kuru jūs lietojat lai sūtītu, nav aktīvs"
+msgstr "Ziņojumu nevar nosūtīt, jo konts, kuru jūs lietojat lai sūtītu, nav aktīvs"
 
 #: ../mail/mail.error.xml.h:107
-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 "Šo ziņojumu nevar aizsūtīt, jo nav norādīts neviens saņēmējs"
 
 #: ../mail/mail.error.xml.h:108
@@ -14576,8 +14343,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Jūsu lietotājvārds, serverim &quot;{0}&quot; as &quot;{0}&quot; nepieejams."
+msgstr "Jūsu lietotājvārds, serverim &quot;{0}&quot; as &quot;{0}&quot; nepieejams."
 
 #: ../mail/mail.error.xml.h:124
 msgid "_Append"
@@ -14595,74 +14361,74 @@ msgstr "_Iztīrīt"
 msgid "_Open Messages"
 msgstr "_Atvērt vēstuli"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Redzēta"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas neredzētas vēstules"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Vairākas vēstules"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Zemākā"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Zema"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Augsta"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Augstākā"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Šodien %l:%M %p"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %I:%M %p"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2064
 msgid "Messages"
 msgstr "Vēstules"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3446
 msgid "Generating message list"
 msgstr "Izveidoju vēstuļu sarakstu"
 
@@ -14682,15 +14448,15 @@ msgstr "Atzīmta"
 msgid "Follow Up Flag"
 msgstr "Sekojuma karogs"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Oriģinālā atrašanās vieta"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Saņemts"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Sūtītie ziņojumi"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Izmērs"
@@ -14835,8 +14601,7 @@ msgstr "Automātiskie kontakti"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "_Automātiski radīt ierakstu adrešu grāmatā, atbildot uz pastu"
 
 #: ../plugins/bbdb/bbdb.c:460
@@ -14849,10 +14614,8 @@ msgstr "Tūlītējās ziņojumapmaiņas kontakti"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
-msgstr ""
-"Pereodiski sinhronizēt kontaktu informāciju un bildes ar gaim draugu sarakstu"
+msgid "Periodically synchronize contact information and images from gaim buddy list"
+msgstr "Pereodiski sinhronizēt kontaktu informāciju un bildes ar gaim draugu sarakstu"
 
 #: ../plugins/bbdb/bbdb.c:496
 msgid "Select Address book for Gaim buddy list"
@@ -14903,8 +14666,7 @@ msgstr "HTTP kalendāri"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
-msgstr ""
-"Nodrošina pamat funkcionalitāti tīmekļa izsaukumiem un http kalendāriem."
+msgstr "Nodrošina pamat funkcionalitāti tīmekļa izsaukumiem un http kalendāriem."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
@@ -14967,6 +14729,10 @@ msgstr ""
 "Testa spraudnis, kas demonstrē izlecošu logu izvēlnes spraudni, kas jums "
 "atļauj kopēt lietas uz strapliktuves."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopēt _epasta adresi"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Kopēšanas rīks"
@@ -14976,8 +14742,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Pārbaudīt vai Evolution ir noklusētais pasta sūtītājs"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Pie katras Evolution lādēšanas, pārbaudīt vai tas ir noklusētasi pasta "
 "sūtītājs."
@@ -15081,7 +14846,7 @@ msgid "Change the password for Exchange account"
 msgstr "Mainīt paroli Exchange kontam"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Mainīt paroli"
 
@@ -15154,32 +14919,29 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Paroles nesakrīt. Lūdzu ievadiet paroli atkārtoti."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "Apstiprināt paroli:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "Pašreizējā parole:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "Jaunā parole:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
-msgstr ""
-"Jūsu pašreizējās paroles termiņš ir beidzies. Lūdzu mainiet paroli tagad."
+msgstr "Jūsu pašreizējās paroles termiņš ir beidzies. Lūdzu mainiet paroli tagad."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Jūsu paroles termiņš beigsies pēc %d dienām"
 
-#. 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
 msgid "Custom"
 msgstr "Pielāgots"
 
@@ -15314,14 +15076,14 @@ msgstr "Exchange mapju koku"
 msgid "Unsubscribe Folder..."
 msgstr "Atrakstīt mapi..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Tiešām atrakstīties no mapes \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Atrakstīties no \"%s\""
@@ -15354,59 +15116,59 @@ msgstr "Pievienot lietotāju:"
 msgid "Add User"
 msgstr "Pievienot lietotāju"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Atļaujas</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Nevar izdzēst"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Nevar rediģēt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Izveidot vienības"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Izveidot apakšmapes"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Dzēst jebkuru vienību"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Dzēst paša vienības"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Rediģēt jebkuru vienību"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Rediģēt paša vienības"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Mapes kontakts"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Mapes īpašnieks"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Mape redzama"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Lasītas vienības"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Loma: "
 
@@ -15447,26 +15209,22 @@ msgid "Cannot display folders."
 msgstr "Nevar parādīt mapes."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Kļūda izpildot operāciju."
-
-#: ../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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Izmaiņas Exchange konta \"{0}\" konfigurācijā stāsies spēka pēc tam, kad jūs "
+"Izmaiņas Exchange konta konfigurācijā stāsies spēka pēc tam, kad jūs "
 "iziesiet un pārlādēsiet Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Nevareja apstiprināt autentiskumu serverī."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Nevarēja nomainīt paroli."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15476,55 +15234,55 @@ msgstr ""
 "notika nezināmā kļūda , Pārbaudiet URL, \n"
 "lietotājvārdu un paroli un mēģiniet vēlreiz."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Nevarēja savienoties ar Exchange serveri."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Nevarēja savienoties ar serveri {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Nevarēja noteikt mapes atļauju delegātiem."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Nevarēja atrast Exchange tīmekļa atmiņas sistēmu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Nevarēja atrast serveri {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Nevarēja izveidot {0} delegātu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Nevarēja nolasīt mapes atļaujas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Nevarēja nolasīt mapes atļaujas."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Nevarēja nolasīt ārpus-biroja stāvokli"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Nevarēja atjaunināt mapes atļaujas."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Nevarēja atjaunināt ārpus-biroja stāvokli"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Exchange konts ir atsaistē."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15552,28 +15310,28 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Neizdevās atjaunināt delegātus:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Mape jau eksistē"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Mape neeksistē"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Mape nepieslēgta"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15581,65 +15339,63 @@ msgstr ""
 "Ja OWA darbojas uz cita ceļa, jums tas ir jānorāda konta konfigurācijas "
 "dialogā."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Pastkastīte priekš {0} nav uz šī servera."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Pārliecinietis, ka URL ir pareizs un mēģiniet vēlreiz."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
-"Pārliecinieties, ka servera vārds ir uzrakstīts pareizi un mēģiniet vēlreiz."
+msgstr "Pārliecinieties, ka servera vārds ir uzrakstīts pareizi un mēģiniet vēlreiz."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"Pārliecinieties, ka lietotājvārds un parole ir pareizi un mēģiniet vēlreiz."
+msgstr "Pārliecinieties, ka lietotājvārds un parole ir pareizi un mēģiniet vēlreiz."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Nav konfigurēts globālais kataloga serveris šim kontam."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Nav pastkastkastīte lietotājam {0} uz {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Nav tādā lietotāja{0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Parole veiksmīgi nomainīta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Lūdzu pārlādējiet Evolution, lai izmaiņas stātos spēkā"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Lūdzu pārlādējiet Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Lūdzu izvēlieties lietotāju."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Serveris noraidīja paroli, jo tā ir pārāk nedroša."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange konts tiks atslēgts, kad jūs aizvērsiet Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange konts tiks likvidēts, kad jūs aizvērsiet Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange serveris nav savietojams ar Exchange savienotāju."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15647,7 +15403,7 @@ msgstr ""
 "Serveris darbojas ar Exchange 5.5. .Savienotājs atbalsta\n"
 "tikai uz Microsoft Exchange 2000 un 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15661,51 +15417,51 @@ msgstr ""
 "\n"
 "Vai arī jūs esat ievadījis nepareizu paroli."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Pamēģini vēlreiz ar citu paroli."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Nespēj pievienot lietotāju piekļūšanas kontrolsarakstam:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Nevar rediēt delegātus."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Nezināma kļūda uzmeklējot {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Nezināma kļūda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Nezināms tips"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Neatbalstīta operācija"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Jūs tuvojaties atvēlētās vietas limitam uz šī servera."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Jūs nevarat iecelt sevi par delegātu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Jūs esat pārsniedzis vēstuļu skaitu, ko varat glabāt uz šī servers."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Jūs varat vienīgi konfigurēt vienu vienīgu Exchange kontu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15713,7 +15469,7 @@ msgstr ""
 "Jūsu pašreizējais izmantojums ir: {0} KB. Centieties atbrīvot vietu, "
 "izdzēšot kādu vēstuli."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -15721,7 +15477,7 @@ msgstr ""
 "Jūsu pašreizējais izmantojums ir: [0} KB. Jūs nebūsiet spējīgs ne aizsūtīt, "
 "ne saņemt vēstules."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15729,19 +15485,19 @@ msgstr ""
 "Jūsu pašreizējais izmantojums ir: {0} KB. Jūs nebūsiet spējīgs aizsūtīt "
 "vēstuli, līdz neatbrīvosiet vietu, izdzēšot kādu vēstuli."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Jūsu parolei ir beidzies derīguma termiņš."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} nevar pievienot piekļuves kontrolsarakstam"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} jau ir delegāts"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} ir jau sarakstā"
 
@@ -15760,8 +15516,7 @@ msgstr "Atrakstīties no mapes \"%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 ""
-"Atļauj atatrakstīties no vēstulēm pasta mapju koka labā klikšķa izvēlnē."
+msgstr "Atļauj atatrakstīties no vēstulēm pasta mapju koka labā klikšķa izvēlnē."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -15818,7 +15573,7 @@ msgstr "Pievienojiet sūtīšanas iespējas groupwise ziņojumiem"
 
 #: ../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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Sūtīšanas parametri"
 
@@ -15834,40 +15589,40 @@ msgstr "Groupwise Iespējas"
 msgid "Accept Tentatively"
 msgstr "Akceptēt īslaicīgi"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>Lietotāji:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Ziņojums"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Koplietošanas mapes paziņošana"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Dalībnieki saņems sekojošu paziņojumu.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Kontakti..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_Pielāgot paziņojuma saturu"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Nav koplietošanā"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Koplieot ar..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Koplietošana"
 
@@ -15945,13 +15700,11 @@ msgstr "_Proxy pieteikšanās..."
 
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"Aptuvena tabulēšanas rakstzīme būs pieejama tikai, ja rēķins būs tiešsaistē."
+msgstr "Aptuvena tabulēšanas rakstzīme būs pieejama tikai, ja rēķins būs tiešsaistē."
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"Aptuvena tabulēšanas rakstzīme būs tikai pieejama, ja rēķins būs aktivizēts."
+msgstr "Aptuvena tabulēšanas rakstzīme būs tikai pieejama, ja rēķins būs aktivizēts."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
@@ -16002,7 +15755,7 @@ msgid "Select Calendar"
 msgstr "Izvēlies kalendāru"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importēt"
 
@@ -16057,120 +15810,118 @@ msgstr "Nespēj atvrt kalendāru/darāmo darbu sarakstu!"
 
 #: ../plugins/ipod-sync/sync.c:292
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Nevar atvērt Evolution kalendāru/darāmo darbu sarakstu, lai pārraidītu datus."
+msgstr "Nevar atvērt Evolution kalendāru/darāmo darbu sarakstu, lai pārraidītu datus."
 
 #: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Neizdevās ielādēt kalendāru '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Tikšanās kalendārā '%s' ir pretrunā ar šo tikšanos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Atrasta tikšanās kalendārā '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:494
 msgid "Unable to find any calendars"
 msgstr "Nevar atrast kalendārus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:501
 msgid "Unable to find this meeting in any calendar"
 msgstr "Nevar atrast tikšanos nevienā kalendārā"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:505
 msgid "Unable to find this task in any task list"
 msgstr "Nevar atrast uzdevumu uzdevemu sarakstā"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:509
 msgid "Unable to find this journal entry in any journal"
 msgstr "Nevar atrast ierakstu nevienā žurnālā"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:582
 msgid "Searching for an existing version of this appointment"
 msgstr "Meklē šīs tikšanās eksistējošo versiju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Unable to parse item"
 msgstr "Nevar noparsēt elementu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:833
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nevar aizsūtīt informāciju uz kalendāru. '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:856
+#: ../plugins/itip-formatter/itip-formatter.c:844
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Aizsūt uz kalendāru '%s' akceptētu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:848
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Aizsūti uz kalendāru '%s' kā nenoteiktu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:853
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Aizsūti uz kalendāru '%s' kā noraidītu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:858
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Aizsūti uz kalendāru '%s' kā atceltu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:951
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizators ir nodzēsis delegātus %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:958
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Aizsūtiet delegātam anulēšanas ziņu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nevar aizsūtīt delegātam anulēšanas ziņu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1045
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Apmeklētāja statuss nevar tikt atjaunināts, jo statuss ir nederīgs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nevar atjaunināt dalībnieku. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1076
 msgid "Attendee status updated"
 msgstr "Apmeklētāja statuss atjaunots"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1203
 msgid "The calendar attached is not valid"
 msgstr "Pievienotais kalendārs nav derīgs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1204
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr ""
-"Tiek apgalvots, ka ziņa satur kalendāru, bet tas nav derīgs iCalendars."
+msgstr "Tiek apgalvots, ka ziņa satur kalendāru, bet tas nav derīgs iCalendars."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "The item in the calendar is not valid"
 msgstr "Informācija kalendārā nav derīga"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1239
+#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1330
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16178,11 +15929,11 @@ msgstr ""
 "Ziņā ir ietverts kalendārs, bet kalendārs nesatur notikumus, uzevumus vai "
 "citu informāciju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 msgid "The calendar attached contains multiple items"
 msgstr "Pievienotais kalendārs satur vairākus elementus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1265
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16192,23 +15943,23 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "_Delete message after acting"
 msgstr "_Dzēsiet ziņu pēc darbības"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:2061
 msgid "Conflict Search"
 msgstr "Konflikta meklēšana"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Atlasiet kalendārus lai sameklētu tikšanos konfiktus"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Šodien"
 
@@ -16386,8 +16137,7 @@ msgstr "<b>%s</b> vēlas pievienot jau eksistējošai sanāksmei:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> vēlas saņemt jaunāko informāciju par sekojošu sanāksmi:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
@@ -16460,8 +16210,7 @@ msgstr "<b>%s</b> vēlas pievienot jau eksistējošam uzdevumam:"
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr ""
-"<b>%s</b> vēlas saņemt jaunāko informāciju par sekojošu uzdoto uzdevumu:"
+msgstr "<b>%s</b> vēlas saņemt jaunāko informāciju par sekojošu uzdoto uzdevumu:"
 
 #: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
@@ -16582,20 +16331,18 @@ msgstr "Itip formatētājs"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; ir pieteicies uz tikšanos. Vai jūs vēlaties pievienot "
-"pārstāvi &quot;{1}&quot;?"
+"pārstāvi &quot;{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Šis notikums ir deliģēts"
 
 #: ../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 ""
-"Šī atbilde nav no pašreizējā apmeklētāja. Pievienot sūtītāju kā apmeklētāju?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Šī atbilde nav no pašreizējā apmeklētāja. Pievienot sūtītāju kā apmeklētāju?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
@@ -16628,10 +16375,8 @@ msgid "No store available"
 msgstr "Veikals nav pieejams"
 
 #: ../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 ""
-"Spraudnis kurš īsteno COBRA saskarsmi lai pastam varētu piekļūst no attāluma."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr "Spraudnis kurš īsteno COBRA saskarsmi lai pastam varētu piekļūst no attāluma."
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
 msgid "Mail Remote"
@@ -16671,14 +16416,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Atvērt izvēlēto vēstuli par jaunu uzdevumu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Kontaktu saraksta ī_pašnieks"
 
 #: ../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 "Iegūt saraksta _arhīvu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Iegūt saraksta izmantošanas informāciju"
 
@@ -16700,14 +16448,17 @@ msgstr ""
 "atteikt_abonēšanu, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Sūtīt ziņojumu uz sarakstam"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Pierakstīties sarakstam"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Atrakstīties no saraksta"
 
@@ -16789,30 +16540,17 @@ msgstr "R_ediģēt vēstuli"
 msgid "_Send message"
 msgstr "Sūtīt vēstuli"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Kontaktu saraksta ī_pašnieks"
-
 #: ../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 "Sazināieties ar adresātu saraksta saimnieku kurm piedēr šis ziņojums"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Iegūt saraksta _arhīvu"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Iegūt saraksta izmantošanas informāciju"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Dabūt šī ziņojuma saraksta arhīvu"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-"Saņemt informaciju par saraksta imantojamību no kuram pieder šis ziņojums"
+msgstr "Saņemt informaciju par saraksta imantojamību no kuram pieder šis ziņojums"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
@@ -16826,24 +16564,12 @@ msgstr "Pierakstīties tajā adresātu sarakstā, kuram pieder šis ziņojums"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Atrakstīties no tā adresātu saraksta, kuram pieder šis ziņojums"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Sūtīt ziņojumu sarakstam"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Pierakstīties sarakstam"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "Atrakstīties no saraksta"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Atzīmēt visu kā lasītu"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Atzīmēt vē_stules kā lasītas"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -17089,8 +16815,7 @@ msgstr "Spamassassin surogātpasta spraudnis"
 
 #: ../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 ""
-"Spraudnis kurš ļauj uzreiz saglabāt visus piestiprinājumus vai ziņas daļas."
+msgstr "Spraudnis kurš ļauj uzreiz saglabāt visus piestiprinājumus vai ziņas daļas."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -17109,12 +16834,12 @@ msgstr "Saglabāt visus pielikumus"
 msgid "Select save base name"
 msgstr "Izvēlieties saglabāšanas bāzes vārdu"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:360
 msgid "MIME Type"
 msgstr "MIME tips"
 
-#: ../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:368
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -17224,7 +16949,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF formats (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Izvēlieties gala mērķa failu"
 
@@ -17272,19 +16997,19 @@ msgstr ""
 "\n"
 "Lūdzu klikšķiniet \"Nākošais\" pogu, lai turpinātu. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Lūdzu izvēlieties informāciju, ko jūs vēlētos importēt:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "No %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importē datus."
 
@@ -17347,16 +17072,14 @@ msgstr "Noklusētais loga platums"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-"Komponentes ID vai sinonīms, kura pēc noklusējuma būtu jārāda ielādes laikā."
+msgstr "Komponentes ID vai sinonīms, kura pēc noklusējuma būtu jārāda ielādes laikā."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Pēdējā atjauninātā konfigurācijas versija"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Ceļu saraksts folderim kuram ir jasinhronizējas ar disku ārlīnijas "
 "lietojamību"
@@ -17373,15 +17096,11 @@ msgstr "Sānjosla ir redzama"
 msgid "Skip development warning dialog"
 msgstr "Parlēkt pāri izstrādes brīdinājuma dialogam"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Startēt atsaistes režīmā"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Sānjosla ir redzama"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17389,19 +17108,19 @@ msgstr ""
 "Konfigurācijas versija priekš Evolution, ar lieliem/maziem/konfigurācijas "
 "līmeniem (piemēram \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Loga noklusētais augstums pikseļos."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Loga noklusētais platums pikseļos."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Sānjoslas noklusētais platums pikseļos."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17409,7 +17128,7 @@ msgstr ""
 "Pēdēja jauninājuma versijas konfigurācija,  ar lieliem/maziem/konfigurācijas "
 "līmeniem (piemēram \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17418,45 +17137,39 @@ msgstr ""
 "Stils ar loga pogām. Vār būt \"teksts\", \"ikonas\", \"abas\", \"rīkjosla\". "
 "If \"rīkjosla\" ir uzstadūta, pogu stils tiks noteikts ar GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Rīkjosla ir redzama"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Nav svarigi Evolution startēsies ārlīnijas režīma vai pieslēgtajā režimā."
+msgstr "Nav svarigi Evolution startēsies ārlīnijas režīma vai pieslēgtajā režimā."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Vai logam būtu jābūt makzimizētam."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Vai sānjoslai būtu jābūt redzamai."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Vai statusjoslai jabūt redzamai."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Vai rīkjoslai jabūt redzamai."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Vai bridīnājuma dialogs Evolution izstrādes versijās tiek izlaists."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Vai logu pogām ir jabūt redzamām."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Loga pogu stils"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Logu pogas ir redzamas"
 
@@ -17470,19 +17183,18 @@ msgstr "Aktīvie savienojumi"
 
 #: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
-msgstr ""
-"Klikšķiniet 'Labi', lai aizvērtu šos savienojumus un ietu atsaistes režīmā"
+msgstr "Klikšķiniet 'Labi', lai aizvērtu šos savienojumus un ietu atsaistes režīmā"
 
 #: ../shell/e-shell-folder-title-bar.c:584
 #: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Nenosaukts)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Izvēlieties importētāja tipu:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17496,11 +17208,11 @@ msgstr ""
 "Jūs varat izvēlēties \"Automātiski\", ja jūs precīzi nezināt faila tipu. "
 "Evolution mēģinās tad to noteikt jūsu vietā."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Izvēlieties šīs importēšanas galamērķi"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17512,23 +17224,23 @@ msgstr ""
 "netika atrāsti. Ja jūs gribāt\n"
 "meģināt velreiz, uzspiediet šeit \"Atpakaļ\" poga.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Fa_ila nosaukums:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Faila _tips:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importēt datus un uzstādijumus n_o vecākām programmām"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importēt _vienu failu"
 
@@ -17592,7 +17304,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "_Strādāt tiešsaistē"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Strādāt atsaistē"
 
@@ -17646,15 +17358,10 @@ msgstr "Nevar reģistrēties uz OAF"
 msgid "Configuration Database not found"
 msgstr "Uzstādījumu datubāze nav atrasta"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Jauns"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Jauns "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Jauns tests"
@@ -17706,7 +17413,7 @@ msgstr ""
 "ievešanas atjauninājumā kārtībā."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17739,7 +17446,7 @@ msgstr ""
 "Mēs ceram, ka jūs izbaudīsiet mūsu smagā darba augļus\n"
 "un mēs ar nepacietību gaidīsim jūsu atbalstu!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17747,39 +17454,35 @@ msgstr ""
 "Paldies\n"
 "Evolution Komanda\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Turpmāk vairs neatgādināt"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Sākt Evolution aktivēšanu norādītajai komponentei"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Sākt tiešsaistes režīmā"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Piespiedu kārtā aizvērt visas Evolution komponentes"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Piespiedu kārtā pār-migrēt no Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Nosūtīt visu komponenšu atkļūdošanas rezultātu uz datni."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Deaktivizēt jebkādu sparudņu ielādi."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr " - Evolution PIM un Epasta klients"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17790,8 +17493,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties aizmirst visas atcerētās paroles?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties aizmirst visas atcerētās paroles?"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
@@ -18193,8 +17895,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Jums ir šo organizāciju izsniegti sertifikāti, kas atpazīst jūs:"
 
 #: ../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 "Jūsu datnē ir sertifikāti, kas atpazīst šo sertifikātu autorus:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -18549,7 +18250,7 @@ msgid "Select All"
 msgstr "Izvēlēties visus"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Izvēlēties _visus"
@@ -18619,7 +18320,7 @@ msgstr "_Pārvietot kontaktu uz..."
 msgid "_Move Folder Contacts To"
 msgstr "_Pārvietot mapes kontaktus uz"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Jauns"
 
@@ -18680,7 +18381,6 @@ msgid "Month"
 msgstr "Mēnesis"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Nākamais"
 
@@ -18689,7 +18389,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Pārbauda drukājamo kalendāru"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Iepriekšējais"
 
@@ -18777,11 +18477,11 @@ msgstr "Izgriezt iztvērumu uz starpliktuvi"
 msgid "Paste from clipboard"
 msgstr "Ievietot no starpliktuves"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Ievietot tekstu no starpliktuves"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Ietvert visu tekstu"
 
@@ -18816,31 +18516,30 @@ msgstr "Klikšķiniet šeit, lai aplūkotu pieejamo palīdzību"
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../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_evietot"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Piesaistne..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Aizvērt"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Datne"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Palīdzība"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Ievietot"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Iespējas"
@@ -18938,11 +18637,6 @@ msgstr "Pārslēdz, kur laiks norādīts kā aizņemts"
 msgid "_Alarms"
 msgstr "_Trauksmes"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorijas"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19008,73 +18702,53 @@ msgid "F_older"
 msgstr "M_ape"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Ziņojuma _pārbaude"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Pārvietot izvēlēto mapi citā mapē"
 
 #. 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 "Nekavējoties izdzēst visas dzēstās vēstules no visām mapēm"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Meklēt m_apes"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Rādīt ziņojuma _pirmsskati"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Rādīt ziņojuma pirmsskati zem ziņojumu saraksta"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Rādīt ziņojuma pirmsskati sānu-pie-sāna ar ziņojumu sarakstu"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Parādīt vēstules pirmsapskates logu"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Pierakstīties vai atrakstīties uz/no mapēm no attālinātajiem serveriem"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Klasiskais skats"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Kopēt mapi uz..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "_Ziņojumu filtrs"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Pārvietot mapi uz..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Jauns..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Priekšapskate"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Abonomenti"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "_Vertikālais skats"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Izmainīt šīs mapes nosaukumu"
@@ -19125,8 +18799,7 @@ msgid "Hide _Read Messages"
 msgstr "Slēpt _lasītās vēstules"
 
 #: ../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 "Slēpt dzēstās vēstules, nevis attēlot kā pārsvītrotas"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -19155,13 +18828,11 @@ msgstr "Iezīmēt _visus ziņojumus"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
-msgstr ""
-"Izvēlēties visas un vienīgi tikai tās vēstules, kuras nav pašlaik izvēlētas"
+msgstr "Izvēlēties visas un vienīgi tikai tās vēstules, kuras nav pašlaik izvēlētas"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Izvēlēties visas vēstules no tā paša pavediena, kur atrodas izvēlētā vēstule"
+msgstr "Izvēlēties visas vēstules no tā paša pavediena, kur atrodas izvēlētā vēstule"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
@@ -19634,10 +19305,6 @@ msgid "_Unread"
 msgstr "_Nelasīts"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Tālummaiņa"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Fokusēt uz iekšu"
 
@@ -19645,41 +19312,41 @@ msgstr "_Fokusēt uz iekšu"
 msgid "Close this window"
 msgstr "Aizvērt šo logu"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Galvenā rīkjosla"
 
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
-msgstr "Kopēt iezīmēto atgādni"
+msgstr "Kopēt iezīmēto piezīmi"
 
 #: ../ui/evolution-memos.xml.h:5
 msgid "Cut selected memo"
-msgstr "Izgriezt izvēlēto atgādni"
+msgstr "Izgriezt izvēlēto piezīmi"
 
 #: ../ui/evolution-memos.xml.h:7
 msgid "Delete selected memos"
-msgstr "Dzēst izvēlētās atgādnes"
+msgstr "Dzēst izvēlētās piezīmes"
 
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
-msgstr "Ievietot atgādni no starpliktuves"
+msgstr "Ievietot piezīmi no starpliktuves"
 
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
-msgstr "Piriekšskata drukājamo atgādņu sarakstu"
+msgstr "Piriekšskata drukājamo piezīmju sarakstu"
 
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
-msgstr "Drukāt atgādņu sarakstu"
+msgstr "Drukāt piezīmju sarakstu"
 
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
-msgstr "Aplūkot izvēlēto atgādni"
+msgstr "Aplūkot izvēlēto piezīmi"
 
 #: ../ui/evolution-memos.xml.h:18
 msgid "_Open Memo"
-msgstr "_Atvērt atgādni"
+msgstr "_Atvērt piezīmi"
 
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
@@ -19720,6 +19387,11 @@ msgstr "Saņemt piegādes ziņojumu, kad jūsu ziņojums ir izlasīts"
 msgid "HT_ML"
 msgstr "H_TML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_evietot"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Atvērt failu"
@@ -20048,51 +19720,43 @@ msgstr "Ikonas _un teksts"
 msgid "Import data from other programs"
 msgstr "Importēt datus no citām programmām"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "Iz_kartojums"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Jauns _logs"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "Uzstādī_jumi"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Sūtīt / Saņemt"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Nosūtīt / _Saņemt"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Sūtīt sarindotos priekšmetus un saņemt jaunus priekšmetus"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Uzstādīt Pilot konfigurāciju"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Rādīt informāciju par Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Rādīt sān_joslu"
+msgid "Side _Bar"
+msgstr "Sān_josla"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Rādīt statusa _joslu"
+msgid "Status _Bar"
+msgstr "Statusa _josla"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Rādī_t rīkjoslu"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Rādīt informāciju par Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Nosūtīt Kļūdu Ziņojumu"
 
@@ -20100,71 +19764,75 @@ msgstr "Nosūtīt Kļūdu Ziņojumu"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Nosūtīt _Kļūdu Ziņojumu"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Nosūtīt kļūdu ziņojumu, izmantojot Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Norādīt, vai mēs strādājam atsaistes režīmā."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Rīk_josla"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Rīk_joslas stils"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Radīt/Slēpt sānjoslu"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Radīt/Slēpt statusa joslu"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Par"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Aizvērt logu"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "_Aizmirst paroles"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Slēpt pogas"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "_Tikai ikonas"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Ātrā atsauce"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Iziet"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Pārslēdzēja izskats"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_Sinhronizācijas opcijas..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "_Tikai teksts"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Logs"
 
@@ -20201,40 +19869,32 @@ msgid "_Work Week View"
 msgstr "Darba _nedēļas skats"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Kā _nosūtīto mape plašajam skatam"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Kā _nosūtīto mape"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Pēc s_tatusa"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Pēc sū_tītāja"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Pēc su_bjekta"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Pēc _sekojuma karoga"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Plašajam skatam"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Ziņojumi"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
-msgstr "_Atgādnes"
+msgstr "_Dienesta raksti"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
@@ -20244,32 +19904,28 @@ msgstr "Ar bei_dzamo termiņu"
 msgid "With _Status"
 msgstr "Ar _statusu"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Laika joslas</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Atlase</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Izvēlieties laika zonu"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "Laika joslas kombo lauks"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20305,7 +19961,7 @@ msgid "_Edit..."
 msgstr "_Rediģēt..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20319,11 +19975,11 @@ msgstr "Instance"
 msgid "Save Current View"
 msgstr "Saglabāt pašreizējo skatu"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "_Izveidot jaunu skatu"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Aizvietot esošo skātu"
 
@@ -20358,31 +20014,26 @@ msgstr "Ražotne"
 msgid "Define New View"
 msgstr "Definēt jaunu skatu"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "Jaunā skata nosaukums:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "Skata tips"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 msgstr "Skata tips:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Ieteikt automātisku piesaistnes attēlošanu"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20450,11 +20101,11 @@ msgid "Minimum Width"
 msgstr "Minimālais Platums"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Atstarpe"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Tagad"
 
@@ -20582,14 +20233,6 @@ msgstr "Kombo lauks lai iezimētu laiku"
 msgid "Time"
 msgstr "Laiks"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "Taga_d"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Šodien"
-
 #. 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"
@@ -20600,23 +20243,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "_Izvērsts"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Vai ir izvērsts izvērsējs vai nē"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Izvērsēja etiķetes teksts"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Lietot pasvītrojumu"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20624,80 +20267,64 @@ msgstr ""
 "Jā uzstādīts, pasvītrojumam tekstā, kas rāda nakāmo rakstzīmi, ir jābūt "
 "lietotam priekš mnemonik paātrinātaja atslēgai"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Atstarpe, ko likt starp etiķeti un bērnu"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Etiķešu logrīks"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Logrīks, ko rādīt parastas izvērsēja etiķetes vietā"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Izversēja izmērs"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Izvērsēja bultas izmērs"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikatora atstarpe"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Atstarpes pie izvērsēja bultas"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Paplašinātā meklēšana"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Saglabāt meklēšanu"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Meklē"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Meklē"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Saglabāt meklēšanu"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Saglabāt meklējumu..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Rediģēt saglabātos meklējumus..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Paplašinātā meklēšana..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Visi konti"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Pašreizējais konts"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Pašreizējā mape"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Pašreizējais ziņojums"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Izvēlieties attēlu"
@@ -20738,45 +20365,45 @@ msgstr "Pārpildīt modeli"
 msgid "Column width"
 msgstr "Kolonnas platums"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Meklēt"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Meklēt"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Meklēt Tagad"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Tīrs"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Meklēšanas tips"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Priekšmeta id"
 
-#: ../widgets/misc/e-search-bar.c:792 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "Apakšpriekšmeta id"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Teksts"
 
-#. 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:911
-msgid "Show: "
-msgstr "Rādīt: "
-
-#. 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:927
-msgid "S_earch: "
-msgstr "M_eklēt: "
-
-#. 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:938
-msgid " in "
-msgstr " iekš "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Atrast _tagad"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20825,8 +20452,8 @@ msgid "A_uto-delete sent item"
 msgstr "Auto_matiski izdzēst nosūtīto vienību"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Klasifikācija"
+msgid "C_lassification"
+msgstr "K_lasifikācija"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -20850,29 +20477,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"Normāls\n"
-"Komerciāls\n"
+"Publisks\n"
+"Privāts\n"
 "Konfidenciāls\n"
-"Slepens\n"
-"Īpaši slepens\n"
-"Tikai tev un nevienam citam"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "At_bildēt uz pieprasīto"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusa izsekošana"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -20884,51 +20505,51 @@ msgstr ""
 "Standarts\n"
 "Zems"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Kad apsti_prināts:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Kad pa_beigts:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Kad nolieg_ts:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "Ro_bežās"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Pēc:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Visa informācija"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Aizkavēt ziņojuma piegādi"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Piegādats"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "_Uzstādīt izbeigšanās datumu"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Līdz:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Kad ērti"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "_Kad atvērts:"
 
@@ -20946,19 +20567,19 @@ msgstr "%s (%d%% izpildīts)"
 msgid "Click here to go to URL"
 msgstr "Klikšķiniet šeit, lai atvērtu adresi"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "Rediģēt galvenas kategorijas sarakstu..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "Vienība(-as) piederošas pie šiem _kategorijam:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "_Pieiejamas kategorijas:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "kategorijas"
 
@@ -20982,23 +20603,23 @@ msgstr "Kokusēta Kolonna"
 msgid "Unselected Column"
 msgstr "Neizvēlēta Kolonna"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1786
 msgid "Strikeout Column"
 msgstr "Caursvītrota Kolonna"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1793
 msgid "Underline Column"
 msgstr "Pasvītrot kolonnu"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1800
 msgid "Bold Column"
 msgstr "Trekna Kolonna"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Color Column"
 msgstr "Krāsas Kolonna"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1821
 msgid "BG Color Column"
 msgstr "BG Krāsas Kolonna"
 
@@ -21013,7 +20634,6 @@ msgstr "Pie_iejamie lauki:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Pieaugoši"
 
@@ -21024,7 +20644,6 @@ msgstr "Notīrīt visu"
 
 #: ../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 "Descending"
 msgstr "Dilstoši"
 
@@ -21122,14 +20741,14 @@ msgstr "_Rādīt šos laukumus secīgi:"
 #: ../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-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD kods"
 
 #: ../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-header-item.c:1819
 msgid "Full Header"
 msgstr "Pilna Galvene"
 
@@ -21149,21 +20768,25 @@ msgstr ""
 "Lai pievienotu kolonnu jūsu tabulai, vilciet to uz\n"
 "vietu, kur jūs grībat izveidot kolonnu."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d priekšmets)"
-msgstr[1] "%s : %s (%d priekšmeti)"
-msgstr[2] "%s : %s (%d priekšmetu)"
+msgstr "%s : %s (%d priekšmets)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d priekšmeti)"
+
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d vienība)"
-msgstr[1] "%s (%d vienības)"
-msgstr[2] "%s (%d vienību)"
+msgstr "%s (%d vienība)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d vienības)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21243,69 +20866,65 @@ msgstr "Unificēts rindas augstums"
 msgid "Frozen"
 msgstr "Sasalis"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Pārveidot pašreizējo skatu"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Sakārtot pieaugoši"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Sakārtot dilstoši"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Nekārtot"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Grupēt pēc šī lauka"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "grupēt pēc kastītes"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Izņemt šo kollonu"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Pievienot kollonu..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Izlīdzinājums"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Labākais Izmērs"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Formatēt Kollonas..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Pārveidot pašreizējo skatu..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Kārtot pēc"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Fontukopa"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Kārtošanas Info"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21484,5 +21103,3 @@ msgstr "IM konteksts"
 msgid "Handle Popup"
 msgstr "Vadīt izlecošo logu"
 
-#~ msgid "*"
-#~ msgstr "*"
diff --git a/po/mk.po b/po/mk.po
index 3f8612acbc..166b40a5da 100755
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,35 +1,34 @@
+# translation of evolution.HEAD.po to macedonian
+# translation of mk.po to Macedonian
 # translation of evolution.HEAD.po to Macedonian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2003.
-#
-#: ../mail/em-format-html-display.c:680
 # Damjan Georgievski <penguinista@mail.net.mk>, 2003.
 # Marko Ivanoski <marko@programmer.net>, 2003.
 # Ivan Stojmirov <stojmir@linux.net.mk>, 2003.
 # Aleksandar Savic <savica@mt.net.mk>, 2005.
 # Арангел Ангов <ufo@linux.net.mk>, 2005.
 # Ivica Micev <icko@elfasko.org.mk>, 2006.
-# Jovan Naumovski <jovan@lugola.net>, 2006.
-# Arangel Angov <ufo@linux.net.mk>, 2006.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-17 15:14+0200\n"
-"PO-Revision-Date: 2006-07-17 21:02+0200\n"
-"Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
-"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
+"POT-Creation-Date: 2006-03-09 05:36+0100\n"
+"PO-Revision-Date: 2006-03-09 11:16+0100\n"
+"Last-Translator: Ivica Micev <icko@elfasko.org.mk>\n"
+"Language-Team: macedonian <info@slobodensoftver.org.mk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Poedit-Language: Macedonian\n"
 "X-Poedit-Country: MACEDONIA, THE REPUBLIC OF\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "адресар за еволушн"
 
@@ -43,13 +42,13 @@ msgstr "Нов контакт"
 msgid "New Contact List"
 msgstr "Нова листа на контакти"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "тековната папка со адрсар %s ја има картичката %d"
-msgstr[1] "тековната папка со адрсар %s ги има картичките %d"
-msgstr[2] "тековната папка со адрсар %s ги има картичките %d"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "тековната папка со адрсар ја има картичката %d"
+msgstr[1] "тековната папка со адрсар ги има картичките %d"
+msgstr[2] "тековната папка со адрсар ги има картичките %d"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -68,32 +67,32 @@ msgstr "Контакти:"
 msgid "evolution minicard"
 msgstr "Еволушн minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr "Има аларми."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "Има повторувања."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "Е состанок."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Настан во календарот: Резултатите се %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "Настан во календарот: Нема резултати."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr "поглед на настан во календар"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr "Има фокус"
 
@@ -122,9 +121,7 @@ msgstr "Оди на датум"
 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:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -132,38 +129,30 @@ msgstr[0] "Има %d настан"
 msgstr[1] "Има %d настани"
 msgstr[2] "Има %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:151 ../a11y/calendar/ea-week-view.c:153
 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Приказ на денови: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "календарски приказ за работна недела"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "календарски приказ за еден или повеќе денови"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:679
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %B %Y"
 
@@ -174,20 +163,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:190
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -195,10 +182,10 @@ msgstr "%a %d %b %Y"
 #: ../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:703
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/calendar-component.c:716
-#: ../calendar/gui/calendar-component.c:718
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %B %Y"
 
@@ -208,11 +195,9 @@ 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:220
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -238,21 +223,21 @@ msgstr "Копче за скокање"
 msgid "Click here, you can find more events."
 msgstr "Претисни овде за да најдеш повеќе настани."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Приказ на месеци: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Приказ на недели: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "Календарски приказ за месец"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "календарски приказ за една или повеќе недели"
 
@@ -342,14 +327,6 @@ msgstr "Активирај стандардно"
 msgid "Popup Menu"
 msgstr "Popup мени"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Пушти лента за приврзоци"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "активирај"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -517,7 +494,7 @@ msgstr ""
 "Вашите контакти за {0} нема да бидат достапни додека Еволушн не се "
 "рестартира."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -529,7 +506,7 @@ msgid "_Discard"
 msgstr "_Отфрли"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -569,9 +546,9 @@ 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:265 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -611,7 +588,7 @@ msgstr "Уреди ги твоите S/MIME сертификати овде"
 #. 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:227
+#: ../calendar/gui/calendar-component.c:209
 #: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
@@ -628,11 +605,11 @@ msgstr "На овој компјутер"
 #: ../addressbook/gui/component/addressbook-component.c:149
 #: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/calendar-component.c:217
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Лично"
 
@@ -659,7 +636,7 @@ 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-config.c:1202
 msgid "New Address Book"
 msgstr "Нов адресар"
 
@@ -675,73 +652,72 @@ msgstr "Креирај нов адресар"
 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:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../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/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: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:2021
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Општо"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Адресар"
 
-#: ../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/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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Детали"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 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:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Својства на адресарот"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Мигрирање..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Мигрирање на `%s':"
@@ -815,35 +791,34 @@ msgstr "Имињата на папки не може да содржат  '/'"
 msgid "A Folder with this name already exists"
 msgstr "Папката под ова име веќе постои"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Нов адресар"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:556
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "Избриши"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Сними како VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:557
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "С_војства..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Одбирач на извор на контакти"
 
@@ -852,12 +827,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Пристапот до LDAP серверот е анонимен"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "Не успеа да се автентицира.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Внеси лозинка за %s (корисник %s)"
@@ -903,7 +878,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI за последната папка користена во дијалогот за одбирање имиња"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Позиција на вертикалната лента"
 
@@ -1048,8 +1023,8 @@ msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr ""
-"Одбирајќи ја оваа опција значи дека Еволушн ќе се поврзува на LDAP "
-"серверотсамо доколку вашиот LDAP сервер подржува SSL. "
+"Одбирајќи ја оваа опција значи дека Еволушн ќе се поврзува на LDAP серверот"
+"само доколку вашиот LDAP сервер подржува SSL. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
@@ -1182,8 +1157,8 @@ msgstr "_Логин метод:"
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:163
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Име:"
 
@@ -1196,7 +1171,7 @@ msgid "_Search scope:"
 msgstr "_Опсег на пребарувањето: "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Сервер:"
@@ -1229,15 +1204,17 @@ msgstr "минути"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h: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
@@ -1282,13 +1259,13 @@ msgstr "<b>Работа</b> "
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1297,7 +1274,7 @@ msgstr "Контакт"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Уредувач на контакти"
 
@@ -1339,8 +1316,8 @@ msgstr "Телефон"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Работа"
 
@@ -1362,15 +1339,15 @@ msgid "_Birthday:"
 msgstr "_Роденден:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Календар:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "К_атегории..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Категории"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1457,8 +1434,8 @@ msgid "_Zip/Postal Code:"
 msgstr "Поштенск_и код:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Адреса"
 
@@ -1466,15 +1443,15 @@ msgstr "Адреса"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2452,7 +2429,7 @@ msgstr "Зимбабве"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Име"
@@ -2463,7 +2440,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2473,7 +2450,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2482,7 +2459,7 @@ msgid "Service"
 msgstr "Сервис"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2503,17 +2480,17 @@ msgid "Other"
 msgstr "Друго"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2542,20 +2519,20 @@ msgid "Changed"
 msgstr "Променето"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Уредувач на контакти - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2790
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Избери слика за контактот"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
-msgid "_No image"
-msgstr "_Нема слика"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "Нема слика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2563,31 +2540,15 @@ msgstr ""
 "Датата на контактот е невалидна:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
-#, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' има невалиден формат"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
-#, c-format
-msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' има невалиден формат"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3119
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#, c-format
-msgid "%s'%s' is empty"
-msgstr "%s'%s' е празен"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3145
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Невалиден контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање на контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "_Измени во целост"
 
@@ -2595,11 +2556,11 @@ msgstr "_Измени во целост"
 msgid "_Full name"
 msgstr "_Целосно име:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
-msgstr "E-_пошта:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "E-_mail:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Одбери Адресар"
 
@@ -2607,10 +2568,10 @@ msgstr "_Одбери Адресар"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
-"Дали сте сигурен/на дека сакате\n"
-"да ја избришете листата на контакти(%s)?"
+"Дали си сигурен дека сакаш\n"
+"да ја избришеш листата на контакти(%s) ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
@@ -2624,10 +2585,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
-"Дали сте сигурен/на дека сакате\n"
-"да го избришете контактот(%s)?"
+"Дали си сигурен дека сакаш\n"
+"да го избришеш контактот(%s) ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
@@ -2735,10 +2696,9 @@ msgid "_IM Service:"
 msgstr "IM сервис:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "_Локација:"
 
@@ -2751,7 +2711,7 @@ msgid "Add an email to the List"
 msgstr "Додај е-пошта на листата"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Уредувач на листа со контакти"
 
@@ -2783,24 +2743,24 @@ 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:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Книга"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Е нова листа"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Членови"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Членови на листа на контакти"
 
@@ -2841,18 +2801,25 @@ msgstr ""
 "Името или адресата на е-пошта на овој контакт веќе постои\n"
 "во оваа папка. Дали сепак сакаш да ја додадеш?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Било кое поле содржи"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Категоријата е"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "Адресата почнува со"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Името почнува со"
@@ -2871,9 +2838,9 @@ msgstr[2] "%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:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Прашалник"
 
@@ -2895,11 +2862,11 @@ msgstr "Модел"
 msgid "Error modifying card"
 msgstr "Грешка при модифицирањето на картичката"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Извор"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
@@ -2908,91 +2875,90 @@ msgstr "Извор"
 msgid "Type"
 msgstr "Тип"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Сними како VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Отвори"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Нов контакт..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Нова _листа со контакти..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Зачувај како VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Препрати контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Препрати контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Испрати по_рака на контактот"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Испрати по_рака на листа"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Испрати по_рака на контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Печати"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "Копира_ј во адресар..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "Премести _во адресар..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "От_сечи"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:555
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3155 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Копирај"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "Вм_етни"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Било која категорија"
 
@@ -3030,7 +2996,7 @@ msgid "Car Phone"
 msgstr "Телефон во кола"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3042,7 +3008,7 @@ msgid "Company Phone"
 msgstr "Телефон од компанијата"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Е-пошта"
@@ -3092,7 +3058,7 @@ msgid "Manager"
 msgstr "Менаџер"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Мобилен телефон"
 
@@ -3101,7 +3067,7 @@ msgid "Nickname"
 msgstr "Прекар"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Забелешка"
 
@@ -3110,7 +3076,7 @@ msgid "Office"
 msgstr "Канцеларија"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Организација"
 
@@ -3228,7 +3194,7 @@ msgstr "Максимална должина на името на полето"
 msgid "Column Width"
 msgstr "Ширина на колоната"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3242,7 +3208,7 @@ msgstr ""
 "\n"
 "или овде двојно притисни за да создадеш нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3256,7 +3222,7 @@ msgstr ""
 "\n"
 "Кликнете два пати за да креирате нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3266,7 +3232,7 @@ msgstr ""
 "\n"
 "Барај контакти..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3276,7 +3242,7 @@ msgstr ""
 "\n"
 "Нема елементи да се видат во овој приказ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Адаптер"
 
@@ -3288,89 +3254,68 @@ msgstr "Одбрано"
 msgid "Has Cursor"
 msgstr "Има курсор"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Отвори врска во нов прозорец"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Копирај ја локацијата на врската"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Испрати нова порака до ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Копирај _адреса за е-пошта"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(map)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "map"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Членови на листа"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Е-пошта"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Позиција"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Видео разговор"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Видео конференција"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Факс"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "работа"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Домашна страница"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
-msgstr "Веб лог"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Блог"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "лично"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Професија"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Домашна страница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Блог"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3401,7 +3346,7 @@ msgstr "Нема дефинирано контакт за себе"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Недозволен пристап."
 
@@ -3426,7 +3371,7 @@ msgstr "Протоколот не е подржан"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Откажано"
 
@@ -3559,7 +3504,7 @@ 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:695
 msgid "Error adding contact"
 msgstr "Грешка при додавање на контактот"
 
@@ -3576,7 +3521,7 @@ 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:650
 msgid "Error removing contact"
 msgstr "Грешка во отстранувањето на контактот"
 
@@ -3598,7 +3543,7 @@ msgstr[2] ""
 "Отворањето на %d контакти ќе отвори %d нов прозорци.\n"
 "Дали навистина сакате да ги прикажете овие контакти?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3607,15 +3552,15 @@ msgstr ""
 "%s веќе постои\n"
 "Дали сакаш да ја пребришеш?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "контакт"
@@ -3623,54 +3568,54 @@ msgstr[1] "контакти"
 msgstr[2] "контакти"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 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:756
 msgid "Move contact to"
 msgstr "Премести го контактот во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Копирај го контактот во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Премести ги контактите во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Копирај ги контактите во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Повеќекратни VCаrds"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard за %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Информации за дневникот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Информации за дневникот за %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Го чекам адресарот..."
 
@@ -3761,12 +3706,12 @@ msgstr "Еволушн VCard увезувач"
 msgid "Print envelope"
 msgstr "Печати плик"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Печати контакти"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Печати контакт"
 
@@ -3815,7 +3760,7 @@ msgstr "Формат"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Заглавје"
@@ -3919,9 +3864,9 @@ 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:955
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "Големина:"
 
@@ -4144,17 +4089,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Дали сте сигурни дека сакате да го избришете овој состанок?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Дали сте сигурни дека сакате да го избришете овој запис во дневникот?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Дали сте сигурни дека сакате да го избришете овој состанок?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Дали си сигурни дека сакате да ја избришете оваа задача?"
 
@@ -4401,7 +4343,7 @@ msgid "_Save Changes"
 msgstr "_Зачувај ги промените"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "_Испрати"
 
@@ -4426,8 +4368,8 @@ msgstr "Подели ги повеќе дневните настани:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Не може да се подигне evolution-data-server"
 
@@ -4461,12 +4403,12 @@ 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:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Календар и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1319
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4514,14 +4456,14 @@ 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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
+#: ../plugins/exchange-operations/exchange-folder.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Задачи"
@@ -4539,14 +4481,14 @@ msgstr "Задачи"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Развоен календар известувачка улога за аларми"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минути"
 msgstr[2] "минути"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4559,7 +4501,7 @@ 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 "Почетно време"
 
@@ -4570,10 +4512,10 @@ msgstr "Закажувања"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Локација:"
 
@@ -4583,16 +4525,16 @@ msgstr "Време на _дремнување:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "Уреди"
 
@@ -4604,31 +4546,32 @@ msgstr "_Дремнува"
 msgid "location of appointment"
 msgstr "локација на состанок"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Нема достапен краток преглед."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Нема достапен опис."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Нема достапни информации за локација."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Имате %d аларми"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Предупредување"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4640,7 +4583,7 @@ msgstr ""
 "конфигуриран да испрати епошта. Развојот наместо тоа ќе прикажува\n"
 "нормална разговорна кутија."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4657,7 +4600,7 @@ msgstr ""
 "\n"
 "Дали си сигурен дека сакаш да ја извршуваш ова програма?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Не ме прашувај повторно за ова програма."
 
@@ -4760,102 +4703,90 @@ msgid "Default reminder value"
 msgstr "Стандардна вредност на потсетникот"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Подредување на настаните по степен"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Провидност на настаните"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Слободни/зафатени сервер urls"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Слободен/зафатен мостра url"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Подредување по степен на настаните во прегледите на календарот."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Скриј ги завршените задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Скриј делови од задачата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Скриј вредност на задачата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Хоризонтална позиција на панелот"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Часот во работен ден завршува на, во 24 часовен формат, 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Часот во работен дел почнува на, во 24 часовен формат, 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Интервали прикажани во дневен и приказ на работна недела, во минути."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Време на последниот аларм"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Листа на неколку urls за слободно/зафатено објавување."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Маркус Бејнс линија"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Боја на Маркус Бејнс линија - дневен поглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Боја на Маркус Бејнс линија - лента за време"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Минутата во работен ден завршува на, 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Минутата во работен ден почнува на, 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Позиција на хоризонталниот панел за месечен поглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Позиција на вертикалниот панел за месечен поглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Број на делови за одредување за стандарден потсетник."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Број на делови за одредување кога да се скријат задачите."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Боја на пречекорени задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4863,7 +4794,7 @@ msgstr ""
 "Позиција на хоризонталниот панел, помеѓу датум навигатор календарот и "
 "листата со задачи кои не е во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4871,15 +4802,7 @@ msgstr ""
 "Позиција на хоризонталниот панел, помеѓу погледот и датум навигатор "
 "календарот и листата со задачи во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-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.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4887,7 +4810,7 @@ msgstr ""
 "Позиција на вертикалниот панел, помеѓу листата со задачи и панелот за "
 "преглед на задачи, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4895,7 +4818,7 @@ msgstr ""
 "Позиција на вертикалниот панел, помеѓу погледот и датум навигатор календарот "
 "и листата со задачи во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4903,65 +4826,65 @@ msgstr ""
 "Позиција на вертикалниот панел, помежу погледот и датум навигатор календарот "
 "и листата со задачи кога не е во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Програми кои може да се стартуваат преку аларми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Прикажи RSVP поле во настан/задача/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Прикажи функциско поле во настан/задача/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Покажи време на завршување на состанок во неделен и месечен приказ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Прикажи поле категории во настан/состанок/задача уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Покажи приказ на аларми во лентата за известувања"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Прикажи статус поле во настан/задача/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Покажи го \"Преглед\" панелот"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Покажи го \"Preview\" панелот."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Прикажи временска зона поле во настан/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Прикажи тип поле во настан/задача/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Покажи број на недели во навигаторот за датуми"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Боја на задачи до денеска"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Позиција на вертикалниот панел за задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4970,7 +4893,7 @@ msgstr ""
 "Url мостра за користење како слободно/зафатено fallback на податоци, %u е "
 "заменето од корисничкиот дел на поштенската адреса и %d е заменет од доменот."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4978,61 +4901,53 @@ msgstr ""
 "Стандардна временска зона за користење за датум и време во календарот, како "
 "непреведена Олсен локација на база на часовни зони како \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Поделба на време"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Време кога се вклучи последниот аларм, во time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Провидност на настаните во прегледите на календарот (Вредност меѓу 0 и 10, "
-"стандардно е нерповидно)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24 часовен формат"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Делови за стандарден потсетник,  \"minutes\", \"hours\" или \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Делови за одредување кога да се скријат задачите,  \"minutes\", \"hours\" "
 "или \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Почеток на неделата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ден од неделата кога почнува седмицата, од недела (0) до сабота (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Дали или не да се користи лентата за известувања за приказ на аларми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Дали да праша за потврда кога се брише состанок или задача."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Дали да праша за потврда кога се уништуваат состаноци или задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5040,84 +4955,76 @@ msgstr ""
 "Дали да се компресираат викендите во месечен поглед, што ги става сабота и "
 "недела во место на еден ден од неделата."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Дали да се прикаже завршното време на настаните во неделен и месечен приказ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Дали да се нацрта Маркус Бејнс линијата (линија на тековно време) во "
 "календарот."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Дали да се скријат завршените задачи во погледот на задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Дали да се постави стандарден потсетник за закажувања."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Дали да се прикажеRSVP настан/задача/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Дали да се прикаже категории поле во натан/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Дали да се прикаже функциско поле во настан/задача/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Дали да се прикаже статус поле во настан/задача/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Дали да се прикаже времето во 24 часовен формат наместо am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Дали да се прикаже поле временска зона во настан/состанок уредувач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Дали да се прикаже тип поле во настан/"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Дали да се прикаже бројот на недели во навигаторот за датуми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "Работни денови"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Последен час на работен ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Последна минута на работен ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Почетен час на работен ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Почетна минута на работен ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "дневно зачувување на времето"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Резултатите содржат"
@@ -5126,19 +5033,19 @@ msgstr "Резултатите содржат"
 msgid "Description contains"
 msgstr "Описот содржи"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Коментари содржи"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Локацијата содржи"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Несовпаднати"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
@@ -5146,13 +5053,13 @@ msgid "Print"
 msgstr "Печати"
 
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:727
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2099
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:579
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
 #: ../plugins/hula-account-setup/camel-hula-listener.c:379
 #: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -5177,7 +5084,7 @@ msgstr "Уништи настани постари од "
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "денови"
 
@@ -5185,89 +5092,89 @@ msgstr "денови"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:253
+#: ../calendar/gui/calendar-component.c:235
 #: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "На интернет"
 
-#: ../calendar/gui/calendar-component.c:271 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Родендени и годишнини"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:277
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Време"
 
-#: ../calendar/gui/calendar-component.c:554
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "_Нов Календар"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Надградбата на календарите не успеа."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Не може да се отвори календарот '%s' за креирање настани и состаноци"
 
-#: ../calendar/gui/calendar-component.c:1173
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нема достапен календар за креирање настани и состаноци"
 
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Избирач на извор на календар"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Ново закажување"
 
-#: ../calendar/gui/calendar-component.c:1490
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Закажување"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Создади ново закажување"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Нов состанок"
 
-#: ../calendar/gui/calendar-component.c:1498
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "С_останок"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Создади ново барање за состанок"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Нов целодневен состанок"
 
-#: ../calendar/gui/calendar-component.c:1506
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Цело_дневен состанок"
 
-#: ../calendar/gui/calendar-component.c:1507
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Креирај нови цело дневни закажувања"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Нов календар"
 
-#: ../calendar/gui/calendar-component.c:1514
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../calendar/gui/calendar-component.c:1515
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Креирај нов календар"
 
@@ -5299,11 +5206,11 @@ msgstr "Методот не е подржан додека се отвараше
 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:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "Уреди аларм"
 
@@ -5419,25 +5326,54 @@ msgid "A_dd"
 msgstr "Д_одади"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Аларми"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Предложи автоматски приказ на привезок"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Предложи автоматски приказ на привезок"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Прикачи датотека(и)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Својства на привезок"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Опис:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "File name:"
+msgstr "Име на датотека:"
+
+#: ../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 тип:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Календари за извршување на аларми"
 
@@ -5463,7 +5399,7 @@ msgstr ""
 "</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Известувања</span>"
 
@@ -5472,7 +5408,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:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Главно</span>"
@@ -5489,31 +5425,27 @@ msgstr "<span weight=\"bold\">Време</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Рапотна седмица</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Промени за дневно за_чувување на времето"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Денот _завршува:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Прикажи"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:572
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Слободен/зафатен"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Петок"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5523,13 +5455,13 @@ msgstr ""
 "Часови\n"
 "Денови"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Понеделник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5547,193 +5479,187 @@ msgstr ""
 "Сабота\n"
 "Недела"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Избери боја"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "С_онце"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Сабота"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Одбери ги календарите за аларм известување"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "При_кажи потсетник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Прикажи неделни_броеви во навигаторот за дати "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Недела"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "З_адачи до денеска:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "Ч_ет"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Мостра:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Четврток"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Временска _зона:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Формат на време:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Среда"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "Н_еделата започнува:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Работни денови:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 часа (АМ/ПМ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 часа"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Прашај за потврдување кога бришеш елементи"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Компримирај викенди во месечен приказ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Денот започнува:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_Пет"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "_Скриј ги завршените задачи после"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Пон"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "_Пречекорени задачи:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "_Саб"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Прикажи место и време во седмичен и месечен преглед"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "_Поделба на време"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_Вто"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Сре"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "пред секој состанок"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Коп_ирај содржина на календар локално за офлајн операции"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Копирај содржина на календар локално за офлајн операции"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Копир_ај листа на задачи локално за офлајн операции"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Копирај листа на задачи локално за офлајн операции"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Копира_ј листа на задачи локално за офлајн операции"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Копирај листа на задачи локално за офлајн операции"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Б_оја:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Листа на задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Листа со задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Својства на календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Нов календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Својства на листа со задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Нова листа со задачи"
 
@@ -5822,35 +5748,35 @@ msgstr "%s  Вие не направивте измени, ажурирај го
 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:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " кон "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (До "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "До "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2891
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Прикачена порака - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2896
-#: ../composer/e-msg-composer.c:3092
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5858,14 +5784,14 @@ msgstr[0] "Прикачена порака"
 msgstr[1] "Прикачени пораки - %d"
 msgstr[2] "Прикачени пораки - %d"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3156
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Помести"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3158
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Откажи _влечење"
 
@@ -5873,7 +5799,7 @@ msgstr "Откажи _влечење"
 msgid "Could not update object"
 msgstr "Објектот не може да се ажурира"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2504
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5886,98 +5812,99 @@ msgid "Hide Attachment _Bar"
 msgstr "Лента за при_врзоци"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Прикажи Лента за при_врзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3656
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Отстрани"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3657 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Својства"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3659
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Додај приврзок..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2262
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Прикажи приврзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Притисни space копче да префрлиш приврзочна лента"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Уреди закажување"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Состанок - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Закажување - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Доделeна задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Влез во дневникот - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Без резултати"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
+#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "привезок"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Измените направени на овој елемент ке бидат отфрлени ако пристигне "
 "ажурирањето"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Не може да се користи сегашната верзија!"
 
@@ -5993,12 +5920,6 @@ msgstr "Не може да се отвори дестинацијата"
 msgid "Destination is read only"
 msgstr "Дестинацијата е само за читање"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-"Да го _избришам овој предмет од поштенските сандачиња на сите други "
-"приматели?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Настанот не може да биде избришан поради корба грешка"
@@ -6060,86 +5981,95 @@ msgstr "Пренеси на:"
 msgid "Enter Delegate"
 msgstr "Внеси пренос"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Состанок"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Повторно појавување"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Овој настан има аларми"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Кале_ндар"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:441
+#: ../calendar/gui/dialogs/task-page.c:446
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Делегати"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Прис_утни"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Настан без почетен датум"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Настан без завршен датум"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/task-page.c:848
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "Почетната дата е погрешна "
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Крајната дата е погрешна "
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Почетното време е погрешно "
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Крајното време е прогрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "The organizer selected no longer has an account."
 msgstr "Избраниот организатор повеќе нема сметка."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/task-page.c:911
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
+#: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr "Потребен е организатор"
 
-#: ../calendar/gui/dialogs/event-page.c:1474
-#: ../calendar/gui/dialogs/task-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr "Барем еден посетител е потребен."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "_Додај"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не може да се отвори календарот '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6147,7 +6077,7 @@ msgstr[0] "%d ден пред состанокот"
 msgstr[1] "%d денa пред состанокот"
 msgstr[2] "%d денa пред состанокот"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6155,7 +6085,7 @@ msgstr[0] "%d час пред состанокот"
 msgstr[1] "%d часа пред состанокот"
 msgstr[2] "%d часа пред состанокот"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6163,24 +6093,30 @@ msgstr[0] "%d минута пред состанокот"
 msgstr[1] "%d минути пред состанокот"
 msgstr[2] "%d минути пред состанокот"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Прилагоди..."
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2296
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "Ништо"
 
@@ -6197,33 +6133,38 @@ msgid "15 minutes before appointment"
 msgstr "15 минути пред состанокот"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "Присут_ни..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "Присут_ни"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ка_тегории..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Прилагоден аларм:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "О_пис:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Опис на настанот"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "Локац_ија:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Ре-зултат"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Аларм"
 
@@ -6245,6 +6186,14 @@ msgstr "за"
 msgid "until"
 msgstr "додека"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "Деле_гати"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Од:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6291,7 +6240,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Статус"
 
@@ -6312,11 +6261,11 @@ msgid "Organizer"
 msgstr "Организатор"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Мемо"
 
@@ -6326,7 +6275,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Не можам да ѓи отворам задачите во '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:439
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Група:"
@@ -6512,7 +6461,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>"
 
@@ -6577,15 +6526,15 @@ msgstr "<span weight=\"bold\">Статус</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Завршено"
 
 #: ../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:1029
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Високо"
 
@@ -6594,20 +6543,20 @@ msgstr "Високо"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Во тек"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1027
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Ниско"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Нормално"
 
@@ -6615,7 +6564,7 @@ msgstr "Нормално"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Не започнато"
 
@@ -6628,7 +6577,7 @@ msgid "Stat_us:"
 msgstr "Стат_ус:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Недефинирано"
 
@@ -6637,7 +6586,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:31
 msgid "_Priority:"
 msgstr "_Приоритет:"
 
@@ -6645,28 +6594,24 @@ msgstr "_Приоритет:"
 msgid "_Web Page:"
 msgstr "_Веб страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Детали"
 
-#: ../calendar/gui/dialogs/task-page.c:821
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Due date is wrong"
 msgstr "До датумот е погрешен"
 
-#: ../calendar/gui/dialogs/task-page.c:1649
+#: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не може да се отворат задачите во '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "Присут_ни"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Ка_тегории..."
@@ -6809,7 +6754,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s за непознат вид на чкрапало"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "Притисни за отварање на %s"
@@ -6829,7 +6774,7 @@ msgstr "Безимено"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Резултати:"
 
@@ -6847,7 +6792,7 @@ msgstr "_До датум:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Статус:"
 
@@ -6855,26 +6800,18 @@ msgstr "Статус:"
 msgid "Priority:"
 msgstr "_Приоритет:"
 
-#: ../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:3
-msgid "Description:"
-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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Јавно"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Приватно"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Доверливо"
 
@@ -6888,19 +6825,19 @@ 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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Резултати"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Зафатено"
 
@@ -6914,17 +6851,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Не"
@@ -6935,21 +6872,21 @@ msgstr "Не"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Се повторува"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Доделено"
 
@@ -6957,7 +6894,7 @@ msgstr "Доделено"
 msgid "Save As..."
 msgstr "Зачувај како..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2110
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Одбери папка за зачувување на одбраните привезоци..."
 
@@ -6966,9 +6903,9 @@ msgstr "Одбери папка за зачувување на одбранит�
 msgid "untitled_image.%s"
 msgstr "безимени_слика.%s"
 
-#: ../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:846
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Зачувај како..."
 
@@ -6986,79 +6923,74 @@ msgstr "_Зачувај го одбраното"
 msgid "Open in %s..."
 msgstr "Отвори во %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Бришење на одбраните објекти"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Ажурирање на објекти"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Зачувај како..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Нова _задача"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Отвори _веб страница"
 
-#: ../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:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7066,52 +6998,44 @@ msgstr "Отвори _веб страница"
 msgid "_Print..."
 msgstr "_Печати..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Исе_чи"
 
-#: ../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:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Вметни"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Додели задача"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Препрати како iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Означи како завршено"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Означи ги одбраните задачи како завршени"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Означи како некомплетно"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Означи ја одбраната задача како незавршена"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Избриши ги одбраните задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Притиснете за да додадете задача"
@@ -7121,7 +7045,7 @@ msgstr "Притиснете за да додадете задача"
 msgid "% Complete"
 msgstr "% Завршено"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Завршено"
 
@@ -7146,101 +7070,105 @@ msgstr "Почетен датум"
 msgid "Task sort"
 msgstr "Распореди задачи"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Поместување на предмети"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Копирање предмети"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Нов _состанок..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Нов целодневен _настан"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Нов _состанок"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Нова _задача"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Моментален приказ"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Избери _денес"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Избери датум..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Ко_пирај во календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Помести во календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Закажи состанок..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Закажи состанок..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Препрати како iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Одговори"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Одговори на _сите"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Направи ја ова појава _пренослива"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Избриши ја оваа _појава"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Избриши ги _сите појави"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Локација: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -7270,7 +7198,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i делови од минута"
@@ -7281,22 +7209,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:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -7412,22 +7338,22 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Прифатено"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Пробно прифатено"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Одбиено"
 
@@ -7643,7 +7569,7 @@ msgid "Attendee status updated\n"
 msgstr "Ажуриран статусот на посетителот\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статусот на посетителот не  може да биде ажурирано затоа што елементот "
@@ -7692,35 +7618,48 @@ msgid "Send Latest Information"
 msgstr "Испрати најнови информации"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--до--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Календарска порака"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Датум:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Вчитување календар"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Вчитување календар..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Сервер порака:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "датум-крај"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "датум-почеток"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Претседатели"
@@ -7739,65 +7678,65 @@ msgid "Resources"
 msgstr "Ресурси"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "Индивидуално"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Група"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Ресурс"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Соба"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Стол"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "Потребни учесници"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Опционални учесници"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Не учесници"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "Потребна е акција"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Пробен"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Пренесено"
 
@@ -7806,14 +7745,14 @@ msgstr "Пренесено"
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 msgid "In Process"
 msgstr "Во процес"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7821,86 +7760,86 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Надвор од канцеларија"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Нема информации"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Присут_ни"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "О_пции"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Прикажи _само работни часови"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Прикажи _намалено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Ажурирај слободно/зафатено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Автоземање"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Сите луѓе и ресурси"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Сите_луѓе и еден ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Потребни луѓе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Потребни луѓе и _еден ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Почетно време:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Време на завршување:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Избриши ги одбраните задачи"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Кликнете за да додадете задача"
 
@@ -7908,8 +7847,8 @@ msgstr "Кликнете за да додадете задача"
 msgid "Memo sort"
 msgstr "Неподредено"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2543
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7927,7 +7866,7 @@ msgstr "Вчитување на задачите"
 msgid "Opening memos at %s"
 msgstr "Отвори задачи на %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Бришење на избраните објекти..."
 
@@ -7936,67 +7875,66 @@ msgstr "Бришење на избраните објекти..."
 msgid "Enter the password for %s"
 msgstr "Внеси лозинка за %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Вчитување на задачите"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отвори задачи на %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Завршување на задачите..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Уништување"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "Изберете временска зона"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:781
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Надградба на чекањето"
 
-#: ../calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "_Прилагоден приказ"
 
-#: ../calendar/gui/gnome-cal.c:2223
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_Зачувај го сопствениот преглед"
 
-#: ../calendar/gui/gnome-cal.c:2228
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Дефинирај приказ..."
 
-#: ../calendar/gui/gnome-cal.c:2388
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Вчитување состаноци на %s"
 
-#: ../calendar/gui/gnome-cal.c:2407
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Вчитување задачи на %s"
 
-#: ../calendar/gui/gnome-cal.c:2511
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Отварање на %s"
 
-#: ../calendar/gui/gnome-cal.c:3384
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Печати"
 
@@ -8110,9 +8048,22 @@ msgstr "иКалендар информации"
 msgid "You must be an attendee of the event."
 msgstr "Вие морате да бидете посетител на настанот."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "_Нова листа со задачи"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Копирај"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Избриши"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Својства..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8153,8 +8104,8 @@ msgid "New memo"
 msgstr "Нова задача"
 
 #: ../calendar/gui/memos-component.c:1156
-msgid "Mem_o"
-msgstr "Мем_о"
+msgid "_Memo"
+msgstr "_Мемо"
 
 #: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
@@ -8165,8 +8116,8 @@ msgid "New memo list"
 msgstr "Нова листа со задачи"
 
 #: ../calendar/gui/memos-component.c:1164
-msgid "Memo li_st"
-msgstr "Мемо ли_ста"
+msgid "Memo l_ist"
+msgstr "Мемо л_иста"
 
 #: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
@@ -8217,240 +8168,240 @@ msgstr "Не може да се мигрира календарот `%s'"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Не може да се мигрираат задачите `%s'"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1-ви"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2-ри"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3-ти"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4-ти"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5-ти"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6-ти"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7-ми"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8-ми"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9-ти"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10-ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11-ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12-ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13-ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14-ти"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15-ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16-ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17-ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18-ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19-ти"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20-ти"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21-ви"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22-ри"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23-ти"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24-ти"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25-ти"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26-ти"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27-ми"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28-ми"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29-ти"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30-ти"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31-ви"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Не"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "По"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Вт"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Ср"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Че"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Пе"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Са"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Избран ден (%a %b %d %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Избрана недела (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Избран месец (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Состанок"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Задача"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Резултати: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Процент завршено: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 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
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Преглед пред печатење"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Печати елемент"
 
@@ -8508,14 +8459,14 @@ msgid "New task list"
 msgstr "Нова листа со задачи"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "Листа со _задачи"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Создади нова листа со задачи"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8527,11 +8478,11 @@ msgstr ""
 "\n"
 "Стварно избриши ги овие задачи? "
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Не ме прашувај повторно."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Печати задачи"
 
@@ -10126,7 +10077,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Лента за приврзоци"
 
@@ -10134,43 +10085,28 @@ msgstr "Лента за приврзоци"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Не може да се прикачи датотеката  %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Не може да се прикачи датотека %s: не е валидна датотека"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Својства на привезок"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Име на датотека:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME тип:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Пишување дестинација"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Одбери папки за пишување порака."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Кликни овде за адресарот"
 
@@ -10181,45 +10117,45 @@ msgstr "Кликни овде за адресарот"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Одговори на:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "О_д:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "Т_ема:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_До:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Внеси ги примачите на пораката"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Копија:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Внеси ги адресите кои ќе примат слепа копија на пораката"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10230,15 +10166,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Пишувај:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Кликни овде за одбирање папки за пишување"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Пишувај до:"
 
@@ -10246,17 +10182,17 @@ msgstr "Пишувај до:"
 msgid "A_ttach"
 msgstr "З_акачи"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Увези Привезок"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Не може да се потпише појдовната порака: Нема поставен сертификат за потпис "
 "за оваа сметка"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10264,52 +10200,52 @@ msgstr ""
 "Не може да се енкриптира појдовната порака: Нема поставен сертификат за "
 "потпис на оваа сметка"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "сокриј ја лентата за при_везоци"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2536
-#: ../composer/e-msg-composer.c:3902
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Прикажи лента за при_везоци"
 
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Непозната причина"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Не може да се отвори датотеката"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Не може да се поврати порака од уредувачот"
 
-#: ../composer/e-msg-composer.c:1691
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Безимена порака"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1726
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Отвори датотека"
 
-#: ../composer/e-msg-composer.c:2176 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Автогенерирана"
 
-#: ../composer/e-msg-composer.c:2279
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "По_тпис:"
 
-#: ../composer/e-msg-composer.c:2547 ../composer/e-msg-composer.c:3784
-#: ../composer/e-msg-composer.c:3787
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Пишувај порака"
 
-#: ../composer/e-msg-composer.c:5011
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10340,7 +10276,7 @@ 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
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Бидејќи &quot;{1}&quot;."
 
@@ -10455,11 +10391,11 @@ msgstr "_Зачувај порака"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:514
 msgid "Evolution"
 msgstr "Еволушн"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -10524,14 +10460,18 @@ msgid "Yes, Change Status"
 msgstr "Да, промени статус"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Примање е-пошта</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Испраќање е-пошта:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10543,31 +10483,31 @@ msgstr ""
 "ја праќаш е прочитана, и да назначиш што Еволушн треба да прави кога некој "
 "бара потврда од тебе.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Секогаш испрати назад потврда за читање"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Прашај ме ако сакам да испратам назад потврда за читање"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Никогаш не испраќај назад потврда за читање"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Потврди за читање"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Побарај потврда за читање за сите пораки што ги праќам"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Освен ако пораката е испратена на поштенска листа, и не мене лично"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10575,7 +10515,7 @@ msgstr ""
 "Кога ќе добиеш порака со барање за потврда за читање, што треба Еволушн да "
 "направи?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10583,28 +10523,28 @@ msgstr ""
 "Датотека со тоа име веќе постои.\n"
 "Пребриши ја?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Пребриши датотека?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Еволушн предупредување"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Еволушн информации"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Еволушн прашалник"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Внатрешна грешка, непозната грешка '%s' побарано"
@@ -10625,7 +10565,7 @@ msgstr "Дали сакаш да ја пребришеш?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Датотеката веќе постои &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "Пре_бриши"
 
@@ -10706,24 +10646,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Одбери време за споредба"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Одбери датотека"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Да се направи"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Подоцна"
 
@@ -10772,11 +10712,11 @@ msgid "Include threads"
 msgstr "Вклучи нишки:"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Дојдовни"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Појдовни"
 
@@ -10800,7 +10740,7 @@ msgstr "Недостасува датум."
 msgid "Missing file name."
 msgstr "Недостасува име на датотека."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Недостасува име."
 
@@ -10872,7 +10812,7 @@ msgstr "пред"
 msgid "months"
 msgstr "месеци"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "секунди"
 
@@ -10940,22 +10880,22 @@ msgstr "Контрола на конфигурација за Еволушн п�
 msgid "Evolution Mail preferences control"
 msgstr "Контрола на преференци за Еволушн"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../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:531
 msgid "Mail Accounts"
 msgstr "Сметки за пошта"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Преференци за пошта"
 
@@ -10982,7 +10922,7 @@ msgstr ""
 "и означи го полето за прифаќање\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Одбери папка"
 
@@ -10990,11 +10930,11 @@ msgstr "Одбери папка"
 msgid "Ask for each message"
 msgstr "Прашај за секоја порака"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Идентитет"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Примам пораки"
 
@@ -11002,16 +10942,16 @@ msgstr "Примам пораки"
 msgid "Automatically check for _new mail every"
 msgstr "Автоматски провери за _нова пошта секои"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Испраќам пораки"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Стандардно"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Безбедност"
@@ -11025,11 +10965,11 @@ msgstr "Опции за примање"
 msgid "Checking for New Mail"
 msgstr "Проверувам за нова пошта"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Уредувач на сметки"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Асистент за Еволушн сметки"
 
@@ -11049,22 +10989,22 @@ msgid "[Default]"
 msgstr "[Стандардно]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Вклучено"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Име на сметка"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Протокол"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Безимено"
 
@@ -11084,14 +11024,14 @@ msgstr "Потпис(и)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Препратена порака --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1666
 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:1713
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11140,12 +11080,6 @@ msgstr "Датум на примање"
 msgid "Date sent"
 msgstr "Датум на испраќање"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Избриши"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Избришано"
@@ -11234,7 +11168,7 @@ msgstr "не е"
 msgid "is not Flagged"
 msgstr "не е означена со знаме"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Отпад"
@@ -11243,7 +11177,7 @@ msgstr "Отпад"
 msgid "Junk Test"
 msgstr "Тест на отпад"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Ознака"
 
@@ -11287,7 +11221,7 @@ msgstr "Свири звук"
 msgid "Read"
 msgstr "Прочитај"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Примачи"
 
@@ -11315,11 +11249,11 @@ msgstr "враќа помали од"
 msgid "Run Program"
 msgstr "Изврши програма"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Резултат"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Испраќач"
 
@@ -11351,9 +11285,9 @@ msgstr "почнува со"
 msgid "Stop Processing"
 msgstr "Престани со процесирање"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11369,42 +11303,10 @@ msgstr "Непоставен статус"
 msgid "<b>Then</b>"
 msgstr "<b>Потоа</b> "
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Креирај папка за пребарување од пребарувањето..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Сите пораки"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Непрочитана пораки"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Нема ознака"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Прочитај ги пораките"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Скорашни пораки"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Пораки од последните 5 дена"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Пораки со приврзоци"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Пораката не е отпад"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
@@ -11440,7 +11342,7 @@ msgid "Folder _name:"
 msgstr "Име на _папка:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Пребарувај папки"
 
@@ -11455,7 +11357,7 @@ msgstr "Скици"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "Сандаче"
 
@@ -11471,77 +11373,77 @@ msgstr "Испратени"
 msgid "Loading..."
 msgstr "Се вчитува..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Дрво на папки со пошта"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Преместување на папката %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копирање на папката %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Преместувам пораки во папка %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирам пораки во папка %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не може да се остават порака(и) во најгорно ниво на сместување"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "Копирај во папка"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Премести во папка"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Скенирам папки во \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Поглед"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Отвори во _нов прозорец"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "Копирај..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "Помести..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "Нова папка..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "Преименувај..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
 msgid "_Empty Trash"
 msgstr "_Испразни отпад"
 
@@ -11550,14 +11452,13 @@ msgstr "_Испразни отпад"
 msgid "Copying `%s' to `%s'"
 msgstr "Копирање `%s' во `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Одбери датотека"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "К_опирај"
 
@@ -11579,188 +11480,178 @@ msgstr "Креирај папка"
 msgid "Specify where to create the folder:"
 msgstr "Назначи каде да се креира папката:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Одговори на испраќачот"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Препрати"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Уреди како нова порака..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "Од_избриши"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Премести во папка..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Копирај во папка..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Означи како _прочитани"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Означи како _непрочитана"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Означи како _важни"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
-msgstr "_Означи како не_важно"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr "_Означи како _неважни"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Означи како _отпад"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Означи дека _не е отпад"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Означи за сле_дење..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Ништо"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Зна_мето е завршено"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Ис_чисти знаме"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Кре_ирај правило од порака"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Пребарај папка од _темата"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Пребарај папка од ис_праќачот"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Пребарај папка од _примачите"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Пребарај папка од поштенската _листа"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Филтер на т_ема"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Филтер на исп_раќач"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Филтер на при_мачи"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Филтер на п_оштенска листа"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "Стандардно"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Печати порака"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "Не може да се преземе пораката"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2460
+msgid "_Copy Link Location"
+msgstr "_Копирај ја локацијата на врската"
+
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "Креирај _папка за пребарување"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_Од оваа адреса"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "_На оваа адреса"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "Притисни за пошта %s"
 
-#: ../mail/em-folder-view.c:2860
-msgid "Click to hide/unhide addresses"
-msgstr "Кликни за покажување/криење на адресите"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:502
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Одговара: %d"
 
-#: ../mail/em-format-html-display.c:645
-msgid "Find:"
-msgstr "Пронајди:"
-
-#: ../mail/em-format-html-display.c:676
-msgid "M_atch case"
-msgstr "С_овпадни се"
-
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Непотпишано"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Пораката не е потпишана. Нема гаранција дека оваа порака е автентична."
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Важечки потпис"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Оваа порака е потпишана и е валидна, значи дека оваа порака е автентична."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Неважечки потпис"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11768,11 +11659,11 @@ msgstr ""
 "Потписот на оваа порака не може да се провери, може да е променет при "
 "преносот."
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Валиден потпис, не може да се провери испраќачот"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11780,11 +11671,11 @@ msgstr ""
 "Оваа порака е потпишана со валиден потпис, но испраќачот на пораката не може "
 "да се провери."
 
-#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Не-енкриптирано"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11792,11 +11683,11 @@ msgstr ""
 "Оваа порака не е енкриптирана. Нејзината содржина може да се види при "
 "преносот на интернет."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Слабо енкриптирано"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11806,11 +11697,11 @@ msgstr ""
 "тешко, но не и неможно некој од надворешноста да ја види содржината на оваа "
 "порака во разумно време."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Енкриптирано"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11818,11 +11709,11 @@ msgstr ""
 "Оваа порака е енкриптирана. Ќе биде тешко некој од надворешноста да ја види "
 "содржината на оваа порака."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Јако енкриптирано"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11831,57 +11722,57 @@ msgstr ""
 "Оваа порака е енкриптирана, со јак алгоритам за енкрипција. Ќе биде многу "
 "тешко некој од надворешноста да ја види содржината во разумно време."
 
-#: ../mail/em-format-html-display.c:1037 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Види сертификат"
 
-#: ../mail/em-format-html-display.c:1052
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Овој сертификат не може да се види"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завршено на %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Пречекорени:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "со %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1442
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Види внатре"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Скриј"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Подеси на ширина"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Покажи _оригинална големина"
 
-#: ../mail/em-format-html-display.c:1864 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Привезок"
 
-#: ../mail/em-format-html-display.c:2071
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Одбери папка за зачувување на сите привезоци..."
 
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Зачувај го одбраното..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2185
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
@@ -11889,15 +11780,15 @@ msgstr[0] "%d привез_ок"
 msgstr[1] "%d привез_оци"
 msgstr[2] "%d привезоци"
 
-#: ../mail/em-format-html-display.c:2192 ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "З_ачувај"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "З_ачувај ги сите"
 
-#: ../mail/em-format-html-display.c:2264
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Нема привезоци"
 
@@ -11911,94 +11802,94 @@ msgstr "Страница %d од %d"
 msgid "Retrieving `%s'"
 msgstr "Собирам `%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Валиден потпис но не може да се провери испраќачот"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Изобличен надворешен дел од телото."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Покажувач до FTP сајт (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Покажувач до локална датотека (%s) валидна на сајт  \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Покажувач на локална датотека (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Покажувач до далечни податоци (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Покажувач до непознати надворешни податоци  (\"%s\"тип)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Форматирање на порака"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Од"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Одговори на"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Поштар"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Датум"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Дискусиони групи"
@@ -12008,7 +11899,7 @@ msgstr "Дискусиони групи"
 msgid "%s attachment"
 msgstr "%s привезок"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Не може да се пренесе S/MIME пораката: Непозната грешка"
 
@@ -12024,11 +11915,11 @@ msgstr "Неподдржан тип на енкрипција за multipart/е�
 msgid "Unsupported signature format"
 msgstr "Неподдржан формат на потпис"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "Грешка при верифицирање на потпис"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "Непозната грешка при проверка на потпис"
 
@@ -12048,7 +11939,7 @@ msgstr "Еднаш неделно"
 msgid "Once per month"
 msgstr "Еднаш месечно"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12060,49 +11951,49 @@ msgstr ""
 "\n"
 "Ве молиме почекајте додека Еволушн ги мигрира вашите папки..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Не може да се креира нова папка `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Не може да се копира папката `%s' во `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Не може да се скенираат постоечките сандачиња во `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Не може да се отворат старите POP податоци кои се чуваат на сервер `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Не може да се креира POP3 папка за податоци кои се чуваат на серверот `%s': %"
 "s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Не може да се копираат POP3 податоците кои се чуваат на серверот `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Не може да се креира место за сместување локална пошта `%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Не може да се креираат папки за локална пошта во `%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12119,6 +12010,10 @@ msgstr "_Одговори на испраќачот"
 msgid "Reply to _List"
 msgstr "Одговори на _листа"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Отвори врска во нов прозорец"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Испрати нова порака до..."
@@ -12131,45 +12026,45 @@ msgstr "_Додај во адресар"
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ова сместување не поддржува претплати, или тие не се вклучени."
 
-#: ../mail/em-subscribe-editor.c:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Претплатено"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Одбери сервер."
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Нема одбрано сервер"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Не ја прикажувај повторно оваа порака."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Филтри на порака"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr "порака"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:634
 msgid "Save Message..."
 msgstr "Зачувај порака..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:683
 msgid "Add address"
 msgstr "Додај адреса"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1167
 #, c-format
 msgid "Messages from %s"
 msgstr "Пораки од %s"
@@ -12178,7 +12073,7 @@ msgstr "Пораки од %s"
 msgid "Search _Folders"
 msgstr "Пребарај _папки"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Пребарај го изворот на папката"
 
@@ -12211,110 +12106,82 @@ msgid "Composer Window default width"
 msgstr "Стандардна ширина на прозорецот за пишување"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Компресиран приказ на адресите во TO/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Компресиран приказ на адресите во TO/CC/BCC на бројката одредена во "
-"address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Стандарден енкодинг во кој се пишуваат пораките"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Стандарден енкодинг во кој се пишуваат пораките."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Стандарден енкодинг во кој се прикажуваат пораките"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Стандарден енкодинг во кои се прикажуваат пораките."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Стандарден стил на препраќање"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Стандардна висина на прозорецот за пишување"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Стандардна висина на прозорецот за пораки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Стандардна висина на прозорецот за претплати"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Стандарден стил на реплицирање"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Стандардна ширина на прозорецот за пишување"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Стандардна ширина на прозорецот за пораки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Стандардна ширина на дијалогот за претплати"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Нацртај индикатор за правописни грешки за зборови додека пишуваш."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Испразни ја папката за ѓубре при излез"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Испразни ги сите папки за ѓубре при излез на Еволушн."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Овозможи caret режим, така да може да видиш курсор кога читаш пошта."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Овозможи ја или оневозможи ја карактеристиката „барај како што пишуваш“"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"Прикажи го својството странична лента така што ќе можете да започнете "
-"интерактивно барање со пишување во текстот. Корисно е бидејќи можете лесно "
-"да најдете папка во таа странична лента само со пишување на името на папката "
-"и изборот автоматски се префрлува на таа папка."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Вклучи/исклучи caret режим"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Висина на панелот за листа на пораки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Висина на панелот за листа на пораки."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12322,15 +12189,7 @@ msgstr ""
 "Ако корисникот се обиде да отвори 10 или повеќе пораки истовремено, прашај "
 "го дали навистина сака да го направи тоа."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-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.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12341,27 +12200,23 @@ msgstr ""
 "прегледник на компоненти во базата на mime типови на GNOМЕ може да се "
 "користат за приказ на содржина."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Го исклучува и вклучува прозорецот при означување на повеќе пораки."
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Последен пат кога е испразнето ѓубрето"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Листа на ознаки и нивните асоцирани бои"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Листа на прифатени пораки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Листа на сметки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12369,11 +12224,11 @@ msgstr ""
 "Листа на сметки познати на mail компонентата на Еволушн. Листата содржи "
 "стрингови кои именуваат подпапки слични на /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Листа на прилагодени заглавја и дали тие се вклучени."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12382,19 +12237,19 @@ msgstr ""
 "стрингови кои содржат name:color каде бојата го користи hex енкодингот на "
 "HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Листа на mime типови за проверка за bonobo прегледници на компоненти"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Листа на имиња на протоколи чии лиценци се прифатени."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Вчитај пораки за HTML пораки преку http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12404,95 +12259,91 @@ msgstr ""
 "вчитај слики од интернет 1 - Вчитај слики во поштата од контакти 2 - Секогаш "
 "вчитувај слики од интернет"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Води запис за дејствата на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Води запис за дејствата на филтрите во назначената лог датотека."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Лог датотека за запис на дејствата на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Лог датотека за запис на дејствата на филтрите."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Означи како видени по одреден тајмаут"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Означи како видени по одреден тајмаут."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означи цитати во пораката \"Преглед\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означи цитати во пораката \"Преглед\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Стандардна висина на прозорецот со пораки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Стандардна ширина на прозорецот за пораки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Вид на приказ на поракта (\"нормален\", \"цело заглавје\", \"извор\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Минимум денови меѓу празнењето ѓубре при излез"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Минимум време меѓу празнењето ѓубре при излез, во денови."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Нова звучна датотека за известување за нова пошта"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Тип на известување за нова пошта"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Број на адреси за прикажување во TO/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Извести кога е без тема"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Извести го корисникот кога сака да уништи папка."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Извести го корисникот кога сака да испрати порака без тема."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Извести кога корисникот уништува"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Извести кога корисникот внесува само слепа копија"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Извести кога корисникот сака да отвори 10 или повеќе пораки истовремено"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12500,107 +12351,89 @@ msgstr ""
 "Извести кога корисникот сака да испрати HTML пошта на корисници кои не "
 "сакаат да примаат HTML пошта."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Извести кога корисникот сака да испрати порака без До или Копија до примачи."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Извести кога корисникот сака да испрати несакан HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "Прашај за означување на повеќе пораки"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Препознај врски во текст и замени ги."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Препознај смешковци во текст и замени ги со слики."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Стартувај тест за отпад на доаѓачката пошта"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Стандардно испраќај HTML пораки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Стандардно испраќај HTML пораки."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Покажи анимации"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Покажи анимирани слики како анимации."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Покажи избришани пораки (без strike-through) во листата со пораки."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 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.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Звучна датотека за свирење кога пристигнува нова пошта."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Го назначува типот на известување за нова пошта кој корисникот сака да го "
 "користи."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Направи проверка на правопис"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Стандардна висина на дијалог за претплати"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Стандардна ширина на дијалог за претплати"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Терминал фонт"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Последен пат кога е испразнето ѓубрето, во денови од epoch наваму."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Терминал фонтот за приказ на пошта"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Варијабилна ширина на фонт за приказ на пошта"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12611,111 +12444,99 @@ msgstr ""
 "не се прикажуваат. Форматот на XML структурата е &ltч заглавје вклучено^gt; "
 "- постави вклучено ако заглавјето треба да се прикжи во приказот на поштата."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-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:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Стави ја листата со пораки во нишка."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Стави ја листата со пораки во нишка"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Постави нишка за листата со пораки според темата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Тајмаут за означување пораки како видени"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Тајмаут за означување пораки како видени."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID стринг на стандардната сметка."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Користи Spamassassin даемон и клиент"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Користи Spamassassin даемон и клиент (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Користи прилагодени фонтови"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Користи прилагодени фонтови за приказ на пошта"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Користи само локални спам тестови."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Користи ги само локалните спам тестови (без DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Користи широк поглед или едно до друго"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Варијабилна ширина на фонт"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Поглед/Bcc мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Поглед/Bcc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Поглед/Cc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Поглед/Cc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Поглед/Од мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Поглед/Од мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Поглед/Пишувај мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Поглед/Пишувај мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Поглед/Одговори на мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Поглед/Одговори на менито предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12723,14 +12544,6 @@ msgstr ""
 "Дали да се направи fall back на нишките според теми кога пораките не содржат "
 "In-Reply-To или References заглавја."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Ширина на панелот за листа на пораки"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Ширина на панелот за листа на пораки."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Увезување на Elm податоци"
@@ -12762,15 +12575,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr " Формат на папките на Berkeley Mailbox увезувач"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Увезување на '%s'"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Почекај"
 
@@ -12957,31 +12770,31 @@ msgstr[0] ", %d непрочитана"
 msgstr[1] ", %d непрочитана"
 msgstr[2] ", %d непрочитана"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Нова порака"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_Порака"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Пишувај нова порака"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Нова папка за пошта"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "Папка за _пошта"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Креирај нова папка за пошта"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Не може да се надградат поставувањата за поштата или папките."
 
@@ -13009,220 +12822,226 @@ msgstr "Д_а се направи"
 msgid "_Later"
 msgstr "_Подоцна"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Провери за поддржани типови"
 
-#: ../mail/mail-config.glade.h:3
+#: ../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
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>П_отписи</b> "
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Јазици</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 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:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Информации за сметката</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 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
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Прикажани заглавја</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Филтер опции</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Ознаки и бои</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Вчитувам слики</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Приказ на порака</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Фонтови на порака</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Потврди на порака</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Известување за нова порака</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../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:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Опции</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Печатени фонтови</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Потребни информации</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Безбедност</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Испратени и скици пораки</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</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 mail"
 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 mail"
 msgstr "Секогаш енкриптирај _сам кога испраќаш енкриптирана пошта"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Прикачи оригинална порака"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Автоматски вметни _слики со смешковци"
 
-#: ../mail/mail-config.glade.h:46
+#: ../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 "Beep w_hen new mail arrives"
 msgstr "_Свирни ко_га пристигнува нова пошта"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Ен_кодинг:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Про_вери за поддржани типови"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Провери _доаѓачка пошта за отпад:"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Провери правопис дури пишувам"
 
-#: ../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 "Ис_чисти"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "И_счисти"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Боја за _погрешни зборови:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Бои"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "Потврди _кога уништуваш папка"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13238,134 +13057,134 @@ msgstr ""
 "\n"
 "Кликнете \"Примени\" за зачувување на поставувањата."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "Ста_ндардно"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Стандарден е_нкодинг:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Дигитално _потпиши ги појдовните пораки (стандардно)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Не цитирај оригинална порака"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Завршено"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Па_пка за скици:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "Вк_лучи"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Сметки за е-пошта"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "Адреса за _е-пошта:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Испразни папки со отпад при и_злез"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Сертификат за е_нкрипција:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Енкриптирај ги пој_довните пораки (стандардно)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Фик_сна ширина на Фонт:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Фик_сна ширина:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Својства на фонт"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Форматирај пораки во _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "_Цело име:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML пошта"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Заглавја"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Осветли _цитати со"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "Вк_лучи далечни тестови"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Внатре"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Табела со јазици"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Конфигурација на пошта"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Табела со mail заглавја"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Локација на сандаче"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Пишувач на пораки"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Забелешка: нема да се бара лозинка од тебе додека не се поврзеш за првпат"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Свири звучна датотека кога при_стига нова пошта"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13373,7 +13192,7 @@ msgstr ""
 "Ве молиме внесете описно име за оваа сметка во местото подоу.\n"
 "Ова име ќе се користи само за приказ."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13381,7 +13200,7 @@ msgstr ""
 "Ве молиме внесете информации за начинот на кој ќе испраќате пошта. Ако не "
 "сте сигурни, прашајте го систем администраторот или интернет провајдерот."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13391,115 +13210,115 @@ msgstr ""
 "полињата долу не треба да се пополнат, доколку не сакате информациите да "
 "бидат вклучат во Вашите пораки."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Ве молиме одберете помеѓу следниве опции"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Из_вести кога испраќаш пораки дефинирани само со Bcc примачи"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Цитирај оригинална порака"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Запо_мни лозинка"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Од_говори на:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Запом_ни лозинка"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "Одбе_ри..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "С_тандарден фонт:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "Избер_и..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "Одбери фиксна ширина на HTML фонт"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "Одбери фиксна ширина на HTML фонт за печатење"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "Одбери варијабилна ширина на HTML фонт"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "Одбери HTML варијабилна ширина на HTML фонт за печатење"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "Одбери звучна датотека"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "Испрати потврда на порака:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Испраќам пошта"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Папка со ис_пратени пораки:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Сер_верот бара автентикација"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "_Тип на сервер:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Сертификат за по_тпис:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "По_тпис:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Потписи"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Табела со потписи"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Назначи _име на датотека:"
 
-#: ../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 "Т_ип:"
 
-#: ../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."
@@ -13507,7 +13326,7 @@ 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"
@@ -13517,7 +13336,7 @@ msgstr ""
 "потпис. Името кое ќе го назначиш ќе се користи \n"
 "само за приказ."
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13525,15 +13344,15 @@ msgstr ""
 "Внесете го името кое ќе се однесува на оваа сметка.\n"
 "На пример: \"Работа\" или \"Лично\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Корисничко _име:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "В_аријабилна ширина:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13543,71 +13362,67 @@ msgstr ""
 "\n"
 "Кликнете \"Напред\" за старт."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Додај потпис"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Секогаш вчитувај слики од интернет"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не ме известувај кога пристигнува нова пошта"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Не п_отпишувај барања за состаноци (за Аутлук компатибилност)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Тип на препраќање:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Вчитај слики во пошта од контакти"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Направи ја оваа сметка стандардна"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Означи ги пораките како прочитано после"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Никогаш не вчитувај слики од интернет"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Патека:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../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:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Извести кога испраќаш пораки со празна линија за тема"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Т_ип на одговор:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Скрипта:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Show image animations"
 msgstr "_Покажи анимации"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Смали ги заглавијата До / Cc / Bcc до "
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Користи безбедно поврзување:"
@@ -13617,21 +13432,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "_Користи ги истите фонтови како другите апликации"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "адреси"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "боја"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "опис"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Пребарај ги изворите на паките</b>"
@@ -13645,63 +13452,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Енкрипција</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Сите активни далечни папки"
-
-#: ../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
 msgid "Case _sensitive"
 msgstr "Осетливо на големина на букви"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Завршено"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "П_ронајди:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Барај во порака"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Постави знаме за следење"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Претплати на папки"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Договор за лиценца"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Ништо одбрано"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "С_ервер:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Информации за безбедност"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Одредени папки"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13709,51 +13500,67 @@ msgstr ""
 "Пораките кои ги одбра за следење се прикажани долу.\n"
 "Одбери акција за следење од \"Знаме\" менито."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Прифати лиценца"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_До:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Знаме:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Претплати"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_Го прифаќам договорот за лиценца"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Откажи претплата"
 
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "само одредени папки"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "со сите активни далечни папки"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "со сите локални и активни далечни папки"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "со сите локални папки"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Пингувам %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Папка за филтрирање"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Собирам пошта"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Не успеа да се применат поаѓачките филтри: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13762,100 +13569,100 @@ msgstr ""
 "Не може да се додаде до %s: %s\n"
 "Наместо, додавам на локалната 'Испратени' папка"
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Не може да се додаде на локалната папка 'Испратени': %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Испраќам порака %d од %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Не може да се испрати %d од %d пораки"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Откажано."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Завршено."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Зачувувам порака во папка"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Преместувам пораки во %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирам пораки во %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Препратени пораки"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отворам папка %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Отворам сместување %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Отстранувам папка %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сместувам папка '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Уништувам и сместувам сметка '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Сместувам сметка '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Освежувам папка"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Уништувам папка"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Празнам ѓубре во '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Локални папки"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Примам порака %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -13863,7 +13670,7 @@ msgstr[0] "Собирам порака %d"
 msgstr[1] "Собирам пораки %d"
 msgstr[2] "Собирам пораки %d"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -13871,7 +13678,16 @@ msgstr[0] "Зачувувам %d порака"
 msgstr[1] "Зачувувам %d пораки"
 msgstr[2] "Зачувувам %d пораки"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Не може да се креира излезна датотека: %s\n"
+"%s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13880,11 +13696,11 @@ msgstr ""
 "Грешка при зачувување пораки во: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Зачувувам привезок"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13893,69 +13709,60 @@ msgstr ""
 "Не може да се креира излезна датотека:%s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не може да се запишат податоците: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Одврзи се од %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторно врзи се на %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Проверувам сервис"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Откажувам..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Испрати и прими пошта"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "Откажи _се"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Ажурира..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Проверувам за нова пошта"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Внеси лозинка-реченица за %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Внеси лозинка-реченица"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Внеси лозинка за %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Внеси лозинка"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Корисникот ја откажа операцијата."
 
@@ -14011,11 +13818,11 @@ msgstr "Ги ажурирам папките за пребарување за '%
 msgid "Updating Search Folders for '%s'"
 msgstr "Ги ажурирам папките за пребарување за '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Уреди ја папката за пребарување"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Нова папка за пребарување"
 
@@ -14028,14 +13835,14 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"quit.\n"
 msgstr ""
 "Непразна папка во &quot;{1}&quot; веќе постои.\n"
 "\n"
 "Може да одберете да ја игнорирате оваа папка, да ја пребришете или ја "
-"додадете нејзината содржина, или да излезете."
+"додадете нејзината содржина, или да излезете.\n"
 
-#: ../mail/mail.error.xml.h:5
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -14043,13 +13850,13 @@ msgstr ""
 "Известување за потврда за читање е побарано за &quot;{1}&quot;. Испрати "
 "известување за потврдата на {0}?"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr "Потписот веќе постои со името &quot;{0}&quot;. Ве молиме користете друго име."
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -14057,23 +13864,23 @@ 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?"
@@ -14081,7 +13888,7 @@ 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;?"
@@ -14089,81 +13896,81 @@ msgstr ""
 "Сигурно сакаш трајно да ги отстраниш сите избришани пораки во папката &quot;"
 "{1}&quot;?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Сигурно сакаш да испратиш порака во 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
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "Бидејќи &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "Бидејќи &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Празни Потписи"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Не можам да ја додадам папката за пребарување &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Не може да се копира папката &quot;{1}&quot; во &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Не може да се креира папката &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Не може да се креира привремена папка за зачувување."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Не може да се креира папка за зачувување, бидејќи &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Не може да се избрише папката &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Не може да се избрише системската папка &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Не можам да ја уредам папката за пребарување &quot;{0}&quot; бидејќи не "
 "постои."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Не може да се премести папката &quot;{1}&quot; во &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Не може да се отвори изворот &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Не може да се отвори изворот &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Не може да се отвори целта &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14173,31 +13980,31 @@ msgstr ""
 "во инсталацијата. Нема да можете да го користите овој провајдер додека не ја "
 "прифатите неговата лиценца."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Не може да се преименува &quot;{1}&quot; во &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Не може да се преименува или премести системската папка &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Не може да се зачуваат промените на сметката."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Не може да се зачува во папката &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Не може да се зачува во датотеката &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Не може да се постави скрипта со потпис &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14205,71 +14012,71 @@ msgstr ""
 "Провери дали вашата лозинка е точно напишана. Запомнете дека многу лозинки "
 "се осетливи на голема буква; caps lock можеби е вклучен."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "Не може да се зачува датотеката со потпис."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Избриши &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "Избриши сметка?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Discard changes?"
 msgstr "Отфрли го променетото?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Не бриши"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "не оневозможувај"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Сигурно сакаш операцијата да се направи во подпапките?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Дали саакате да ѓи означите сите пораки како прочитани?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Дали сакаш да ги сочуваш промените?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Внесете лозинка"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Грешка при вчитување на филтер дефиниции."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Грешка при правење на операцијата."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "Грешка додека {0}"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "Датотеката постои но не може да се пребрише."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "Датотеката постои но е е обична датотека."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ако продолжиш нема да можеш да ги повратиш овие пораки."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14277,11 +14084,11 @@ msgstr ""
 "Ако ја избришеш оваа папка, целата содржина и содржината на подпапките ќе "
 "биде трајно избришана."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ако продолжиш, сите прокси сметки ќе бидат избришани перманентно."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14289,11 +14096,11 @@ msgstr ""
 "Ако продолжиш, информациите за сметката и\n"
 "сите прокси информации ќе бидат трајно избришани."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ако продолжиш, информациите за сметката ќе бидат трајно избришани."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14301,19 +14108,19 @@ msgstr ""
 "Ако излезеш, овие пораки нема да бидат испратени додека Еволушн не се "
 "подигне повторно."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "Игнорирај"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "Невалидна автентикација"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "Филтрите за пошта се автоматски ажурирани."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14325,35 +14132,35 @@ msgstr ""
 "вашата порака. За да се одбегне ова, треба да додадете барем еден До: или "
 "CC: примач."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read"
 msgstr "Означи ги сите пораки како прочитани"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Mark all messages as read in the selected folder"
 msgstr "Означи ги сите пораки како прочитани во одбраната папка"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Недостасува папка."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Нема одбрано извори."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Отворањето премногу пораки истовремено може да трае долго."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Ве молиме проверете ги поставките за сметката и обидете се повторно."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "Ве молам овозможете ја сметката или испратете користејки друга сметка."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14361,7 +14168,7 @@ msgstr ""
 "Ве молиме внесете валидна адреса во До: полето. Може да барате адреси за е-"
 "поштасо кликнување на До: копчето после полето за внес."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14372,55 +14179,55 @@ msgstr ""
 "{0}\n"
 "Сепак испрати?"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Ве молам создадете уникатно име да го идентификувате овој потпис."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Почекај"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Проблем при мигрирање на папките со стара пошта &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Го чекам серверот"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Чекам листа од серверот за поддржани механизми."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Потврда за читање е побарана"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Да ја избришам папката &quot;{0}&quot; и сите нејзини подпапки?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Пребарувањето на папките се ажурира автоматски."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Испрати потврда"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "Потписот Веќе Постои"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Системски папки се потребни за Еволушн да функционира точно и не може да се "
-"преименуваат, преместуваат или бришат."
+"Системски папки се потребни за Ximian Еволушн да функционира точно и не може "
+"да се преименуваат, преместуваат или бришат."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14436,7 +14243,7 @@ msgstr ""
 "само BCC примачи. За да се одбегне ова, треба да додадете барем еден До: или "
 "CC: примач."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14450,7 +14257,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "И се ажурирани."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14464,11 +14271,23 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "И се ажурирани."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
+msgid ""
+"The message was sent via the &quot;sendmail&quot; external application. "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
+msgstr ""
+"Пораката беше пратена преку &quot;sendmail&quot; надворешната апликација. "
+"Sendmail извести за следнава грешка: status 67: mail not sent.\n"
+"Пораката е сместена во Пратени папката. Провери ја пораката за грешки и "
+"препратете ја"
+
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "Датотеката со скрипти мора да постои и да биде извршна."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14476,7 +14295,7 @@ msgstr ""
 "Оваа папка може имплицитно да е додадена,\n"
 "одете во уредувачот за експлицитно додавање, ако е потребно."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14484,11 +14303,11 @@ msgstr ""
 "Оваа порака не може да се испрати бидејќи сметката што ја одбравте за "
 "испраќање не е овозможена"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Оваа порака не може да се испрати бидејќи немате назначено ниеден примач."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14496,21 +14315,21 @@ msgstr ""
 "Овој сервер не го поддржува овој тип на автентикација и може воопшто да не "
 "поддржува автентикација."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Потписот е изменет, но не е зачуван."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Ова ќе ѓи означи пораки како прочитани во одбраната папка и во подпапките."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "Не може да се поврзе со GroupWise серверот."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14518,39 +14337,39 @@ msgstr ""
 "Не можам да ја отворам папката со скици за оваа сметка. Користи ја "
 "системската папка со скици наместо?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "Не може да се прочита датотеката со лиценца."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "Користи стандардно"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "Користи стандардна папка за непратени?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr "Не сте ги внеле сите потребни информации."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате непратени пораки, сигурно сакате да излезете?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "Не може да се креираат две сметки со исто име."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Мора да и дадете име на оваа папка за пребарување."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Мора да назначите папка."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14560,94 +14379,98 @@ msgstr ""
 "Преку поединечен избор на папките и/или преку избор на сите локални папки, "
 "сите далечни папки, или и двете."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Твоето логирање на серверот &quot;{0}&quot; како &quot;{0}&quot; не успеа."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+msgstr "Пораката со темата &quot;{0}&quot; не беше доставена."
+
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "_Додај"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "_Занемари промени"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "Уништи"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "_Отвори пораки"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Невидени"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Видени"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Одговорени"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Повеќе невидени пораки"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Повеќе пораки"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Најниско"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Пониско"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Повисоко"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Највисоко"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Денес %l:%M %p"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Пораки"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3441
 msgid "Generating message list"
 msgstr "Генерирам листа на пораки"
 
@@ -14667,15 +14490,15 @@ msgstr "Знаме"
 msgid "Follow Up Flag"
 msgstr "Следи знаме"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Оригинална локација"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Примено"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Испратени пораки"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Големина"
@@ -14823,10 +14646,6 @@ msgstr "Автоматски контакти"
 msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "_Автоматски креирај записи во адресарот кога одговараш на mail"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "Изберете адресар за автоматски контакти"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "Контакти за брзи пораки"
@@ -14836,10 +14655,6 @@ msgstr "Контакти за брзи пораки"
 msgid "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "Повремено синхронизирај информации и слики од мојот клиент за бр_зи пораки"
 
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "Изберете адресар за контактите од Gaim"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -14948,6 +14763,10 @@ msgstr ""
 "Тест додаток кој демонстрира popup мени додаток кој овозможува копирање во "
 "клипбордот."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Копирај _адреса за е-пошта"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Алатка за копирање"
@@ -15089,24 +14908,24 @@ msgstr "Големина на папки"
 msgid "Exchange Settings"
 msgstr "Exchange подесувања"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "А_втентикација"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "Тип на автентикација"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "Про_вери за поддржани типови"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-calendar.c:193
+#: ../plugins/exchange-operations/exchange-contacts.c:167
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15145,15 +14964,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:662
 #, 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
 msgid "Custom"
 msgstr "Прилагодено"
 
@@ -15273,7 +15090,7 @@ msgstr "Име на папка"
 msgid "Folder Size"
 msgstr "Големина на папка"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Претплати се на папка на друг корисник"
@@ -15288,14 +15105,14 @@ msgstr "Дрво со Exchange папки"
 msgid "Unsubscribe Folder..."
 msgstr "Откажи претплата за папка..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Навистина откажи претплата за папка \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Откажи претплата од \"%s\""
@@ -15328,59 +15145,59 @@ msgstr "Додај корисник:"
 msgid "Add User"
 msgstr "Додај корисник"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Опции</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Не може да се избрише"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Не може да се уреди"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Креирај предмети"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Креирај подпапки"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Избриши било кои предмети"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Избриши сопствени предмети"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Измени било кои предмети"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Уреди свои предмети"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Контакт папка"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Сопственик на папка"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Видлива папка"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Прочитај предмети"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Улога:"
 
@@ -15419,26 +15236,22 @@ msgid "Cannot display folders."
 msgstr "Не може да се прикажат папките."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Промените на  конфигурацијата на Exchange сметката \"{0}\" ќе се случат "
-"откако ќе излезете и го рестартирате Еволушн."
+"Промените на  конфигурацијата на Exchange сметката ќе се случат откако ќе "
+"излезеш и го рестартираш Еволушн."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Не може да се автентицира на серверот."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Не може да се смени лозинка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15448,55 +15261,55 @@ msgstr ""
 "настана непозната грешка. Провери го URL, \n"
 "корисничкото име и лозинка и обиди се повторно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Не можам да се поврзам со Exchange серверот"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Не може да се поврзе со серверот {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Не може да се утврдат привилегии за папка за делегирање."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Не може да се пронајде Exchange Web Storage System."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Не може да се лоцира серверот {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Не може да се направи {0} делегат"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Не може да се прочитаат привилегии за папката"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Не може да се прочитаат привилегии за папката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Не може да се прочита надвор-од-канцеларија состојбата"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Не може да се ажурираат привилегии за папката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Не може да се ажурира out-of-office состојба"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 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:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15524,28 +15337,28 @@ msgstr ""
 "{0}\n"
 ".."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Не може да се ажурира делегирањето:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Папката веќе постои"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Папката не постои"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Папката е офлајн"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Општа грешка"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -15553,63 +15366,63 @@ msgstr ""
 "Ако ОWA работи на различна патека, мора да го назначиш тоа во дијалогот за "
 "конфигурација на сметката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Сандачето за {0} не е на овој сервер."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Осигурај се дека URL е точно и обиди се повторно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Осигурај се дали името на серверот е точно напишано и обиди се повторно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr "Осигурај се дали корисничкото име и лозинката се точни и обиди се повторно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "Нема конфигурирано Global Catalog сервер за оваа сметка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Нема сандаче за корисникот {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Нема таков корисник {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Лозинката успешно е променета."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Ве молиме рестартирајте го Еволушн за промените да стапат во сила"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Ве молиме рестартирајте го Еволушн"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Ве молиме одберете корисник"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Серверот ја отфрли лозинката бидејќи е премногу лесна."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange сметката ќе биде исклучена кога ќе излезеш од Еволушн"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange сметката ќе биде отстранета кога ќе излезеш од Еволушн"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange серверот не е компатибилен со Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15617,7 +15430,7 @@ msgstr ""
 "Овој сервер работи под Exchange 5.5 Exchange Connector \n"
 "поддржува само Microsoft Exchange 2000 и 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15631,51 +15444,51 @@ msgstr ""
 "\n"
 "Или може едноставно погрешно да е внесена лозинката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Обиди се повторно со друга лозинка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Не може да се додаде корисникот за пристап на контролната листа:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Не може да се уреди делегирањето."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Непозната грешка при барање на {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Непозната грешка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Непознат тип"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Неподдржана операција"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Се приближуваш кон границата за сместување пошта на овој сервер."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Не можеш да се направиш самиот свој делегат."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Ја премина границата за сместување пошта на овој сервер."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Можеш да конфигурираш само една Exchange сметка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15683,13 +15496,13 @@ msgstr ""
 "Тековната искористеност е: {0} KB. Обиди се да исчистиш место со бришење на "
 "пошта."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "Тековната искористеност е: {0} KB. Сега не можеш да примаш и испраќаш пошта."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15697,19 +15510,19 @@ msgstr ""
 "Тековната искористеност е: {0}KB. Не можеш да примаш и испраќаш пошта се "
 "додека не направиш место т.е избришеш пораки."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Вашата лозинка истече."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} не може да се додаде на контролна листа за пристап"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} веќе е делегат"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} веќе е во листата"
 
@@ -15736,7 +15549,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Откажи претплата од папките"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr "Листа за проверка"
 
@@ -15787,7 +15600,7 @@ 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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Опции за испраќање"
 
@@ -15905,10 +15718,7 @@ msgstr "Прокси логин"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВнеси лозинка за %s (корисник %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "_Прокси логин..."
 
@@ -15969,12 +15779,12 @@ msgid "Select Calendar"
 msgstr "Избери календар"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Увези"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar формат (.ics)"
 
@@ -16026,116 +15836,116 @@ msgstr "Не можам да отворам calendar/todo!"
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "Не можам да го отворам Еволушн calendar/todo листа за да експортирам податоци"
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Не може да се отвори календарот '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Некој дел во календарот '%s' има конфликт со овој состанок"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Најден е делот во календарот '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Не можам да најдам календари"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не можам да го најдам состанокот во овој календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Не можам да ја најдам оваа задача во листата со задачи"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Не можам да го најдам овој дневник внатре во некој дневник"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Пребарувам за постоечка верзија на ова поставување"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Не може да се претвори предметот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Не може да се испрати предмет во календар '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Испратено во календар '%s' како прифатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Испратено во календар '%s' како неприфатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Испратено во календар '%s' како неприфатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Испратено во календар '%s' како откажано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организерто го отстрани делегатот %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Испратено е известување за отказ на делегатот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Не можам да испратам известување за отказ на делегатот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Статусот на посетителот  не може да биде ажуриран заради неважечки статус!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Не може да се ажурира посетителот. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Статусот на посетителот е ажуриран"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Прикачениот календар не е валиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "Пораката тврди дека содржи календар, но календарот не е валиден iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Предметот во календарот не е валиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16143,11 +15953,11 @@ msgstr ""
 "Пораката содржи календар, но календарот не содржи настани, задачи или "
 "слободно/зафатено информации"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Прикачениот календар содржи повеќе предмети"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16157,23 +15967,23 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Избриши порака по акција"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Пребарување конфликти"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Одбери ги календарите за барање на конфликтни состаноци"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Денес"
 
@@ -16511,26 +16321,26 @@ msgid "_Update"
 msgstr "_Надградба"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Почетно време:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Време на завршување:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Испрати а_журирање на присутните"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "При_мени во сите случаи"
 
@@ -16545,10 +16355,10 @@ msgstr "Itip Formatter"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; го делегира состанокот. Дали сакаш да го додадеш делегатот "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16630,14 +16440,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Конвертирај ја порака во нова дазача"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Сопственик на _контакт листата"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
 msgstr "Земи _архива на листа"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Земи информации за _користење на листата"
 
@@ -16659,14 +16472,17 @@ msgstr ""
 "претплата, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Објави порака на листа"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Претплати се на листа"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Откажи претплата на листа"
 
@@ -16748,27 +16564,15 @@ msgstr "_Измени порака"
 msgid "_Send message"
 msgstr "_Испрати порака"
 
-#: ../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 "Контактирај го сопственикот на пошт. листа каде припаѓа оваа порака"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Земи _архива на листа"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-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 "Земи архива на листата каде припаѓа оваа порака"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Земи информации за искористеноста на листата каде припаѓа оваа порака"
 
@@ -16784,24 +16588,12 @@ msgstr "Претплати се на пошт. листа каде припаѓ�
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Откажи претплата од пошт. листа каде припаѓа оваа порака"
 
-#: ../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/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Означи како _прочитани"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Означи по_раки како прочитани"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -17062,16 +16854,16 @@ msgstr "Зачувај приврзоци ..."
 msgid "Save all attachments"
 msgstr "Зачувај ги сите приврзоци"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Одбери базно име за зачувување"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME тип"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Зачувај"
 
@@ -17181,7 +16973,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF формат (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Одбери дестинациска датотека"
 
@@ -17230,19 +17022,19 @@ msgstr ""
 "\n"
 "Кликнете на копчето \"Напред\" за да продолжите."
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Ве молиме одберете ги информациите кои сакате да ги увезете:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, 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:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Увезување податоци."
 
@@ -17296,66 +17088,58 @@ msgid "Default window height"
 msgstr "Стандардна висина на прозорец"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-msgid "Default window state"
-msgstr "Стандардна состојба на прозорец"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Стандардна ширина на прозорец"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID или алијас на компонентата за стандарден приказ при стартување."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "Последна надградена конфигурациска верзија"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Листа на патеки за папките кои ќе бидат синхронизирани на дискот за офлајн "
 "користење"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "Поставувања за печатач"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Sidebar is visible"
 msgstr "Лентата со алатки е видлива"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Изостави дијалог со предупредување за развој"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "Стартувај во офлајн режим"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Лентата за статус е видлива"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "Конфигурациската верзија на Еволушн, со големо/помало/ниво на конфигурација."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "Стандардна висина за главниот прозорец, во пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "Стандардна ширина за главниот прозорец, во пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "Стандардна ширина на страничната лента, во пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17363,7 +17147,7 @@ msgstr ""
 "Последната надградена конфигурациска верзија на Еволушн, со големо/помало/"
 "ниво на конфигурација"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17373,43 +17157,35 @@ msgstr ""
 "\", \"алатник\". Ако \"алатник\" е поставен, стилот на копчињата е одреден "
 "од GNOME поставки за алатникот."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "Лентата со алатки е видлива"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Дали Еволушн ќе стартува во офлајн режим наместо онлајн."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether or not the window should be maximized."
-msgstr "Дали прозорецот да биде максимизиран."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether the sidebar should be visible."
 msgstr "Дали лентата со алатки треба да биде видлива."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Дали лентата за статус треба да биде видлива."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "Дали лентата со алатки треба да биде видлива."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Дали дијалогот за предупредување во развојните верзии на Еволушн е изоставен."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "Дали копчињата на прозорците треба да се видливи."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "Стил на копчињата на прозорците"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "Копчињата на прозорците се видливи"
 
@@ -17430,11 +17206,11 @@ msgstr "Кликни OK за затворање на овие поврзувањ
 msgid "(Untitled)"
 msgstr "(Безимено)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Одбери го типот на увезувач за стартување:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17448,11 +17224,11 @@ msgstr ""
 "Можеш да одбереш \"Автоматски\" ако не знаеш, и Еволушн ќе се обиде да го "
 "направи."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Одбери дестинација за ова увезување"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17464,23 +17240,23 @@ msgstr ""
 "за увезување. Ако сакаш да се\n"
 "обидеш повторно, кликни на \"Назад\" копчето.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "И_ме на датотека:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Одбери датотека"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Тип на _датотека:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Увези податоци и поставки од _постари програми"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Увези _една датотека"
 
@@ -17528,75 +17304,70 @@ msgstr "Bug buddy не може да се стартува."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:561
+#: ../shell/e-shell-window-commands.c:530
 msgid "translator-credits"
 msgstr ""
 "Дамјан Георгиевски, Марко Иваноски, Иван Стојмиров, \n"
 "Александар Савиќ http://www.slobodensoftver.org.mk"
 
-#: ../shell/e-shell-window-commands.c:806
+#: ../shell/e-shell-window-commands.c:775
 msgid "_Work Online"
 msgstr "_Работи онлајн"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Работи офлајн"
 
-#: ../shell/e-shell-window-commands.c:832
+#: ../shell/e-shell-window-commands.c:801
 msgid "Work Offline"
 msgstr "Работи офлајн"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Еволушн моментно е онлајн. Кликни на ова копче за работење офлајн."
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "Еволушн е во тек да стане офлајн."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Еволушн моментно е офлајн. Кликни на ова копче за работење онлајн."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "Префрли на %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Непозната системска грешка."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "Во ред"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Невалидни аргументи"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Не може да се регистрира на OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 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:685
 msgid "New"
 msgstr "Ново"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Ново "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Нов тест"
@@ -17648,7 +17419,7 @@ msgstr ""
 "увезување надворешни датотеки во Еволушн."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:230
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17683,7 +17454,7 @@ msgstr ""
 "Се надеваме дека уживате во резултатите од нашата напорна\n"
 " работа и со задоволство го очекуваме вашето мислење.\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:254
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17691,39 +17462,35 @@ msgstr ""
 "Благодариме\n"
 "Еволушн тимот\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:261
 msgid "Do not tell me again"
 msgstr "Не ми кажувај повторно"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:471
 msgid "Start Evolution activating the specified component"
 msgstr "Стартувај го Еволушн со активирање на одредената компонента"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:475
 msgid "Start in online mode"
 msgstr "Стартувај во онлајн режим"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:478
 msgid "Forcibly shut down all Evolution components"
 msgstr "Насила исклучи ги сите Еволушн компоненти"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:482
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Насила ре-мигрирај од Еволушн 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:485
 msgid "Send the debugging output of all components to a file."
 msgstr "Испрати го излезот од дебагирањето на сите компоненти во датотека."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:487
 msgid "Disable loading of any plugins."
 msgstr "Оневозможи вчитување на било кои додатоци."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Еволушн PIM и е-пошта клиент"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:518
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18148,7 +17915,7 @@ msgid "_Edit CA Trust"
 msgstr "_Уреди 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:664
 msgid "Certificate already exists"
 msgstr "Сертификатот веќе постои"
 
@@ -18380,12 +18147,6 @@ 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-tasks.xml.h:2
-msgid "Copy"
-msgstr "Копирај"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Копирај ги избраните контакти во друга папка..."
@@ -18487,7 +18248,7 @@ msgid "Select All"
 msgstr "Одбери се"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Одбери с_е"
@@ -18557,7 +18318,7 @@ msgstr "_Премести го контактот во..."
 msgid "_Move Folder Contacts To"
 msgstr "_Премести ги контактите од папката во"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Ново"
 
@@ -18618,7 +18379,6 @@ msgid "Month"
 msgstr "Месец"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Следно"
 
@@ -18627,7 +18387,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Се прегледува календарот за печатење"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Претходно"
 
@@ -18715,11 +18475,11 @@ msgstr "Отсечи го избраното во клипборд"
 msgid "Paste from clipboard"
 msgstr "Вметни од клипбордот"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Залепи текст од клипбордот"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Одбери го целиот текст"
 
@@ -18754,31 +18514,30 @@ msgstr "Кликни овде за помош"
 msgid "Close"
 msgstr "Затвори"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "В_неси"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Привезок..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Затвори"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "Помош"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "Внеси"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Опции"
@@ -18876,11 +18635,6 @@ msgstr "Префрла дали се прикажува времето како
 msgid "_Alarms"
 msgstr "_Аларми"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Категории"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18946,73 +18700,53 @@ msgid "F_older"
 msgstr "Папка"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "_Преглед на порака"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Премести ја избраната папка во друга папка"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h: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 "Барај п_апки"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Прикажи _преглед на порака"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Прикажи преглед на пораката под листата со пораки"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Прикажи преглед на пораките едно до друго со листата на пораки"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Покажи прозорец за преглед на порака"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Претплати или откажи претплата на папки на далечни сервери"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Класичен преглед"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Копирај ја папката во..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Ф_илтри на порака"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Премести ја папката во..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Ново..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Преглед"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Претплати"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "_Вертикален преглед"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Смени го името на папкава"
@@ -19569,10 +19303,6 @@ msgid "_Unread"
 msgstr "_Непрочитани"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Зумирај"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Зголеми"
 
@@ -19580,7 +19310,7 @@ msgstr "_Зголеми"
 msgid "Close this window"
 msgstr "Затвори го прозорецов"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Главен алатник"
 
@@ -19655,6 +19385,11 @@ msgstr "Означи за земање потврда за достава ког
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "В_неси"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Отвори датотека"
@@ -19983,51 +19718,43 @@ msgstr "Икони _и текст"
 msgid "Import data from other programs"
 msgstr "Увези податоци од други програми"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "Из_глед"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Нов _прозорец"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "Префер_енци"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Испрати / Прими"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Испрати / _Прими"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Испрати пораки кои чекаат и превземи нови"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Подеси PDA конфигурација"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Прикажи информации за Еволушн"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Прикажи странична _Лента"
+msgid "Side _Bar"
+msgstr "Странична _Лента"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Прикажи статусна _лента"
+msgid "Status _Bar"
+msgstr "Статусна _лента"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Прикажи лен_та со алатки"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Прикажи информации за Еволушн"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Испрати извештај за грешка"
 
@@ -20035,71 +19762,75 @@ msgstr "Испрати извештај за грешка"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Испрати извештај за грешка"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Испрати извештај за грешка со Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Префрлете ако работите неповрзани."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Лен_та со алатки"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Стил на лента со а_латки"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Прикажи/Сокри ја Страничната Лента"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Прикажи/Сокри ја Статусната Лента"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_За:"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Затвори прозорец"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Заборави _лозинки"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Скриј копчиња"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Само _икони"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Брза референца"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Излези"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Изглед на менувач"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Опции за _синхронизација..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "_Само текст"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "Прозорец"
 
@@ -20136,34 +19867,26 @@ msgid "_Work Week View"
 msgstr "Поглед на работна недела"
 
 #: ../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 "Како _папка со испратени"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "По с_татус"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "По исп_раќач"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "По _тема"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "По о_знака за проследување"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "За _широк преглед"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Пораки"
 
@@ -20179,12 +19902,8 @@ 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20240,7 +19959,7 @@ msgid "_Edit..."
 msgstr "_Уреди"
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1839
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20254,11 +19973,11 @@ msgstr "Случај"
 msgid "Save Current View"
 msgstr "Зачувај тековен поглед"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "_Креирај нов поглед"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Замени постоечки поглед"
 
@@ -20305,19 +20024,14 @@ msgstr "Тип на поглед"
 msgid "Type of view:"
 msgstr "Тип на поглед:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Предложи автоматски приказ на привезок"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "МВСЧПСН"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20385,11 +20099,11 @@ msgid "Minimum Width"
 msgstr "Минимална ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Проред"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Сега"
 
@@ -20517,41 +20231,33 @@ msgstr "Комбо поле за избор на време"
 msgid "Time"
 msgstr "Време:"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "Се_га"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Денес"
-
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Проширено"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Дали проширувачот е отворен"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Текст на ознаката на проширувачот"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Користи потцртано"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20559,89 +20265,73 @@ msgstr ""
 "Ако е поставено, подвлекувањето во текстот значи дека наредниот карактер "
 "треба да се користи за mnemonic accelerator key"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Место за оставање меѓу ознаката и детето"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Ознака widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Widget за приказ наместо ознаката на вообичаениот проширувач"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Големина на проширувачот"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Големина на стрелката на проширувачот"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Растојание на индикатор"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Проред околу стрелката на проширувачот"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Напредно пребарување"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Зачувај претрага"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Пребарува"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "_Пребарува"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Зачувај претрага"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "Зачувај пребарување..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "Измени ги снимените претраги"
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Напредно пребарување..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Сите сметки"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Тековна сметка"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Тековна папка"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Тековна порака"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 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."
@@ -20674,52 +20364,52 @@ msgstr "Reflow модел"
 msgid "Column width"
 msgstr "Ширина на колоната"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Барај"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "Пребарај"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "Најди сега"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "Исчисти"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Тип на пребарување"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID на ставка"
 
-#: ../widgets/misc/e-search-bar.c:792 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "ID на подставка "
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Текст"
 
-#. 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:911
-msgid "Show: "
-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:927
-msgid "S_earch: "
-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:938
-msgid " in "
-msgstr " во "
-
-#: ../widgets/misc/e-selection-model-array.c:547
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Најди _сега"
+
+#: ../widgets/misc/e-selection-model-array.c:546
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "Ред на курсорот"
 
-#: ../widgets/misc/e-selection-model-array.c:554
+#: ../widgets/misc/e-selection-model-array.c:553
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "Колона на курсорот"
@@ -20761,8 +20451,8 @@ msgid "A_uto-delete sent item"
 msgstr "А_вто-избриши испратен предмет"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Класификација"
+msgid "C_lassification"
+msgstr "К_ласификација"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -20786,29 +20476,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"Нормално\n"
-"Неслободно\n"
+"Јавно\n"
+"Приватно\n"
 "Доверливо\n"
-"Тајно\n"
-"Ептен тајно\n"
-"Само за Ваши очи"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "Побаран е од_говор"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "Следење ста_тус"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -20820,51 +20504,51 @@ msgstr ""
 "Стандардно\n"
 "Ниско"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Кога е при_фатено:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Кога е за_вршено:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Кога е от_фрлено:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "В_о"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_После:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Сите информации"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "__Одложи доставување на порака"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Пренесено"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "_Постави датум за истек"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Додека:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Кога е пригодно"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "_Кога е отворено"
 
@@ -20918,23 +20602,23 @@ msgstr "Фокусирана колона"
 msgid "Unselected Column"
 msgstr "Неселектирана колона"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Прецртана колона"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Подвлечена колона"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Здебелена колона"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Обоена колона"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Колона со бг боја"
 
@@ -20949,7 +20633,6 @@ msgstr "Д_остапни полиња:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Растечки"
 
@@ -20960,7 +20643,6 @@ 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 "Descending"
 msgstr "Опаѓачки"
 
@@ -21058,14 +20740,14 @@ msgstr "_Покажи ги овие полиња по редослед:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1804
 msgid "DnD code"
 msgstr "Днд код"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1818
 msgid "Full Header"
 msgstr "Полно заглавjе"
 
@@ -21183,69 +20865,65 @@ msgstr "Еднозначна висина на редови"
 msgid "Frozen"
 msgstr "Смрзнато"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Промени го тековниот поглед"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Сортирај растечки "
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Сортирај опаѓачки "
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Поништи го подредувањето"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Групирај според ова поле"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Групирај според кутија"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Отстрани ја оваа колона"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Додај колона..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Поставеност "
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Најдобро собрано"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Форматирај ги колоните..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Подеси го тековниот поглед..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Подреди по"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Фонтови"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Информации за подредување"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1846
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
diff --git a/po/ne.po b/po/ne.po
index 5d7f8d34fc..703b61d985 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -11,15 +11,13 @@
 # Shiva  Pokharel <pokharelshiva@hotmail.com>, 2005.
 # Bishnu Adhikari <bsn_adk@hotmail.com>, 2005.
 # Mahesh Subedi <submanesh@hotmail.com>, 2006.
-# Mahesh subedi <submanesh@hotmail.com>, 2006.
-# Shiva Pokharel <pokharelshiva@hotmail.com>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.gnome-2-14.ne\n"
 "Report-Msgid-Bugs-To: <info@mpp.org.np>\n"
 "POT-Creation-Date: 2006-04-15 04:32+0200\n"
-"PO-Revision-Date: 2006-06-28 11:02+0545\n"
-"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
+"PO-Revision-Date: 2006-05-09 15:51+0545\n"
+"Last-Translator: Mahesh Subedi <submanesh@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,7 +92,7 @@ msgstr "पात्रो दृश्य घटना"
 
 #: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
-msgstr "फोकस खोस्नुहोस्"
+msgstr "ग्राब फोकस"
 
 #: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
@@ -148,7 +146,7 @@ msgstr "एक साप्ताहिक कार्यको पात्र
 
 #: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
-msgstr "एक वा धेरै दिनका लागि पात्रो"
+msgstr "एक वा धेरै दिनहरूका लागि पात्रो"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
 #: ../calendar/gui/calendar-component.c:661
@@ -324,13 +322,15 @@ msgstr "पूर्वनिर्धारित सक्रिय पार�
 
 #: ../a11y/widgets/ea-combo-button.c:52
 msgid "Popup Menu"
-msgstr "पपअप मेनु"
+msgstr "पपअप मेनू"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
-msgstr "एउटा सम्पर्क यस ठेगानामा पहिलेनै अवस्थित छ । के तपाईँ जे भए पनि पूरानै ठेगानामा एउटा नयाँ कार्ड थप्न चाहनुहुन्छ ?"
+msgstr ""
+"एउटा सम्पर्क यस ठेगानामा पहिलेनै अवस्थित छ । के तपाईँ जे भए पनि पूरानै ठेगानामा एउटा नयाँ कार्ड थप्न "
+"चाहनुहुन्छ?"
 
 #: ../addressbook/addressbook.error.xml.h:2
 msgid "Address '{0}' already exists."
@@ -349,7 +349,9 @@ msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
-msgstr "तपाईँले समर्थन गर्ने लगइन तरिका प्रयोग गरिरहनु भएको र तपाईँको पासवर्ड शुद्धसंग लेख्नु भएको मा निश्चित हुन जाँच गर्नुहोस् । सम्झनु होला की केहि प्रविष्टि शब्दहरू सम्वेदनशील हुन्छन् । सायद क्याप्स लक चालु भैरहेको हुन सक्छ ।"
+msgstr ""
+"तपाईँले समर्थन गर्ने लगइन तरिका प्रयोग गरिरहनु भएको र तपाईँको पासवर्ड शुद्धसंग लेख्नु भएको मा निश्चित हुन जाँच गर्नुहोस् । सम्झनु होला की केहि प्रविष्टि शब्दहरू सम्वेदनशील हुन्छन् । सायद क्याप्स लक चालु भैरहेको हुन "
+"सक्छ ।"
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
@@ -364,7 +366,7 @@ msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr "हालमा तपाईँले इभोल्युसन बाट समूहगत प्रणाली ठेगाना पुस्तिका मात्र पहुँच गर्न सक्नुहुन्छ । कृपया एक पटकलाई अन्य केहि समूहगत पत्र ग्राहक प्रयोग गर्नुहोस्, तपाईँको समूहगत अक्सर आउने सम्पर्कहरू र समूहगत व्यक्तिगत सम्पर्कहरू फोल्डरहरू पाउनका लागि ।"
+msgstr "हालमा तपाईँले इभोल्युसन बाट समुहगत प्रणाली ठेगाना पुस्तिका मात्र पहुँच गर्न सक्नुहुन्छ । कृपया एक पटकलाई अन्य केहि समुहगत पत्र ग्राहक प्रयोग गर्नुहोस्, तपाईँको समुहगत अक्सर आउने सम्पर्कहरू र समुहगत व्यक्तिगत सम्पर्कहरू फोल्डरहरू पाउनका लागि ।"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
@@ -384,7 +386,7 @@ msgstr "LDAP सर्भरसंग प्रमाणीकरण गर्�
 
 #: ../addressbook/addressbook.error.xml.h:13
 msgid "GroupWise Address book creation:"
-msgstr "समूहगत ठेगाना पुस्तिका सिर्जना:"
+msgstr "समुहगत ठेगाना पुस्तिका सिर्जना:"
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "LDAP server did not respond with valid schema information."
@@ -404,14 +406,16 @@ msgstr "इभोल्युसन ठेगाना पुस्तिका
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "तपाईँले चयन गर्नु भएको छवि ठूलो छ । के तपाईँले यसलाई रिसाइज र भण्डारण गर्न चाहनुहुन्छ ?"
+msgstr "तपाईँले चयन गर्नु भएको छवि ठूलो छ । के तपाईँले यसलाई रिसाइज र भण्डारण गर्न चाहनुहुन्छ?"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
-msgstr "यस LDAP सर्भरले सायद LDAP को पुरानो संस्करण प्रयोग गर्न सक्छ, जुसले यस कार्यलाई समर्थन गर्दैन वा यसले सायद नमिल्दो कन्फिगरेसन गर्न सक्छ । तपाईँको प्रशासक संग सहयाता खोज आधारहरुका लागि सोध्नुहोस् ।"
+msgstr ""
+"यस LDAP सर्भरले सायद LDAP को पुरानो संस्करण प्रयोग गर्न सक्छ, जुसले यस कार्यलाई सहयोग "
+"गर्दैन वा यसले सायद नमिल्दो कन्फिगरेसन गर्न सक्छ । तपाईँको प्रशासकसंग सहयाता खोज आधारहरुका लागि सोध्नुहोस् ।"
 
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "This address book will be removed permanently."
@@ -451,7 +455,7 @@ msgstr "{0}लाई बचत गर्न अक्षम छ ।"
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Would you like to save your changes?"
-msgstr "के तपाईँले गर्नु भएका परिवर्तनहरू बचत गर्न चाहनुहुन्छ ?"
+msgstr "के तपाईँले गर्नु भएका परिवर्तनहरू बचत गर्न चाहनुहुन्छ?"
 
 #: ../addressbook/addressbook.error.xml.h:29
 msgid ""
@@ -459,24 +463,24 @@ msgid ""
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 "तपाईँले एक ठेगाना पुस्तिका बाट अर्कोमा सम्पर्क परिवर्तन गर्न खोज्दै हुनुहुन्छ तर यो स्रोतबाट "
-"हटाउन सकिँदैन । सट्टामा के तपाईँले एक प्रतिलिपि बचत गर्न चाहनुहुन्छ ?"
+"हटाउन सकिँदैन । सट्टामा के तपाईँले एक प्रतिलिपि बचत गर्न चाहनुहुन्छ?"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
-msgstr "तपाईँले एक समर्थन नगर्ने समूहगत सर्भरमा जडान गरिरहनु भएको छ र इभोल्युसन प्रयोग गर्दा समस्याहरू आउन सक्छ । सब भन्दा राम्रो नतिजाका लागि सर्भर समर्थन गर्ने गरि स्तरबृद्वि गरिएको हुनु पर्छ ।"
+msgstr "तपाईँले एक समर्थन नगर्ने समुहगत सर्भरमा जडान गरिरहनु भएको छ र इभोल्युसन प्रयोग गर्दा समस्याहरू आउन सक्छ । सब भन्दा राम्रो नतिजाका लागि सर्भर समर्थन गर्ने गरि स्तरबृद्वि गरिएको हुनु पर्छ ।"
 
 #: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "तपाईँले यसमा केहि परिमार्जनहरू गर्नु भएको छ । के तपाईँ यसलाई बचत गर्न चाहनुहुन्छ ?"
+msgstr "तपाईँले यसमा केहि परिमार्जनहरू गर्नु भएको छ । के तपाईँ यसलाई बचत गर्न चाहनुहुन्छ?"
 
 #: ../addressbook/addressbook.error.xml.h:32
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "तपाईँको सम्पर्कहरू {0}का लागि इभोल्युसन फेरी सुरू नगर्दा सम्म प्राप्त नहुन सक्छ ।"
+msgstr "तपाईँको सम्पर्कहरू {0}का लागि इभोल्युसन फेरी सुरु नगरिदा सम्म प्राप्त नहुन सक्छ ।"
 
 #: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
@@ -601,7 +605,7 @@ msgstr "व्यक्तिगत"
 #: ../addressbook/gui/component/addressbook-component.c:159
 #: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
-msgstr "LDAP सर्भरहरुमा"
+msgstr "LDAP सर्भरहरूमा"
 
 #: ../addressbook/gui/component/addressbook-component.c:227
 msgid "_Contact"
@@ -609,7 +613,7 @@ msgstr "सम्पर्क"
 
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
-msgstr "एउटा नयाँ सम्पर्क ठेगाना सिर्जना गर्नुहोस्"
+msgstr "एउटा नयाँ सम्पर्क ठेगाना सिर्जना गर्नुहोस् "
 
 #: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Contact _List"
@@ -617,7 +621,7 @@ msgstr "सम्पर्क सूची"
 
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
-msgstr "एउटा नयाँ सम्पर्क सूची सिर्जना गर्नुहोस्"
+msgstr "एउटा नयाँ सम्पर्क सूची सिर्जना गर्नुहोस् "
 
 #: ../addressbook/gui/component/addressbook-component.c:242
 #: ../addressbook/gui/component/addressbook-config.c:1202
@@ -731,7 +735,7 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"यस पत्राचार सम्पर्कहरुको सूची ढाँचा परिवर्तन भएको छ ।\n"
+"यस पत्राचार सम्पर्कहरूको सूची ढाँचा परिवर्तन भएको छ ।\n"
 "\n"
 "कृपया इभोल्युसनले तपाईँका फोल्डरहरू स्थानान्तर गर्दा सम्म धैर्य गर्नुहोस्..."
 
@@ -847,7 +851,7 @@ msgstr "पूर्वावलोकन फलक देखाउनुहो�
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr "अक्षर वा चिन्हहरुको सङ्ख्या जुन इभोल्युसन स्वत सम्पन्न हुँदा सम्म टाइप गरी सक्नु पर्नेछ ।"
+msgstr "अक्षर वा चिन्हहरूको सङ्ख्या जुन इभोल्युसन स्वत सम्पन्न हुँदा सम्म टाइप गरी सक्नु पर्नेछ ।"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -974,19 +978,19 @@ msgstr "SSL गुप्तीकरण"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
-msgstr "खोजी फिल्टर"
+msgstr "खोज फिल्टर"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
-msgstr "खोजी आधार:"
+msgstr "खोज आधार:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
-msgstr "खोजी फिल्टर:"
+msgstr "खोज फिल्टर:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
-msgstr "िल्टर  खोजी"
+msgstr "खोज फिल्टर"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
@@ -1053,7 +1057,8 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 "यो खोज क्षेत्रको परिभाषा तपाईँले खोज डाइरेक्कटरी ट्रीमा कति गहिराईमा बढाउन चाहनुहुन्छ । "
-"एउटा खोजी क्षेत्र \"उप\" ले तपाईँको खोज आधार तलको सबै प्रविष्टिहरू समावेश गर्नेछ । एउटा खोजी क्षेत्र \"एउटा\" ले तपाईँको आधारको एउटा तह तल मात्र प्रविष्टहरू समावेश गर्नेछ ।"
+"एउटा खोजी क्षेत्र \"उप\" ले तपाईँको खोज आधार तलको सबै प्रविष्टिहरू समावेश गर्नेछ । एउटा खोज "
+"क्षेत्र \"एउटा\" ले तपाईँको आधारको एउटा तह तल मात्र प्रविष्टहरू समावेश गर्नेछ ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
@@ -1065,7 +1070,9 @@ msgstr "यो तपाईँको ldap सर्भरको पूरा न
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
-msgstr "यो डाउनलोडका लागि प्रविष्टहरुको बढिमा हुने सङ्ख्या हो । धेरै ठूलो सङ्ख्यालाई सेटिङ गर्दा ठेगाना पुस्तिका ढीला हुन जानेछ ।"
+msgstr ""
+"यो डाउनलोडका लागि प्रविष्टहरुको बढिमा हुने सङ्ख्या हो । धेरै ठूलो सङ्ख्यालाई सेटिङ गर्दा ठेगाना "
+"पुस्तिका ढीला हुन जानेछ ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
@@ -1073,7 +1080,7 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"यो एउटा पद्दती हो जुन इभोल्युसनले तपाईँलाई प्रमाणीकरण गर्दा प्रयोग गर्दछ । याद राख्नुहोस् "
+"यो एउटा पद्दती हो जुन इभोल्युसनले तपाईँलाई प्रमाणीकरण गर्दा प्रयोग गर्दछ । द्रष्टव्य यो छ "
 "की \"इमेल ठेगाना\" सेटिङ तपाईँको ldap सर्भरसंग अपरिचित पहुँच आवश्यक पर्दछ ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
@@ -1135,7 +1142,7 @@ msgstr "पोर्ट:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
-msgstr "खोजी क्षेत्र:"
+msgstr "खोज क्षेत्र:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:171
@@ -1145,7 +1152,7 @@ msgstr "सर्भर:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
-msgstr "समय समाप्त:"
+msgstr "टाइन आउट:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
@@ -2409,7 +2416,7 @@ msgstr "AOL इन्स्ट्यान्ट मेसेन्जर"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
-msgstr "ज्याबर"
+msgstr "4जब्बार"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "Yahoo Messenger"
@@ -2449,17 +2456,17 @@ msgstr "अन्य"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
-msgstr "याहू"
+msgstr "याहु"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
-msgstr "एम एस एन"
+msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
-msgstr "समूहगत"
+msgstr "समुहगत"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
@@ -2493,11 +2500,11 @@ msgstr "सम्पर्क सम्पादक - %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
-msgstr "कृपया यस सम्पर्कका लागि एउटा छवि चयन गर्नुहोस्"
+msgstr "कृपया यस सम्पर्कका लागि एउटा चित्र चयन गर्नुहोस्"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
-msgstr "छवि छैन"
+msgstr "चित्र छैन"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
@@ -2509,7 +2516,7 @@ msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
-msgstr "अवैध सम्पर्क"
+msgstr "अवैध सम्पर्क ।"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
@@ -2538,7 +2545,7 @@ msgid ""
 "to delete contact list (%s) ?"
 msgstr ""
 "के तपाईँ \n"
-"(%s) सम्पर्कहरू सूची मेट्न साँच्चै नै चाहनुहुन्छ ?"
+" (%s) सम्पर्कहरू सूची मेट्न साँच्चै नै चाहनुहुन्छ ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
@@ -2546,7 +2553,7 @@ msgid ""
 "to delete these contact lists?"
 msgstr ""
 "के तपाईँ \n"
-"यी सम्पर्क सूचीहरू मेट्न साँच्चै नै चाहनुहुन्छ ?"
+" यी सम्पर्क सूचीहरू मेट्न साँच्चै नै चाहनुहुन्छ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
@@ -2555,7 +2562,7 @@ msgid ""
 "to delete contact (%s) ?"
 msgstr ""
 "के तपाईँ \n"
-"(%s) सम्पर्कहरू मेट्न साँच्चै नै चाहनुहुन्छ ?"
+" (%s) सम्पर्कहरू मेट्न साँच्चै नै चाहनुहुन्छ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
@@ -2563,7 +2570,7 @@ msgid ""
 "to delete these contacts?"
 msgstr ""
 "के तपाईँ \n"
-"यी सम्पर्कहरू मेट्न साँच्चै नै चाहनुहुन्छ ?"
+" यी सम्पर्कहरू मेट्न साँच्चै नै चाहनुहुन्छ?"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2750,7 +2757,7 @@ msgid ""
 "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:"
@@ -2766,7 +2773,7 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 "पहिलेकै परिवर्तित सम्पर्क नाम वा इमेल ठेगाना \n"
-" यो फोल्डरमा अवस्थित छ । के तपाईँ जसरीपनि यसलाई थप्न चाहनुहुन्छ ?"
+" यस फोल्डरमा अवस्थित छ. के तपाईँ जसरीपनि यसलाई थप्न चाहनुहुन्छ?"
 
 #. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
@@ -3233,7 +3240,7 @@ msgstr "नक्सा"
 #: ../addressbook/gui/widgets/eab-contact-display.c:276
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
-msgstr "सदस्यहरुको सूची"
+msgstr "सदस्यहरूको सूची"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:339
 #: ../addressbook/gui/widgets/eab-contact-display.c:341
@@ -3416,7 +3423,7 @@ msgid ""
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 msgstr ""
-"यो इभोल्युसन संस्करणमा LDAP समर्थन समेटिएको छैन । यदि तपाईँ इभोल्युसनमा LDAP "
+"यो इभोल्युसन संस्करणमा LDAP सहारा समेटिएको छैन । यदि तपाईँ इभोल्युसनमा LDAP "
 "प्रयोग गर्न चाहनुहुन्छ भने तपाईँले अनिवार्य एउटा LDAP-कृयाशिल इभोल्युसन प्याकेज"
 "स्थापना गर्नुपर्छ ।"
 
@@ -3435,10 +3442,6 @@ msgid ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 msgstr ""
-"धेरै कार्डहरुमा यो क्वेरी मिल्यो कि या सर्भर फर्कन कन्फिगर गरिएको हो\n"
-"वा इभोल्युसन प्रर्दशनका लागि कन्फिगर गरिएको हो ।\n"
-"कृपया तपाईँको खोजी अझ निर्दृष्ट गर्नुहोस् वा ठेगानापुस्तिकाका लागि\n"
-"डाइरेक्टरी सर्भर प्राथमिकताहरुमा परिमाण दायरा बढाउनुहोस् ।"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
@@ -3904,7 +3907,7 @@ msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
-msgstr "स्थानीय ठेगाना पुस्तिका फोल्डरहरुको सूची"
+msgstr "स्थानीय ठेगाना पुस्तिका फोल्डरहरूको सूची"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
@@ -3920,7 +3923,7 @@ msgstr "असिन्क्रोनस मोड मा निर्यात
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "एउटा निर्गत फाइल भित्र असिन्क्रोनस मोडमा कार्डहरुको सङ्ख्या, पूर्व निर्धारित साइज १०० ।"
+msgstr "एउटा निर्गत फाइल भित्र असिन्क्रोनस मोडमा कार्डहरूको सङ्ख्या, पूर्व निर्धारित साइज १०० ।"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
@@ -3963,7 +3966,7 @@ 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
@@ -3971,7 +3974,7 @@ 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
@@ -3988,11 +3991,11 @@ msgstr "यस जर्नलका बारेको सबै सूचन�
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr "यी भेटघाटहरुको बारेमा सबै सूचनाहरू मेटिने छन् र पुर्वावस्थामा ल्याउन सकिने छैन ।"
+msgstr "यी भेटघाटहरूको बारेमा सबै सूचनाहरू मेटिने छन् र पुर्वावस्थामा ल्याउन सकिने छैन ।"
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "यी कार्यहरुको बारेमा सबै सूचनाहरू मेटिने छन् र पुर्वावस्थामा ल्याउन सकिँदैन ।"
+msgstr "यी कार्यहरूको बारेमा सबै सूचनाहरू मेटिने छन् र पुर्वावस्थामा ल्याउन सकिँदैन ।"
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information on this appointment will be deleted and can not be restored."
@@ -4096,11 +4099,11 @@ msgstr "सम्पादक लोड गर्न सकेन ।"
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "इमेल निमन्त्रणा सबै सहभागीहरुलाई पठाइने छ र यस कार्यलाई स्वीकार्न अनुमति दिइनेछ ।"
+msgstr "इमेल निमन्त्रणा सबै सहभागीहरूलाई पठाइने छ र यस कार्यलाई स्वीकार्न अनुमति दिइनेछ ।"
 
 #: ../calendar/calendar.error.xml.h:32
 msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "इमेल निमन्त्रणाहरू सबै सहभागीहरुलाई पठाउने छ र तिनीहरुलाई जवाफ गर्न अनुमति दिइन्छ ।"
+msgstr "इमेल निमन्त्रणाहरू सबै सहभागीहरूलाई पठाउने छ र तिनीहरूलाई जवाफ गर्न अनुमति दिइन्छ ।"
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
@@ -4142,13 +4145,13 @@ msgstr ""
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
-msgstr "अन्य सहभागीहरुलाई उनीहरुको पात्रो अद्यावधिक गर्न अनुमति दिने अद्यावधिक सूचना पठाउदै ।"
+msgstr "अन्य सहभागीहरूलाई उनीहरूको पात्रो अद्यावधिक गर्न अनुमति दिने अद्यावधिक सूचना पठाउदै ।"
 
 #: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr "सहभागीहरुलाई उनीहरुको कार्य सूची सहभागीहरुलाई अनुमति दिने अद्यावधिक गरेको सूचना पठाउँदै ।"
+msgstr "सहभागीहरूलाई उनीहरूको कार्य सूची सहभागीहरूलाई अनुमति दिने अद्यावधिक गरेको सूचना पठाउँदै ।"
 
 #: ../calendar/calendar.error.xml.h:41
 msgid ""
@@ -4220,30 +4223,30 @@ msgstr "के तपाईँ साँच्चै नै यस जर्न�
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "के तपाईँ साँच्चै नै सबै सहभागीहरुलाई एउटा खारेजी सूचना पठाउन चाहनुहुन्छ?"
+msgstr "के तपाईँ साँच्चै नै सबै सहभागीहरूलाई एउटा खारेजी सूचना पठाउन चाहनुहुन्छ?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
-msgstr "के तपाईँले सहभागीहरुलाई बैठक निमन्त्रणाहरू पठाउन चाहनुहुन्छ?"
+msgstr "के तपाईँले सहभागीहरूलाई बैठक निमन्त्रणाहरू पठाउन चाहनुहुन्छ?"
 
 #: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send this task to participants?"
-msgstr "के तपाईँ यस कार्यलाई सहभागीहरुलाई पठाउन चाहनुहुन्छ?"
+msgstr "के तपाईँ यस कार्यलाई सहभागीहरूलाई पठाउन चाहनुहुन्छ?"
 
 #: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "के तपाईँ अद्यावधिक गरिएको बैठक सूचना सहभागीहरुलाई पठाउन चाहनुहुन्छ?"
+msgstr "के तपाईँ अद्यावधिक गरिएको बैठक सूचना सहभागीहरूलाई पठाउन चाहनुहुन्छ?"
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
-msgstr "के तपाईँ अद्यावधिक गरिएको कार्य सहभागीहरुलाई पठाउन चाहनुहुन्छ?"
+msgstr "के तपाईँ अद्यावधिक गरिएको कार्य सहभागीहरूलाई पठाउन चाहनुहुन्छ?"
 
 #: ../calendar/calendar.error.xml.h:62
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
-msgstr "तपाईँले एउटा समर्थन नगर्ने समूहगत सर्भरमा जडानमा रहिरहनु हुन्छ र इभोल्युसन प्रयोग गर्दा समस्याहरू आएका हुन सक्छ । राम्रो नतिजाहरुका लागि, सर्भरलाई समर्थन गर्ने संस्करणमा स्तरबृद्धि गरेको हुनुपर्छ ।"
+msgstr "तपाईँले एउटा समर्थन नगर्ने समुहगत सर्भरमा जडानमा रहिरहनु हुन्छ र इभोल्युसन प्रयोग गर्दा समस्याहरू आएका हुन सक्छ । राम्रो नतिजाहरुका लागि, सर्भरलाई समर्थन गर्ने संस्करणमा स्तरबृद्धि गरेको हुनु पर्छ ।"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "You have changed this appointment, but not yet saved it."
@@ -4251,11 +4254,11 @@ msgstr "तपाईँले यस भेटघाटमा परिवर्
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
-msgstr "तपाईँले यस कार्यहरूमा परिवर्तनहरू गर्नुभएको छ, तर अहिले सम्म तिनीहरुलाई बचत गरिएको छैन ।"
+msgstr "तपाईँले यस कार्यहरूमा परिवर्तनहरू गर्नुभएको छ, तर अहिले सम्म तिनीहरूलाई बचत गरिएको छैन ।"
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "तपाईँले यस मेमोहरुमा परिवर्तनहरू गर्नुभएको छ, तर अहिले सम्म तिनीहरुलाई बचत गरिएको छैन ।"
+msgstr "तपाईँले यस मेमोहरुमा परिवर्तनहरू गर्नुभएको छ, तर अहिले सम्म तिनीहरूलाई बचत गरिएको छैन ।"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
@@ -4513,7 +4516,7 @@ msgid ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
-"इभोल्युसनले पात्रो सम्झाउनेलाई इमेल सूचनाहरू संग समर्थन "
+"इभोल्युसनले पात्रो सम्झाउनेलाई इमेल सूचनाहरू संग सहारा "
 "दिदैन\n"
 ", तर यो सम्झाउने\n"
 " एउटा इमेल पठाउन कन्फिगर गरिएको थियो । इभोल्युसनले\n"
@@ -4591,11 +4594,11 @@ msgstr "जब वस्तुहरू मेट्नु हुन्छ य�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "\"#rrggbb\" ढाँचामा, कार्यहरुको पृष्ठभुमी रंग जुन आज गरिन्छ ।"
+msgstr "\"#rrggbb\" ढाँचामा, कार्यहरूको पृष्ठभुमी रंग जुन आज गरिन्छ ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "\"#rrggbb\" ढाँचामा, कार्यहरुको पृष्ठभुमी रंग पुन गरिन्छ ।"
+msgstr "\"#rrggbb\" ढाँचामा, कार्यहरूको पृष्ठभुमी रंग पुन गरिन्छ ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
@@ -4711,7 +4714,7 @@ msgstr "पूर्वनिर्धारित सम्झाउने न�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
-msgstr "जव कार्यहरू लुकाउन इकाईहरुको सङ्ख्या निर्धारण गरिन्छ ।"
+msgstr "जव कार्यहरू लुकाउन इकाईहरूको सङ्ख्या निर्धारण गरिन्छ ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
@@ -4811,7 +4814,7 @@ msgstr "बाँकी रहेको आजको रंग कार्य �
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
-msgstr "कार्यहरुको ठाडो फलक स्थिति"
+msgstr "कार्यहरूको ठाडो फलक स्थिति"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
@@ -4886,7 +4889,7 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "हप्ता र महिना दृश्यहरुको घटनाहरू समाप्ति समय प्रर्दशन गर्ने वा नगर्ने ।"
+msgstr "हप्ता र महिना दृश्यहरूको घटनाहरू समाप्ति समय प्रर्दशन गर्ने वा नगर्ने ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
@@ -4894,7 +4897,7 @@ msgstr "क्यालेन्डरमा मार्कस ब्येन�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "कार्यहरुको दृश्यमा पूरा भएको कार्यहरू लुकाउने की ।"
+msgstr "कार्यहरूको दृश्यमा पूरा भएको कार्यहरू लुकाउने की ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
@@ -5042,7 +5045,7 @@ msgstr "नयाँ पात्रो"
 
 #: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
-msgstr "पात्रोहरुको स्तर बृद्धि गर्न असफल भयो।"
+msgstr "पात्रोहरूको स्तर बृद्धि गर्न असफल भयो।"
 
 #: ../calendar/gui/calendar-component.c:1139
 #, c-format
@@ -5500,7 +5503,7 @@ msgstr "वस्तुहरू मेट्ने समयमा निश्
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
-msgstr "सप्ताहन्तहरुलाई मासिक दृश्यमा सङ्कुचन गर्नुहोस्"
+msgstr "सप्ताहन्तहरूलाई मासिक दृश्यमा सङ्कुचन गर्नुहोस्"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
@@ -5637,7 +5640,7 @@ msgstr "जर्नल प्रविष्टिलाई मेटाइए�
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  तपाईँले परिवर्तन गर्नु भएको छ । ती परिवर्तनहरुलाई बिर्सेर सम्पादक बन्द गर्ने?"
+msgstr "%s  तपाईँले परिवर्तन गर्नु भएको छ । ती परिवर्तनहरूलाई बिर्सेर सम्पादक बन्द गर्ने?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
@@ -6947,11 +6950,11 @@ msgstr "पूरा भएको रुपमा चिनो लगाउन�
 
 #: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
-msgstr "चयन गरिएको कार्यहरुलाई पूरा भएको रुपमा चिनो लगाउनुहोस्"
+msgstr "चयन गरिएको कार्यहरूलाई पूरा भएको रुपमा चिनो लगाउनुहोस्"
 
 #: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
-msgstr "चयन गरिएको कार्यहरुलाई मेट्नुहोस्"
+msgstr "चयन गरिएको कार्यहरूलाई मेट्नुहोस्"
 
 #: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
@@ -7202,7 +7205,7 @@ msgstr[1] "प्रत्येक %d वर्षहरू"
 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
 msgid ", ending on "
@@ -7245,7 +7248,7 @@ msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
-"<br> कृपया तलका सूचनाहरुलाई पुन देखाउनु होस्, र त्यसपछि तलको मेनुबाट एक कार्य चयन "
+"<br> कृपया तलका सूचनाहरूलाई पुन देखाउनु होस्, र त्यसपछि तलको मेनुबाट एक कार्य चयन "
 "गर्नुहोस् ।"
 
 #: ../calendar/gui/e-itip-control.c:1132
@@ -8379,7 +8382,7 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 "यो सञ्चालनले पूरा भएको चिन्ह लगाइएको सबै कार्यहरू सधैका लागि मेटिने छ । यदि तपाईँले "
-"निरन्तरता दिनुहुन्छ भने तपाईँले ती कार्यहरू पुन: प्राप्त गर्न सक्नुहुने छैन ।\n"
+"निरन्तरता दिनुहुन्छ भने तपाईँले ती कार्यहरू पुन प्राप्त गर्न सक्नुहुने छैन ।\n"
 "\n"
 "साँच्चै नै ती कार्यहरू मेट्न चाहनुहुन्छ ?"
 
@@ -9389,7 +9392,7 @@ msgstr "एशिया/क्विजिलोर्दा"
 
 #: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
-msgstr "एशिया/रंगुन"
+msgstr "एशिया/रङ्गुन"
 
 #: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
@@ -10065,7 +10068,7 @@ msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"ठेगानाहरू प्रविष्टि गर्नुहोस् जसले प्रापकहरुको सूचीमा देखा नपर्ने गरी यस सन्देशको कार्वन प्रति "
+"ठेगानाहरू प्रविष्टि गर्नुहोस् जसले प्रापकहरूको सूचीमा देखा नपर्ने गरी यस सन्देशको कार्वन प्रति "
 "प्राप्त गर्ने छन ।"
 
 #.
@@ -10123,7 +10126,7 @@ msgstr "फाइल खोल्न सकिएन"
 
 #: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
-msgstr "सम्पादकबाट सन्देश पुन:प्राप्त गर्न सकिँदैन"
+msgstr "सम्पादकबाट सन्देश पुनप्राप्त गर्न सकिँदैन"
 
 #: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
@@ -10187,7 +10190,7 @@ msgid ""
 "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
@@ -10232,7 +10235,7 @@ msgid ""
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 "तपाईँले नयाँ सन्देश लेख्दै गर्दा इभोल्युसन अप्रत्यासित किसिमले बन्द भयो । यो सन्देश जहाँ "
-"तपाईँले छाड्नु भएको थियो त्यहाँबाट पुन: प्राप्त गर्दै ।"
+"तपाईँले छाड्नु भएको थियो त्यहाँबाट पुन प्राप्त गर्दै ।"
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -10280,11 +10283,11 @@ msgstr "तपाईँले पत्र रचना गरि सक्न�
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "_Do not Recover"
-msgstr "पुन: प्राप्त नगर्नुहोस्"
+msgstr "पुन प्राप्त नगर्नुहोस्"
 
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Recover"
-msgstr "पुन: प्राप्त गर्नुहोस्"
+msgstr "पुन प्राप्त गर्नुहोस्"
 
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
@@ -10298,11 +10301,11 @@ msgstr "इभोल्युसन"
 
 #: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
-msgstr "ग्रुपवेयर सुट"
+msgstr "ग्रुपवेयर सुइट"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "The Evolution PIM and Email Client"
-msgstr "इभोल्युसन PIM र इमेल क्लाइन्ट"
+msgstr "इभोल्युसन PIM र इमेल ग्राहक"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10365,11 +10368,11 @@ msgstr "      "
 
 #: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
-msgstr "<b>इमेल प्राप्त गर्दा</b>"
+msgstr "<b>इमेल प्राप्त गर्दै</b>"
 
 #: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
-msgstr "<b>इमेल पठाउँदा</b>"
+msgstr "<b>इमेल पठाउदै</b>"
 
 #: ../designs/read_receipts/read.glade.h:4
 msgid ""
@@ -10378,9 +10381,9 @@ msgid ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 msgstr ""
-"<small>यो पृष्ठले तपाईँलाई चयन गर्न अनुमति दिन्छ यदि तपाईँले पठाएको सन्देश\n"
-"पढेको सूचना प्राप्त गर्न चाहनुहुन्छ र प्रष्ट हुन चाहनुहुन्छ जो कोहिले तपाईँबाट रसीद अनुरोध "
-"गर्छ भने इभोल्युसनले गर्नु पर्छ ।</small>"
+"<small>यो पेजले तपाईँलाई चयन गर्न अनुमति दिन्छ यदि तपाईँले पठाएको सन्देश\n"
+" पढेको सूचना प्राप्त गर्न चाहनुहुन्छ र प्रष्ट हुन चाहनुहुन्छ जुन कोहिले तपाईँबाट रसीद अनुरोध "
+"गर्छ भने इभोल्युसनले गर्नु पर्छ । </small>"
 
 #: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
@@ -10848,7 +10851,7 @@ msgstr "सुरक्षा"
 #. Most sections for this is auto-generated fromt the camel config
 #: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
-msgstr "प्राप्ति विकल्पहरू"
+msgstr "विकल्पहरू प्राप्त गर्दै"
 
 #: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
@@ -11262,7 +11265,7 @@ msgstr "लोड गर्दैछ..."
 
 #: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
-msgstr "मेल फोल्डर ट्री"
+msgstr "पत्र फोल्डर ट्री"
 
 #: ../mail/em-folder-tree.c:854
 #, c-format
@@ -11378,7 +11381,7 @@ msgstr "अघिल्तिर"
 
 #: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
-msgstr "नयाँ सन्देशको रुपमा सम्पादन गर्नुहोस्..."
+msgstr "नयाँ सन्देशको रूपमा सम्पादन गर्नुहोस्..."
 
 #: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
@@ -11454,7 +11457,7 @@ msgstr "प्रापकहरुबाट फोल्डर खोजी ग
 
 #: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
-msgstr "पत्राचार सूचीबाट फोल्डर खोजी गर्नुहोस्"
+msgstr "पत्राचार सुचीबाट फोल्डर खोजी गर्नुहोस्"
 
 #: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
@@ -11485,7 +11488,7 @@ msgstr "सन्देश मुद्रण गर्नुहोस्"
 
 #: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
-msgstr "सन्देश पुन:प्राप्त गर्न अक्षम"
+msgstr "सन्देश पुनप्राप्त गर्न अक्षम"
 
 #: ../mail/em-folder-view.c:2460
 msgid "_Copy Link Location"
@@ -11506,7 +11509,7 @@ msgstr "यस ठेगानामा"
 #: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
-msgstr "मेल %s मा क्लिक गर्नुहोस्"
+msgstr "पत्र %s मा क्लिक गर्नुहोस्"
 
 #. message-search popup match count string
 #: ../mail/em-format-html-display.c:496
@@ -11677,7 +11680,7 @@ msgstr "पृष्ठ %d को %d"
 #: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
-msgstr "`%s' पुन: प्राप्त गर्दैछ"
+msgstr "`%s' पुन प्राप्त गर्दैछ"
 
 #: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
@@ -11747,7 +11750,7 @@ msgstr "गुप्त बोधार्थ"
 #: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
-msgstr "मेल पठाउने"
+msgstr "पत्र पठाउने"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
 #: ../mail/em-format-html.c:1615
@@ -11769,7 +11772,7 @@ msgstr "मिति"
 #: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
-msgstr "समाचार समूहहरू"
+msgstr "समाचार समुहहरू"
 
 #: ../mail/em-format.c:1102
 #, c-format
@@ -11786,7 +11789,7 @@ msgstr "MIME सन्देश पद वर्णन गर्न सकेन
 
 #: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "बहु-भाग/गुप्तीकरणलाई समर्थन नदिने गुप्तीकरण प्रकार"
+msgstr "बहु-भाग/गुप्तीकरणलाई सहारा नदिने गुप्तीकरण प्रकार"
 
 #: ../mail/em-format.c:1446
 msgid "Unsupported signature format"
@@ -11823,7 +11826,7 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-" इभोल्युसन १.x. देखि इभोल्युसन पत्रमञ्जूषा फोल्डरहरुको स्थान र तह परिवर्तन भएको छ\n"
+" इभोल्युसन १.x. देखि इभोल्युसन पत्रमञ्जूषा फोल्डरहरूको स्थान र तह परिवर्तन भएको छ\n"
 "\n"
 "इभोल्युसनले तपाईँका फोल्डरहरू सार्दा कृपया धैर्य गर्नुहोस्..."
 
@@ -11860,12 +11863,12 @@ msgstr "सर्भर डेटामा हुने POP3 प्रतिल�
 #: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "स्थानीय मेल भण्डार सिर्जना गर्न असफल भयो `%s': %s"
+msgstr "स्थानीय पत्र भण्डार सिर्जना गर्न असफल भयो `%s': %s"
 
 #: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "`%s': %s मा स्थानीय मेल फोल्डरहरू सिर्जना गर्न असफल"
+msgstr "`%s': %s मा स्थानीय पत्र फोल्डरहरू सिर्जना गर्न असफल"
 
 #: ../mail/em-migrate.c:2731
 msgid ""
@@ -11898,7 +11901,7 @@ msgstr "ठेगाना पुस्तिकामा थप्नुहो�
 
 #: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "यो भण्डारले सदस्यताहरुलाई समर्थन दिदैन, वा तिनीहरू सक्रिय गरिएका छैनन ।"
+msgstr "यो भण्डारले सदस्यताहरूलाई सहारा दिदैन, वा तिनीहरू सक्रिय गरिएका छैनन ।"
 
 #: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
@@ -11961,7 +11964,7 @@ msgstr "स्वचालित स्माइली पहिचान"
 
 #: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
-msgstr "आगमन मेल रद्दी भएको जाँच गर्नुहोस्"
+msgstr "आगमन पत्र रद्दी भएको जाँच गर्नुहोस्"
 
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
@@ -12041,7 +12044,7 @@ msgstr "इभोल्युसनबाट निस्कदा सबै र
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "लोपचिन्ह मोड सक्रिय पार्नुहोस्, जसले गर्दा तपाईँले मेल पढ्दा कर्सर देख्न सक्नु हुन्छ ।"
+msgstr "लोपचिन्ह मोड सक्रिय पार्नुहोस्, जसले गर्दा तपाईँले पत्र पढ्दा कर्सर देख्न सक्नु हुन्छ ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
@@ -12077,7 +12080,7 @@ msgstr "अन्तिम पटक खाली रद्दीटोकरी
 
 #: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
-msgstr "लेबुलहरुको सूची र तिनीहरुको सम्बन्धित रंगहरू"
+msgstr "लेबुलहरूको सूची र तिनीहरूको सम्बन्धित रंगहरू"
 
 #: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
@@ -12092,28 +12095,28 @@ 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.in.h:34
 msgid "List of custom headers and whether they are enabled."
-msgstr "अनुकूलन हेडरहरुको सूची र जहाँ सम्म तिनीहरू सक्रिय गरिएका छन ।"
+msgstr "अनुकूलन हेडरहरूको सूची र जहाँ सम्म तिनीहरू सक्रिय गरिएका छन ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"इभोल्युसनको मेल अवयव लाई लेबुलहरुको सूची थाहा हुन्छ । यो सूचीमा स्ट्रिङहरुको नाम समाविष्ट हुन्छ: रंग जहाँ रंग HTML "
+"इभोल्युसनको पत्र अवयव लाई लेबुलहरूको सूची थाहा हुन्छ । यो सूचीमा स्ट्रिङहरूको नाम समाविष्ट हुन्छ: रंग जहाँ रंग HTML "
 "हेक्स इनकोडिङ प्रयोग हुन्छ ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
-msgstr "बोनोबो अवयव दृश्यकर्ता जाँच गर्नका लागि माइम प्रकारहरुको सूची"
+msgstr "बोनोबो अवयव दृश्यकर्ता जाँच गर्नका लागि माइम प्रकारहरूको सूची"
 
 #: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
-msgstr "प्रोटोकल नामहरुको सूची जसको इजाजतपत्र स्वीकृत भएको छ ।"
+msgstr "प्रोटोकल नामहरूको सूची जसको इजाजतपत्र स्वीकृत भएको छ ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
@@ -12183,11 +12186,11 @@ msgstr "रद्दीटोकरी खाली गरेर बन्द �
 
 #: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
-msgstr "नयाँ मेल सूचना गर्ने ध्वनी फाइल"
+msgstr "नयाँ पत्र सूचना गर्ने ध्वनी फाइल"
 
 #: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
-msgstr "नयाँ मेल सूचना गर्ने प्रकार"
+msgstr "नयाँ पत्र सूचना गर्ने प्रकार"
 
 #: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
@@ -12218,7 +12221,7 @@ msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"प्रोम्प्ट गर्नुहोस् जब प्रयोगकर्ताले HTML मेल प्राप्त गर्न नचाहने प्रापकहरुलाई HTML मेल "
+"प्रोम्प्ट गर्नुहोस् जब प्रयोगकर्ताले HTML पत्र प्राप्त गर्न नचाहने प्रापकहरूलाई HTML पत्र "
 "पठाउने प्रयास गर्छ ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
@@ -12233,23 +12236,23 @@ msgstr "प्रोम्प्ट गर्नुहोस् जब प्र
 
 #: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
-msgstr "पाठमा लिङ्क पहिचान गर्नुहोस् र तिनीहरुलाई बदल्नुहोस् ।"
+msgstr "पाठमा लिङ्क पहिचान गर्नुहोस् र तिनीहरूलाई बदल्नुहोस् ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
-msgstr "पाठमा स्माइलीहरू पहिचान गर्नुहोस् र तिनीहरुलाई छविमा बदल्नुहोस् ।"
+msgstr "पाठमा स्माइलीहरू पहिचान गर्नुहोस् र तिनीहरूलाई छविमा बदल्नुहोस् ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
-msgstr "आगमन मेलमा रद्दी परीक्षण सञ्चालन गर्नुहोस्"
+msgstr "आगमन पत्रमा रद्दी परीक्षण सञ्चालन गर्नुहोस्"
 
 #: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
-msgstr "पूर्वनिर्धारित द्वारा HTML मेल पठाउनुहोस्"
+msgstr "पूर्वनिर्धारित द्वारा HTML पत्र पठाउनुहोस्"
 
 #: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
-msgstr "पूर्वनिर्धारित द्वारा HTML मेल पठाउनुहोस् ।"
+msgstr "पूर्वनिर्धारित द्वारा HTML पत्र पठाउनुहोस् ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
@@ -12257,7 +12260,7 @@ msgstr "एनिमेसनहरू देखाउनुहोस्"
 
 #: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
-msgstr "एनिमेट गरिएका छविहरू एनिमेसनहरुको रूपमा देखाउनुहोस् ।"
+msgstr "एनिमेट गरिएका छविहरू एनिमेसनहरूको रूपमा देखाउनुहोस् ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
@@ -12269,11 +12272,11 @@ msgstr "मेटिएका सन्देशहरू सन्देश-स
 
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
-msgstr "प्ले गरिने ध्वनि फाइल जब नयाँ मेल आउँछ ।"
+msgstr "प्ले गरिने ध्वनि फाइल जब नयाँ पत्र आउँछ ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "प्रयोगकर्ताले चाहेको नयाँ मेल सूचना प्रकार निश्चित गर्छ ।"
+msgstr "प्रयोगकर्ताले चाहेको नयाँ पत्र सूचना प्रकार निश्चित गर्छ ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
@@ -12297,11 +12300,11 @@ msgstr "खाली रद्दी टोकरी सञ्चालन ग�
 
 #: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
-msgstr "मेल प्रदर्शन गर्नका लागि टर्मिनल फन्ट"
+msgstr "पत्र प्रदर्शन गर्नका लागि टर्मिनल फन्ट"
 
 #: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
-msgstr "मेल प्रदर्शनका लागि चल चौडाई फन्ट"
+msgstr "पत्र प्रदर्शनका लागि चल चौडाई फन्ट"
 
 #: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
@@ -12310,8 +12313,8 @@ msgid ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
-"यस कुञ्जीमा XML संरचना निश्चित गरिने अनुकूलन हेडरहरुको सूची हुनु पर्दछ, र तिनिहरू प्रदशित हुन्छन् कि ।XML संरचनाको ढाँचा "
-"&lt; हेडर सक्रिय गरेको&gt; - सेट सक्रिय गरको यदि हेडर मेल दृश्यमा प्रदर्शन गरिनु पर्छ भने ।"
+"यस कुञ्जीमा XML संरचना निश्चित गरिने अनुकूलन हेडरहरूको सूची हुनु पर्दछ, र तिनिहरू प्रदशित हुन्छन् कि ।XML संरचनाको ढाँचा "
+"&lt; हेडर सक्रिय गरेको&gt; - सेट सक्रिय गरको यदि हेडर पत्र दृश्यमा प्रदर्शन गरिनु पर्छ भने ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
@@ -12351,7 +12354,7 @@ msgstr "अनुकूल फन्टहरू प्रयोग गर्न
 
 #: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
-msgstr "मेल देखाउनका लागि अनुकूल फन्टहरू प्रयोग गर्नुहोस्"
+msgstr "पत्र देखाउनका लागि अनुकूल फन्टहरू प्रयोग गर्नुहोस्"
 
 #: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
@@ -12423,7 +12426,7 @@ msgstr "इभोल्युसन इ एल एम आयातकर्त�
 
 #: ../mail/importers/elm-importer.c:382
 msgid "Import mail from Elm."
-msgstr "इ एल एम बाट मेल आयात गर्दैछ"
+msgstr "इ एल एम बाट पत्र आयात गर्दैछ"
 
 #: ../mail/importers/evolution-mbox-importer.c:83
 #: ../mail/importers/evolution-outlook-importer.c:136
@@ -12488,10 +12491,10 @@ msgstr ""
 "तपाईँको नेटस्पेस इमेल फिल्टरहरू मध्य केहि\n"
 "इमेल गुणहरू आधारितमा छन्, जुन इभोल्युसनमा प्रयोग हुदैन । \n"
 " सट्टामा, इभोल्युसनले प्रदान गर्ने प्राप्ताङ्कको दायरा भित्र\n"
-" -३ देखि ३ जुन इमेलहरुलाई मानाङ्कन गरिन सक्छ र फिल्टर गरिएको\n"
+" -३ देखि ३ जुन इमेलहरूलाई मानाङ्कन गरिन सक्छ र फिल्टर गरिएको\n"
 " अनुसार ।\n"
 "\n"
-" कार्य वरिपरि हुने, एक फिल्टरहरुको सेटलाई भिनिन्छ\"प्राथमिक फिल्टर\"\n"
+" कार्य वरिपरि हुने, एक फिल्टरहरूको सेटलाई भिनिन्छ\"प्राथमिक फिल्टर\"\n"
 "थपियो जुन नेटस्पेसको इमेल फिल्टर गुणहरू बदल्छ\n"
 " मा इभोल्युसनको स्कोरहरू, र प्रभावित फिल्टरहरूले प्रयोग गर्छ स्कोरहरुको मात्र\n"
 " गुणहरू आयात गरिएका फिल्टरहरू जाँच गर्न निश्चय गर्न\n"
@@ -12506,7 +12509,7 @@ msgid ""
 msgstr ""
 "तपाईँको नेटस्पेस इमेल फिल्टरहरू मध्ये केहिले प्रयोग गर्छ\n"
 " यो \"थ्रेड बेवास्ता गर्नु\" वा \"थ्रेड हेर्नु\"\n"
-" सुविधा, जस्लाई इभोल्युसनमा समर्थन गर्दैन ।\n"
+" सुविधा, जस्लाई इभोल्युसनमा सहारा दिदैन ।\n"
 "ती फिल्टरहरू छाडिने छन ।"
 
 #: ../mail/importers/netscape-importer.c:704
@@ -12518,8 +12521,8 @@ msgid ""
 "contained in the message body."
 msgstr ""
 "तपाईँको नेटस्पेस इमेल फिल्टरहरू मध्य केहिले परीक्षण गर्छ\n"
-" इमेलहरुको मुख्य भाग (भित्र) समानता दिइएको एक स्ट्रिङ,\n"
-" जुन चाहि इभोल्युसन भित्र समर्थन गर्दैन । ती फिल्टरहरू\n"
+" इमेलहरूको मुख्य भाग (भित्र) समानता दिइएको एक स्ट्रिङ,\n"
+" जुन चाहि इभोल्युसन भित्र सहारा दिदैन । ती फिल्टरहरू\n"
 "परिवर्तित गरिए परीक्षणका लागि जब त्यो स्ट्रिङ संग\n"
 " सन्देश मुख्य भाग भित्र छैन ।"
 
@@ -12537,15 +12540,15 @@ msgstr "सेटिङहरू"
 
 #: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
-msgstr "मेल फिल्टरहरू"
+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"
-"के तपाईँ तिनीहरुलाई इभोल्युसनमा आयात गर्न चाहनुहुन्छ ?"
+"इभोल्युसनले नेटस्पेस पत्र फाइलहरू फेला पारेको छ ।\n"
+"के तपाईँ तिनीहरूलाई इभोल्युसनमा आयात गर्न चाहनुहुन्छ ?"
 
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
@@ -12562,12 +12565,12 @@ msgstr "पाइनबाट फाइल आयात गर्नुहोस
 #: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
-msgstr "%s मा मेल पठाउनुहोस्"
+msgstr "%s मा पत्र पठाउनुहोस्"
 
 #: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
-msgstr "%s बाट मेल"
+msgstr "%s बाट पत्र"
 
 #: ../mail/mail-autofilter.c:266
 #, c-format
@@ -12634,31 +12637,31 @@ msgstr[1] ", %d नपढिएको"
 
 #: ../mail/mail-component.c:779
 msgid "New Mail Message"
-msgstr "नयाँ मेल सन्देश"
+msgstr "नयाँ पत्र सन्देश"
 
 #: ../mail/mail-component.c:780
 msgid "_Mail Message"
-msgstr "मेल सन्देश"
+msgstr "पत्र सन्देश"
 
 #: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
-msgstr "एक नयाँ मेल सन्देश रचना गर्नुहोस्"
+msgstr "एक नयाँ पत्र सन्देश रचना गर्नुहोस्"
 
 #: ../mail/mail-component.c:787
 msgid "New Mail Folder"
-msgstr "नयाँ मेल फोल्डर"
+msgstr "नयाँ पत्र फोल्डर"
 
 #: ../mail/mail-component.c:788
 msgid "Mail _Folder"
-msgstr "मेल फोल्डर"
+msgstr "पत्र फोल्डर"
 
 #: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
-msgstr "एउटा नयाँ मेल फोल्डर सिर्जना गर्नुहोस्"
+msgstr "एउटा नयाँ पत्र फोल्डर सिर्जना गर्नुहोस्"
 
 #: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
-msgstr "मेल सेटिङहरू र फोल्डरहरू अद्यावधिक गर्दा असफल भयो ।"
+msgstr "पत्र सेटिङहरू र फोल्डरहरू अद्यावधिक गर्दा असफल भयो ।"
 
 #: ../mail/mail-config.c:85
 msgid "I_mportant"
@@ -12736,11 +12739,11 @@ msgstr "<span weight=\"bold\">पूर्वनिर्धारित व्�
 
 #: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">मेल मेट्नुहोस्</span>"
+msgstr "<span weight=\"bold\">पत्र मेट्नुहोस्</span>"
 
 #: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">प्रदर्शित मेल हेडरहरू</span>"
+msgstr "<span weight=\"bold\">प्रदर्शित पत्र हेडरहरू</span>"
 
 #: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
@@ -12768,7 +12771,7 @@ msgstr "<span weight=\"bold\">सन्देश भरपाईहरू</span>
 
 #: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">नयाँ मेल सूचना</span>"
+msgstr "<span weight=\"bold\">नयाँ पत्र सूचना</span>"
 
 #: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
@@ -12821,11 +12824,11 @@ msgstr "लिपि थप्नुहोस्"
 
 #: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr "यो खाता प्रयोग गर्दा पठाइने सन्देशहरुलाई सधै चिन्ह दिनुहोस्"
+msgstr "यो खाता प्रयोग गर्दा पठाइने सन्देशहरूलाई सधै चिन्ह दिनुहोस्"
 
 #: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr "गुप्तीकरण गरिएको मेल पठाउँदा आफुलाई पनि गुप्तीकरण गर्नुहोस्"
+msgstr "गुप्तीकरण गरिएको पत्र पठाउँदा आफुलाई पनि गुप्तीकरण गर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
@@ -12841,7 +12844,7 @@ msgstr "गुप्तीकरण गर्दा मेरो किरिङ
 
 #: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "गुप्तीकरण गरिएको मेल पठाउँदा मेरो लागि सधै गप्तीकरण गर्नुहोस्"
+msgstr "गुप्तीकरण गरिएको पत्र पठाउँदा मेरो लागि सधै गप्तीकरण गर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
@@ -12861,7 +12864,7 @@ msgstr "बाल्टिक (ISO-8859-4)"
 
 #: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
-msgstr "नयाँ मेल आउँदा बीप गर्नुहोस्"
+msgstr "नयाँ पत्र आउँदा बीप गर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
@@ -12869,11 +12872,11 @@ msgstr "क्यारेक्टर सेट:"
 
 #: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
-msgstr "समर्थन दिएको प्रकारहरू जाँच्नुहोस् "
+msgstr "सहारा दिएको प्रकारहरू जाँच्नुहोस् "
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
-msgstr "मेल आगमनमा रद्दी जाँच गर्नुहोस्"
+msgstr "पत्र आगमनमा रद्दी जाँच गर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -12881,7 +12884,7 @@ msgstr "टाएप गर्दा हिज्जे जाँच गर्�
 
 #: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
-msgstr "आगमन मेल सन्देशहरू रद्दी भएको जाँच गर्दछ"
+msgstr "आगमन पत्र सन्देशहरू रद्दी भएको जाँच गर्दछ"
 
 #: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
@@ -12893,7 +12896,7 @@ msgstr "खाली गर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
-msgstr "हिज्जे नमिलेको शब्दहरुलाई रंग दिनुहोस्:"
+msgstr "हिज्जे नमिलेको शब्दहरूलाई रंग दिनुहोस्:"
 
 #: ../mail/mail-config.glade.h:58
 msgid "Colors"
@@ -12912,7 +12915,7 @@ msgid ""
 "\n"
 "Click \"Apply\" to save your settings."
 msgstr ""
-"तपाईँलाई बधाई छ, तपाईँको मेल कन्फिगरेसन पूरा छ ।\n"
+"तपाईँलाई बधाई छ, तपाईँको पत्र कन्फिगरेसन पूरा छ ।\n"
 "\n"
 "इभोल्युसन प्रयोग गरेर। \n"
 "तपाईँ अहिले इमेल पठाउन र प्राप्त गर्न तयार हुनुहुन्छ \n"
@@ -12990,7 +12993,7 @@ msgstr "पूरा नाम:"
 
 #: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
-msgstr "HTML मेल"
+msgstr "HTML पत्र"
 
 #: ../mail/mail-config.glade.h:88
 msgid "Headers"
@@ -13014,11 +13017,11 @@ msgstr "भाषा तालिका"
 
 #: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
-msgstr "मेल कन्फिगरेसन"
+msgstr "पत्र कन्फिगरेसन"
 
 #: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
-msgstr "मेल हेडरहरू तालिका"
+msgstr "पत्र हेडरहरू तालिका"
 
 #: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
@@ -13044,7 +13047,7 @@ msgstr "PGP/GPG _कुञ्जी परिचय:"
 
 #: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
-msgstr "नयाँ मेल आउँदा ध्वनी फाइल प्ले गर्नुहोस्"
+msgstr "नयाँ पत्र आउँदा ध्वनी फाइल प्ले गर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:108
 msgid ""
@@ -13059,7 +13062,7 @@ msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"कृपया तपाईँले पठाउने मेलको बाटोका बारेमा सूचना प्रविष्टि गर्नुहोस् । यदि तपाईँ निश्चित हुनु "
+"कृपया तपाईँले पठाउने पत्रको बाटोका बारेमा सूचना प्रविष्टि गर्नुहोस् । यदि तपाईँ निश्चित हुनु "
 "हुँदैन भने तपाईँको व्यवस्था प्रशासक वा सर्भर प्रदायकलाई सोध्नुहोस् । "
 
 #: ../mail/mail-config.glade.h:111
@@ -13137,11 +13140,11 @@ msgstr "सन्देश भरपाई पठाउनुहोस्:"
 
 #: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
-msgstr "मेल पठाउदा"
+msgstr "पत्र पठाउदै"
 
 #: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
-msgstr "पठाएको सन्देशहरुको फोल्डर:"
+msgstr "पठाएको सन्देशहरूको फोल्डर:"
 
 #: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
@@ -13217,7 +13220,7 @@ msgid ""
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
-"इभोल्युसन मेल कन्फिगरेसन सहयोगीमा स्वागत छ ।\n"
+"इभोल्युसन पत्र कन्फिगरेसन सहयोगीमा स्वागत छ ।\n"
 "\n"
 "क्लिक गर्नुहोस् \"फवार्ड\" शुरु गर्न । "
 
@@ -13231,7 +13234,7 @@ msgstr "जहिले पनि इन्टरनेटबाट छविह
 
 #: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
-msgstr "नयाँ मेल आउँदा मलाई सूचना नगर्नुहोस्"
+msgstr "नयाँ पत्र आउँदा मलाई सूचना नगर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
@@ -13243,7 +13246,7 @@ msgstr "फवार्ड शैली:"
 
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
-msgstr "सम्पर्कहरुबाट मेलमा छविहरू लोड गर्नुहोस्"
+msgstr "सम्पर्कहरुबाट पत्रमा छविहरू लोड गर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
@@ -13263,7 +13266,7 @@ msgstr "बाटो:"
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "सम्पर्कहरूमा HTML सन्देशहरू जुन उनीहरुलाई इच्छा छैन पठाउँदै गर्दा प्रोम्पट गर्नुहोस्"
+msgstr "सम्पर्कहरूमा HTML सन्देशहरू जुन उनीहरूलाई इच्छा छैन पठाउँदै गर्दा प्रोम्पट गर्नुहोस्"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -13411,7 +13414,7 @@ msgstr "फोल्डर फिल्टर गर्दै"
 
 #: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
-msgstr "मेल ल्याउँदा"
+msgstr "पत्र ल्याउँदै"
 
 #. sending mail, filtering failed
 #: ../mail/mail-ops.c:565
@@ -13519,14 +13522,14 @@ msgstr "स्थानीय फोल्डरहरू"
 #: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
-msgstr "सन्देश %s पुन: प्राप्त गर्दै"
+msgstr "सन्देश %s पुन प्राप्त गर्दै"
 
 #: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "सन्देश %d पुन: प्राप्त गर्दै"
-msgstr[1] "सन्देशहरूहरु %d पुन: प्राप्त गर्नुहोस् "
+msgstr[0] "सन्देश %d पुन प्राप्त गर्दै"
+msgstr[1] "सन्देशहरूहरु %d पुन प्राप्त गर्नुहोस् "
 
 #: ../mail/mail-ops.c:1941
 #, c-format
@@ -13591,7 +13594,7 @@ msgstr "रद्द गर्दै..."
 
 #: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
-msgstr "मेल पठाउनुहोस् र प्राप्त गर्नुहोस्"
+msgstr "पत्र पठाउने र प्राप्त गर्ने"
 
 #: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
@@ -13607,7 +13610,7 @@ msgstr "पर्खदै..."
 
 #: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
-msgstr "नयाँ मेलका लागि जाँच गर्दै"
+msgstr "नयाँ पत्रका लागि जाँच गर्दै"
 
 #: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
@@ -13644,7 +13647,7 @@ msgstr "स्पुल डाइरेक्ट्रि सिर्जना
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "एक गैर-एमबाकस स्रोत मेल सार्न प्रयास गर्दै `%s'"
+msgstr "एक गैर-एमबाकस स्रोत पत्र सार्न प्रयास गर्दै `%s'"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -13715,7 +13718,7 @@ msgstr "&quot;{0}&quot;. नाम भएको फोल्डर पहिल�
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "एक अर्थपूर्ण विषय हरफ तपाईँको सन्देशहरुमा थप्दा पाउनेले तपाईँको मेलको बारेमा थाहा पाउनेछन ।"
+msgstr "एक अर्थपूर्ण विषय हरफ तपाईँको सन्देशहरूमा थप्दा पाउनेले तपाईँको पत्रको बारेमा थाह पाउनेछन ।"
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -13923,7 +13926,7 @@ msgstr "फाइल अवस्थित छ तर यो नियमित
 
 #: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
-msgstr "यदि तपाईँले निरन्तरता दिनुभयो भने, ती सन्देशहरुलाई पुनप्राप्ति गर्न सक्नुहुने छैन ।"
+msgstr "यदि तपाईँले निरन्तरता दिनुभयो भने, ती सन्देशहरूलाई पुनप्राप्ति गर्न सक्नुहुने छैन ।"
 
 #: ../mail/mail.error.xml.h:58
 msgid ""
@@ -13965,7 +13968,7 @@ msgstr "अवैध प्रमाणिकरण"
 
 #: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
-msgstr "मेल फिल्टरहरू स्वचालित तवरले अद्यावधिक गरिन्छ ।"
+msgstr "पत्र फिल्टरहरू स्वचालित तवरले अद्यावधिक गरिन्छ ।"
 
 #: ../mail/mail.error.xml.h:67
 msgid ""
@@ -13975,7 +13978,7 @@ msgid ""
 "recipient."
 msgstr ""
 "धेरै इमेल प्रणालीहरूले सन्देशहरूमा देखिनेगरि-लाई हेडर थप्दछन जुन संग मात्र गुप्त बोधार्थ हुन्छ । "
-"यस हेडरले,यदि थपियो भने, सबै तपाईँका सन्देश पाउनेहरुलाई सूचीकृत गर्नेछ । यसलाई त्याग्नको "
+"यस हेडरले,यदि थपियो भने, सबै तपाईँका सन्देश पाउनेहरूलाई सूचीकृत गर्नेछ । यसलाई त्याग्नको "
 "लागि, तपाईँले कम्तिमा पनि एक लाई: वा सिसि: पाउनेहरू थप्नु पर्दछ ।"
 
 #: ../mail/mail.error.xml.h:68
@@ -14035,7 +14038,7 @@ msgstr "कृपया प्रतिक्षा गर्नुहोस्
 
 #: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "पुरानो मेल फोल्डर &quot;{0}&quot; सार्दै गर्दा समस्या ।"
+msgstr "पुरानो पत्र फोल्डर &quot;{0}&quot; सार्दै गर्दा समस्या ।"
 
 #: ../mail/mail.error.xml.h:83
 msgid "Querying server"
@@ -14070,7 +14073,7 @@ msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
 msgstr ""
-"प्रणाली फोल्डरहरुलाई सहि कार्य गर्न जिमियन इभोल्युसन आवश्यक पर्दछ र पुन नामाकरण गर्न, "
+"प्रणाली फोल्डरहरूलाई सहि कार्य गर्न जिमियन इभोल्युसन आवश्यक पर्दछ र पुन नामाकरण गर्न, "
 "हटाउन वा मेटाउन सकिँदैन ।"
 
 #: ../mail/mail.error.xml.h:91
@@ -14082,10 +14085,10 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"यो सम्पर्क सूचीमा लुकाउने पाउनेहरुको सूचीमा कन्फिगर गर्ने तपाईँले पठाइरहनु भएकोछ ।\n"
+"यो सम्पर्क सूचीमा लुकाउने पाउनेहरूको सूचीमा कन्फिगर गर्ने तपाईँले पठाइरहनु भएकोछ ।\n"
 "\n"
 "धेरै इमेल प्रणालीहरूले सन्देशहरूमा देखिने गरि-लाई हेडर थप्दछन जुन संग मात्र गुप्त बोधार्थ हुन्छ । "
-"यस हेडरले, यदि थपियो भने, सबै तपाईँका सन्देश पाउनेहरुलाई सूचीकृत गर्नेछ । यसलाई त्याग्नको "
+"यस हेडरले, यदि थपियो भने, सबै तपाईँका सन्देश पाउनेहरूलाई सूचीकृत गर्नेछ । यसलाई त्याग्नको "
 "लागि, तपाईँले कम्तिमा पनि एक लाई: वा सिसि: पाउनेहरू थप्नु पर्दछ ।"
 
 #: ../mail/mail.error.xml.h:94
@@ -14123,8 +14126,8 @@ msgid ""
 "The message is stored in the Outbox folder. Check the message for errors and "
 "resend."
 msgstr ""
-"यो सन्देश &quot; पठाएको मेल &quot; बाह्य अनुप्रयोग द्वारा पठाइएको छैन । मेलपठाउनेले तलको त्रुटि "
-"देखाउँदछ: स्थिति 67: मेल पठाएको छैन ।\n"
+"यो सन्देश &quot; पठाएको पत्र &quot; बाह्य अनुप्रयोग द्वारा पठाइएको छैन । पत्रपठाउनेले तलको त्रुटि "
+"देखाउँदछ: स्थिति 67: पत्र पठाएको छैन ।\n"
 "यो सन्देश प्रषकमञ्जूषा फोल्डरमा भण्डारण गरिन्छ। सन्देशका त्रुटिहरू जाँच गरेर पुन पठाउनुहोस् ।"
 
 #: ../mail/mail.error.xml.h:106
@@ -14154,7 +14157,7 @@ msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
-"यो सर्भरले यस प्रकारको प्रमाणीकरणलाई समर्थन गर्दैन र सम्पूर्णप्रमाणीकरण प्रकृयालाई समर्थन "
+"यो सर्भरले यस प्रकारको प्रमाणीकरणलाई समर्थन गर्दैन र सम्पूर्णप्रमाणीकरण प्रकृयालाई सहारा "
 "नदिन सक्छ ।"
 
 #: ../mail/mail.error.xml.h:112
@@ -14169,7 +14172,7 @@ msgstr "यसले चयन गरिएको फोल्डर र यस�
 
 #: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
-msgstr "समूहगत सर्भरलाई जडान गर्न अक्षम छ ।"
+msgstr "समुहगत सर्भरलाई जडान गर्न अक्षम छ ।"
 
 #: ../mail/mail.error.xml.h:115
 msgid ""
@@ -14218,8 +14221,8 @@ msgid ""
 "folders, all remote folders, or both."
 msgstr ""
 "तपाईँले स्रोतको रूपमा कम्तिमा पनि एउटा फोल्डरलाई निश्चित गर्नुपर्दछ ।\n"
-"या त फोल्डरहरुलाई छुट्टछुट्टै चयन गरेर, र/वा \n"
-"चयन सबै स्थानीय फोल्डरहरुको, सबै दूर फोल्डरहरू, वा दुबै ।"
+"या त फोल्डरहरूलाई छुट्टछुट्टै चयन गरेर, र/वा \n"
+"चयन सबै स्थानीय फोल्डरहरूको, सबै दूर फोल्डरहरू, वा दुबै ।"
 
 #: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
@@ -14616,15 +14619,15 @@ msgstr "प्रत्येक पटक इभोल्युसन सुर
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "इभोल्युसन स्टार्टअपमा पूर्वनिर्धारित मेल क्लाइन्ट हो कि होइन भनि जाँच गर्दछ ।"
+msgstr "इभोल्युसन स्टार्टअपमा पूर्वनिर्धारित पत्र ग्राहक हो कि होइन भनि जाँच गर्दछ ।"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
-msgstr "पूर्वनिर्धारित मेल क्लाइन्ट"
+msgstr "पत्र ग्राहक पूर्वनिर्धारित गर्नुहोस्"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "इभोल्युसनलाई तपाईँको पूर्वनिर्धारित इ-मेल क्लाइन्ट बनाउन चाहनुहुन्छ ?"
+msgstr "इभोल्युसनलाई तपाईँको पूर्वनिर्धारित इ-मेल ग्राहक बनाउन चाहनुहुन्छ ?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
@@ -14668,7 +14671,7 @@ msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
-"यस विकल्पलाई सुरक्षित पासवर्ड (एन टि एल एम) प्रमाणिकरण प्रयोग गरेर अदल-बदल सर्भरमा "
+"यस विकल्पलाई सुरक्षित पासवर्ड (एन टि एल एम) प्रमाणिकरण प्रयोग गरेर एक्सचेन्ज सर्भरमा "
 "जडान गरिनेछ ।"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
@@ -14679,7 +14682,7 @@ msgstr "सादा पाठ पासवर्ड"
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
-msgstr "यस विकल्पलाई सादा पाठ पासवर्ड प्रमाणिकरण प्रयोग गरेर अदल-बदल सर्भरमा जडान गरिनेछ ।"
+msgstr "यस विकल्पलाई सादा पाठ पासवर्ड प्रमाणिकरण प्रयोग गरेर एक्सचेन्ज सर्भरमा जडान गरिनेछ ।"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
@@ -14691,7 +14694,7 @@ msgid ""
 "each person who sends mail to you while you are out of the office."
 msgstr ""
 "तल निश्चय गरिएको सन्देश स्वत पठाइने छ \n"
-" हरेक व्यक्तिलाई जसले तपाईँ अफिस बाहिर भएको समयमा मेल पठाउँछन ।"
+" हरेक व्यक्तिलाई जसले तपाईँ अफिस बाहिर भएको समयमा पत्र पठाउँछन ।"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:276
 #: ../plugins/exchange-operations/exchange-account-setup.c:281
@@ -14889,7 +14892,7 @@ msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
-"यि प्रयोगकर्ताहरुले तपाईँको निमित्त मेल पठाउन \n"
+"यि प्रयोगकर्ताहरुले तपाईँको निमित्त पत्र पठाउन \n"
 "र तपाईँको फोल्डरहरू पहुँच गर्न सक्नेछन् तपाईँले तिनिहरुलाई अनुमति दिनु हुन्छ ।"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
@@ -15068,7 +15071,7 @@ msgstr "फोल्डरहरू प्रर्दशन गर्न सक
 msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
-msgstr "तपाईँले इभोल्युसन बन्द गरेर फेरि सुरु गरे पछि इभोल्युसनमा परिवर्तन ल्याउदा अदल-बदल खाता कन्फिगरेसनले केहि स्थान लिनेछ ।"
+msgstr "तपाईँले इभोल्युसन बन्द गरेर फेरि सुरु गरे पछि इभोल्युसनमा परिवर्तन ल्याउदा खाता कन्फिगरेसनले केहि स्थान लिनेछ । "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15151,18 +15154,6 @@ msgid ""
 "{0}\n"
 "  "
 msgstr ""
-"अदल-बदल योजकको प्रकार्यत्मकतालाई अदल-बदल सर्भरमा निश्चित\n"
-"प्रकार्यत्मकतामा पहुँच आवश्यक पर्दछ जुन\n"
-"असक्षम गरिएको वा रोकिएको देखिन्छ । (सामान्यतया यो\n"
-"अन्तराष्टिय हुदैन ।) तपाईँको अदल-बदल प्रशासकलाई तपाईँले\n"
-"इभोल्युसन अदल-बदल योजक प्रयोग गर्न सक्षम हुनका लागि\n"
-"यो प्रयोगात्मकता सक्षम हुनु आवश्यक हुन्छ ।\n"
-"\n"
-"तपाईँको अदल-बदल प्रशासकलाई सूचना प्रदान गर्नका लागि,\n"
-"कृपया तलको लिङ्कहरू अनुशरण गर्नुहोस्:\n"
-"\n"
-"{0}\n"
-"  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
@@ -15309,7 +15300,7 @@ msgstr "तपाईँले आफ्नो प्रतिनिधि आफ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
-msgstr "तपाईँले यस सर्भरमा मेल भण्डार गर्नका लागि तपाईँको कोटा पार गर्नु भएको छ ।"
+msgstr "तपाईँले यस सर्भरमा पत्र भण्डार गर्नका लागि तपाईँको कोटा पार गर्नु भएको छ ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
@@ -15319,19 +15310,19 @@ msgstr "तपाईँले एकल अदल-बदल खाता कन�
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
-msgstr "तपाईँको हालको प्रयोग: {0} के बि छ । केहि मेलहरू मेटाएर केहि खाली ठाँउ खाली गर्न प्रयास गर्नुहोस् ।"
+msgstr "तपाईँको हालको प्रयोग: {0} के बि छ । केहि पत्रहरू मेटाएर केहि खाली ठाँउ खाली गर्न प्रयास गर्नुहोस् ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr "तपाईँको हालको प्रयोग: {0} के बि छ । तपाईँले हाललाई मेल पठाउन वा पाउन सक्नुहुन्न ।"
+msgstr "तपाईँको हालको प्रयोग: {0} के बि छ । तपाईँले हाललाई पत्र पठाउन वा पाउन सक्नुहुन्न ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr "तपाईँको हालको प्रयोग: {0} के बि छ । तपाईँले केहि मेल हटाएर ठाँउ खाली नगरेसम्म मेल पठाँउन सक्नुहुन्न ।"
+msgstr "तपाईँको हालको प्रयोग: {0} के बि छ । तपाईँले केहि पत्र हटाएर ठाँउ खाली नगरेसम्म पत्र पठाँउन सक्नुहुन्न ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15364,7 +15355,7 @@ 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."
-msgstr "फोल्डर ट्रि प्रसङ्ग मेनुमा मेल फोल्डरहरुको सदस्यता छाड्न अनुमति दिन्छ ।"
+msgstr "फोल्डर ट्रि प्रसङ्ग मेनुमा पत्र फोल्डरहरुको सदस्यता छाड्न अनुमति दिन्छ ।"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -15376,7 +15367,7 @@ msgstr "जाँचसूची"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "Groupwise Account Setup"
-msgstr "समूहगत खाता सेटअप"
+msgstr "समुहगत खाता सेटअप"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
@@ -15384,11 +15375,11 @@ msgstr "रद्दी सेटिङहरू"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>रद्दी मेल सेटिङ्हरू</b>"
+msgstr "<b>रद्दी पत्र सेटिङ्हरू</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 msgid "Junk Mail Settings..."
-msgstr "रद्दी मेल सेटिङ्हरू..."
+msgstr "रद्दी पत्र सेटिङ्हरू..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
@@ -15400,7 +15391,7 @@ msgstr "इमेल:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "रद्दी मेल सेटिङहरू"
+msgstr "रद्दी पत्र सेटिङहरू"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -15417,7 +15408,7 @@ 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-compose-send-options.xml.h:2
 #: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
@@ -15427,11 +15418,11 @@ 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/process-meeting.c:49
 msgid "Accept Tentatively"
@@ -16024,7 +16015,7 @@ msgstr "<b>%s</b> तलका कार्य प्रकाशित गर�
 #: ../plugins/itip-formatter/itip-view.c:419
 #, 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:422
 #, c-format
@@ -16215,17 +16206,17 @@ msgstr "भण्डार उपलब्ध छैन"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
 msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "एउटा प्लगइन जसले टाँढाबाट नै मेल डेटा पहुँच गर्नका लागि CORBA इन्टरफेस कार्यान्वयन गर्दछ ।"
+msgstr "एउटा प्लगइन जसले टाँढाबाट नै पत्र डेटा पहुँच गर्नका लागि CORBA इन्टरफेस कार्यान्वयन गर्दछ ।"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
 msgid "Mail Remote"
-msgstr "टाढा मेल"
+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 "एउटा प्लगइन जसले पत्र सन्देशको सामाग्रिहरू बाट बैठकको सिर्जना गर्न अनुमति दिन्छ ।"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -16233,13 +16224,13 @@ msgstr "बैठकमा रुपान्तरण गर्नुहोस�
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
 msgid "Mail to meeting"
-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
@@ -16248,7 +16239,7 @@ 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"
@@ -16340,7 +16331,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
-msgstr "पत्राचार सूचीमा इमेल सन्देश पठाउनुहुन्छ ?"
+msgstr "पत्राचार सूचीमा इमेल सन्देश पठाउने ?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
@@ -16420,7 +16411,7 @@ msgstr "पात्रो अफलाइन चिन्ह दिनुहो
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
 msgid "Marks the selected calendar for offline viewing."
-msgstr "अफलाइन अवलोकनका लागि चयन गरिएका सन्देशहरुलाई चिन्ह लगाउनुहोस् ।"
+msgstr "अफलाइन अवलोकनका लागि चयन गरिएका सन्देशहरूलाई चिन्ह लगाउनुहोस् ।"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make this available offline"
@@ -16440,15 +16431,15 @@ 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 सन्देश उत्पन्न गर्दछ"
+msgstr "नयाँ पत्र आउँदा एक D-BUS सन्देश उत्पन्न गर्दछ"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
 msgid "New Mail Notification"
-msgstr "नयाँ मेल सूचना"
+msgstr "नयाँ पत्र सूचना"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
 msgid "New mail notify"
-msgstr "नयाँ मेल सूचित गर्दछ"
+msgstr "नयाँ पत्र सूचित गर्दछ"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
@@ -16526,7 +16517,7 @@ msgstr "HTML स्थिति"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
-msgstr "रचनाकार बाट मेल छाप्न एउटा विकल्प दिन्छ"
+msgstr "रचनाकार बाट पत्र छाप्न एउटा विकल्प दिन्छ"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
@@ -16851,7 +16842,7 @@ msgstr "डेटा आयात गर्दैछ ।"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr "यदि सन्देशहरुको थ्रेडिङ् विषयमा पुग्नु पर्दछ भने इङ्गित गर्दछ ।"
+msgstr ""
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -16884,7 +16875,7 @@ msgstr "इभोल्युसन परीक्षण अवयव"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr "हालको मुद्रक सेटिङहरुको जिनोम छपाइ विवरण"
+msgstr "हालको मुद्रक सेटिङहरूको जिनोम छपाइ विवरण"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
@@ -16912,7 +16903,7 @@ msgstr "पछिल्लो पटक अद्यावधिक गरिए
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "फोल्डरहरूका लागि बाटोहरुको सूची डिस्कमा अफलाइन प्रयोगका लागि समक्रमित गर्नु पर्दछ"
+msgstr "फोल्डरहरूका लागि बाटोहरूको सूची डिस्कमा अफलाइन प्रयोगका लागि समक्रमित गर्नु पर्दछ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
@@ -16963,7 +16954,7 @@ msgid ""
 "by the GNOME toolbar setting."
 msgstr ""
 "सञ्झ्याल बटनको शैली । \"पाठ\", \"प्रतिमाहरू\", \"दुबै\", \"उपकरण पट्टी\" हुन सक्छ । यदि "
-"\"उपकरण पट्टी\" सेट गरिन्छ भने, बटनहरुको शैली जिनोम उपकरणपट्टी सेटिङले निर्धारण गर्दछ ।"
+"\"उपकरण पट्टी\" सेट गरिन्छ भने, बटनहरूको शैली जिनोम उपकरणपट्टी सेटिङले निर्धारण गर्दछ ।"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
@@ -17029,7 +17020,7 @@ msgstr ""
 "तपाईँले इभोल्युसनमा आयात गर्न चाहनु भएको फाइल छान्नुहोस्, र सूचीबाट त्यस4 प्रकारको फाइल "
 "चयन गर्नुहोस् ।\n"
 "\n"
-"तपाईँले \"स्वचालित\" चयन गर्न सक्नुहुनेछ यदि तपाईँलाई थाहा छैन र इभोल्युसन कार्य गर्न छाड्नेछ ।"
+"तपाईँले \"स्वचालित\" चयन गर्न सक्नुहुनेछ यदि तपाईँलाई थाह छैन र इभोल्युसन कार्य गर्न छाड्नेछ ।"
 
 #: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
@@ -17112,15 +17103,7 @@ msgstr "बग बडि सञ्चालन गर्न सकिएन ।"
 #. * about box
 #: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
-msgstr ""
-"Shiva  Pokharel <pokharelshiva@hotmail.com>,"
-"Mahesh Subedi<submanesh@hotmail.com>,"
-"Jyotshna Shrestha <jyotshna@mpp.org.np>,"
-"Jaydeep Bhusal <zaydeep@hotmail.com>,"
-"Kapil Timilsina <lipak21@gmail.com>,"
-"Bishnu Adhikari <bsn_adk@hotmail.com>,"
-"Ganesh Ghimire <gghimire@gmail.com>,"
-"Pawan Chitrakar <pawan@mpp.org.np>"
+msgstr "Mahesh Subedi<submanesh@hotmail.com>"
 
 #: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
@@ -17259,7 +17242,7 @@ msgstr ""
 "यदि तपाईँ इभोल्युसनको एक स्थाइ संस्करण चाहनुहुन्छ भने हामी तपाईँलाई यस संस्करण\n"
 " स्थापना गर्न भन्नेछौ र बदलामा संसकरण %s स्थापना गर्नुहोस् ।\n"
 "\n"
-"यदि तपाईँले त्रुटिहरू पाउनु हुन्छ भने, कृपया तिनीहरुको हामीलाई bugzilla.ximian.co मा "
+"यदि तपाईँले त्रुटिहरू पाउनु हुन्छ भने, कृपया तिनीहरूको हामीलाई bugzilla.ximian.co मा "
 "प्रतिवेदन दिनुहोस् ।\n"
 "यस उत्पादनसंग कुनै विश्वासिलो आधार छैन र यसमा इच्छा गरिएका लागि व्यक्तिको रिसको हिंस्रक "
 "रुप चाहँदैन ।\n"
@@ -17298,7 +17281,7 @@ msgstr " इभोल्युसन १.४ बाट बलपूर्बक
 
 #: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
-msgstr "फाइलमा सबै अवयवहरुको त्रुटि सच्याउने निर्गत पठाउनुहोस् ।"
+msgstr "फाइलमा सबै अवयवहरूको त्रुटि सच्याउने निर्गत पठाउनुहोस् ।"
 
 #: ../shell/main.c:488
 msgid "Disable loading of any plugins."
@@ -17357,7 +17340,7 @@ msgid ""
 msgstr ""
 "\"evolution\" डाइरेक्टरीको अन्तरनिहित सामग्रीहरू करिब सदाका लागि हटाइने छन ।\n"
 "\n"
-"यो सुझाब छ कि तपाईँले आफैले रुजु गर्ने जुन सबै तपाईँको मेल, सम्पर्क, र पात्रो डेटा छ, र त्यो "
+"यो सुझाब छ कि तपाईँले आफैले रुजु गर्ने जुन सबै तपाईँको पत्र, सम्पर्क, र पात्रो डेटा छ, र त्यो "
 "इभोल्युसनको यस संस्करणले पुरानो डेटा मेटाउनु अगाडि सही कार्य गर्दछ ।\n"
 "\n"
 "एकपटक मेटिएको, तपाईँले इभोल्युसनको पहिलेको संस्करणलाई आफैले हस्तक्षेप गरे बिना तल्लोश्रेणीमा "
@@ -17719,7 +17702,7 @@ 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"
@@ -17798,7 +17781,7 @@ msgstr "वस्तु पहिचायक (%s)"
 
 #: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
-msgstr "अलगोरिदम पहिचायक"
+msgstr "अलगोरिद्यम पहिचायक"
 
 #: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
@@ -17814,11 +17797,11 @@ msgstr "विषय सार्वजनिक कुञ्जी अलगो
 
 #: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
-msgstr "विषयहरुको सार्वजनिक कुञ्जी"
+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"
@@ -18002,7 +17985,7 @@ msgstr "चयन गरिएका सम्पर्कहरू मेट्
 
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
-msgstr "चयन गरिएका सन्देशहरुलाई मेट्नुहोस्"
+msgstr "चयन गरिएका सन्देशहरूलाई मेट्नुहोस्"
 
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
@@ -18537,7 +18520,7 @@ msgstr "सन्देशको पूर्वावलोकन सञ्झ�
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "दूर सर्भरहरूमा फोल्डरहरुको सदस्यता लिने वा नलिने"
+msgstr "दूर सर्भरहरूमा फोल्डरहरूको सदस्यता लिने वा नलिने"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
@@ -18617,7 +18600,7 @@ msgstr "मेटाइएको सन्देशहरू हरफहरू�
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
-msgstr "सबै सन्देशहरुलाई पढिएको चिन्ह दिनुहोस्"
+msgstr "सबै सन्देशहरूलाई पढिएको चिन्ह दिनुहोस्"
 
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
@@ -18673,7 +18656,7 @@ msgstr "थ्रेड गरिएको सन्देश सूची"
 
 #: ../ui/evolution-mail-list.xml.h:31
 msgid "_Group By Threads"
-msgstr "थ्रेडहरुद्धारा समूह"
+msgstr "थ्रेडहरुद्धारा समुह"
 
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
@@ -18711,7 +18694,7 @@ msgstr "नयाँ सन्देश रचना गर्नुहोस्
 
 #: ../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"
@@ -18823,7 +18806,7 @@ msgstr "विषयमा फिल्टर गर्नुहोस्..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "चयन गरिएका सन्देशहरुलाई रद्दी वस्तुस्थितिका लागि फिल्टर गर्नुहोस्"
+msgstr "चयन गरिएका सन्देशहरूलाई रद्दी वस्तुस्थितिका लागि फिल्टर गर्नुहोस्"
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
@@ -18851,7 +18834,7 @@ msgstr "कोहिलाई चयन गरिएका सन्देश �
 
 #: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
-msgstr "कोहिलाई चयन गरिएका सन्देशहरुलाई संलग्न गरि फरवार्ड गर्नुहोस्"
+msgstr "कोहिलाई चयन गरिएका सन्देशहरूलाई संलग्न गरि फरवार्ड गर्नुहोस्"
 
 #: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
@@ -18887,7 +18870,7 @@ msgstr "चयन गरिएका सन्देशहरुलाई मह
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
-msgstr "मेटाइका लागि चयन गरिएका सन्देशहरुलाई चिन्ह लगाउनुहोस्"
+msgstr "मेटाइका लागि चयन गरिएका सन्देशहरूलाई चिन्ह लगाउनुहोस्"
 
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
@@ -18991,7 +18974,7 @@ msgstr "प्रेषक बाट फोल्डर खोजी गर्�
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
-msgstr "प्रदर्शन गरिएको सन्देशहरुको मुख्य भागमा पाठ खोजी गर्नुहोस्"
+msgstr "प्रदर्शन गरिएको सन्देशहरूको मुख्य भागमा पाठ खोजी गर्नुहोस्"
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
@@ -19007,7 +18990,7 @@ msgstr "तपाईँको हालको प्रिन्टरका ल
 
 #: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "प्रदर्शन गरिएको सन्देशहरुको मुख्य भागमा कर्सर झलक देखाउनुहोस्"
+msgstr "प्रदर्शन गरिएको सन्देशहरूको मुख्य भागमा कर्सर झलक देखाउनुहोस्"
 
 #: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages in the normal style"
@@ -19151,7 +19134,7 @@ msgstr "छाप्नुपर्ने पर्ने मेमोहरु�
 
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
-msgstr "मेमोहरुको सूची मुद्रण गर्नुहोस्"
+msgstr "मेमोहरुको सुची मुद्रण गर्नुहोस्"
 
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
@@ -19284,7 +19267,7 @@ msgstr "सन्देशको प्राथमिकता उच्चम�
 
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
-msgstr "यस सन्देशलाई तपाईँको PGP key चिन्ह दिनुहोस्"
+msgstr "यस सन्देशलाई तपाइको PGP key चिन्ह दिनुहोस्"
 
 #: ../ui/evolution-message-composer.xml.h:34
 msgid "Sign this message with your S/MIME Signature Certificate"
@@ -19387,7 +19370,7 @@ msgstr "सूची ताजा गर्नुहोस्"
 
 #: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
-msgstr "फोल्डरहरुको सूची ताजा गर्नुहोस्"
+msgstr "फोल्डरहरूको सूची ताजा गर्नुहोस्"
 
 #: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
@@ -19455,11 +19438,11 @@ 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"
@@ -19551,7 +19534,7 @@ msgstr "पठाउनुहोस् / प्राप्त गर्नु�
 
 #: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
-msgstr "लाम लागेको वस्तुहरू पठाउनुहोस् र नयाँ वस्तुहरू पुन: प्राप्त गर्नुहोस्"
+msgstr "लाम लागेको वस्तुहरू पठाउनुहोस् र नयाँ वस्तुहरू पुन प्राप्त गर्नुहोस्"
 
 #: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
@@ -20131,7 +20114,7 @@ msgstr "खोज.बचत गर्नुहोस्"
 
 #: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
-msgstr "बचत गरिएका खोजहरुलाई सम्पादन गर्नुहोस्..."
+msgstr "बचत गरिएका खोजहरूलाई सम्पादन गर्नुहोस्..."
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
@@ -20462,7 +20445,7 @@ msgstr "घट्दो क्रम"
 #: ../widgets/table/e-table-config-no-group.glade.h:8
 #: ../widgets/table/e-table-config.glade.h:7
 msgid "Group Items By"
-msgstr "द्धारा समूह वस्तुहरू"
+msgstr "द्धारा समुह वस्तुहरू"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
@@ -20536,7 +20519,7 @@ msgstr "क्रमबद्ध गरिएको छैन"
 
 #: ../widgets/table/e-table-config.c:355
 msgid "No grouping"
-msgstr "समूह बनाएको छैन"
+msgstr "समुह बनाएको छैन"
 
 #: ../widgets/table/e-table-config.c:584
 msgid "Available Fields"
@@ -20544,7 +20527,7 @@ msgstr "उपलब्ध फाँटहरू"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
-msgstr "द्धारा समूह..."
+msgstr "द्धारा समुह..."
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
@@ -20696,11 +20679,11 @@ msgstr "क्रमबद्ध हटाउनुहोस्"
 
 #: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
-msgstr "यो फाँट द्धारा समूह"
+msgstr "यो फाँट द्धारा समुह"
 
 #: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
-msgstr "बाकस द्धारा समूह"
+msgstr "बाकस द्धारा समुह"
 
 #: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
diff --git a/po/nl.po b/po/nl.po
index 605c8fa791..70163eed67 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -22,9 +22,9 @@
 # inbox -? postvak in/inbox
 # journal - dagboek
 # journal entry - dagboekaantekening
-# junk -? spam/troep: Spam, want troep is niet duidelijk (wordt niet eens begrepen in de zuidelijke delen van ons taalgebied (Vincent))
+# junk -? spam/troep
 # location - locatie
-# meeting -? bijeenkomst/afspraak (vergadering) (vergelijk appointment-afspraak)
+# meeting -? bijeenkomst (vergadering) (vergelijk appointment-afspraak)
 # notification - aandachtvestiging/melding
 # occurance - instantie
 # outbox -? postvak uit/outbox
@@ -49,23 +49,23 @@
 # Daniel van Eeden <daniel_e@dds.nl>, 2004.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
 # Vincent van Adrighem <adrighem@gnome.org>, 2001, 2003, 2004, 2005, 2006.
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-25 07:58+0200\n"
-"PO-Revision-Date: 2006-07-25 11:18+0200\n"
-"Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
-"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"POT-Creation-Date: 2006-05-27 12:44+0200\n"
+"PO-Revision-Date: 2006-05-27 13:56+0200\n"
+"Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
+"Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution adresboek"
 
@@ -79,12 +79,12 @@ msgstr "Nieuw contact"
 msgid "New Contact List"
 msgstr "Nieuwe contactenlijst"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "huidige adresboekmap %s heeft %d kaart"
-msgstr[1] "huidige adresboekmap %s heeft %d kaarten"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "Huidige adresboekmap heeft %d kaart"
+msgstr[1] "Huidige adresboekmap heeft %d kaarten"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -104,34 +104,34 @@ msgid "evolution minicard"
 msgstr "evolution minikaart"
 
 # wekkers/alarmen
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Het heeft alarmeringen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Het herhaalt zich."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Het is een bijeenkomst."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Agendanotitie: Samenvatting is %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Agendanotitie: bevat geen samenvatting."
 
 # is dit goed?
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "agendanotitie weergeven"
 
 # aandacht grijpen/betere vertaling?
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Focus grijpen"
 
@@ -160,48 +160,38 @@ msgstr "Ga naar datum"
 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] "Het heeft %d agendanotitie."
-msgstr[1] "Het heeft %d agendanotities."
+msgstr[0] "Het heeft %d gebeurtenis."
+msgstr[1] "Het heeft %d gebeurtenissen."
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
-msgstr "Het heeft geen agendanotities."
+msgstr "Het heeft geen notities."
 
-#. 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 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:158
 #, 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:189
 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:191
 msgid "calendar view for one or more days"
 msgstr "agendaweergave voor één of meer dagen"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -212,20 +202,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:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -233,10 +221,10 @@ msgstr "%a %d %b %Y"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -246,11 +234,9 @@ 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:220
-#: ../calendar/gui/calendar-component.c:732
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -383,14 +369,6 @@ msgstr "Standaard activeren"
 msgid "Popup Menu"
 msgstr "Popup-menu"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Bijlagenbalk aan/uit"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "activeren"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -462,8 +440,7 @@ msgstr "GroupWise adresboek aanmaken:"
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "LDAP server did not respond with valid schema information."
-msgstr ""
-"Het antwoord van de LDAP server bevatte geen geldige schema-informatie."
+msgstr "Het antwoord van de LDAP server bevatte geen geldige schema-informatie."
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
@@ -471,8 +448,7 @@ msgstr "Server-versie"
 
 #: ../addressbook/addressbook.error.xml.h:16
 msgid "Some features may not work properly with your current server"
-msgstr ""
-"Bepaalde functies werken mogelijk niet correct met uw huidige server-versie"
+msgstr "Bepaalde functies werken mogelijk niet correct met uw huidige server-versie"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "The Evolution addressbook has quit unexpectedly."
@@ -480,8 +456,7 @@ msgstr "Het Evolution adresboek is plotseling gesloten."
 
 # verkleinen ipv herschalen
 #: ../addressbook/addressbook.error.xml.h:18
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "De afbeelding die u heeft uitgekozen is groot. Wilt u het verkleinen en "
 "opslaan?"
@@ -567,15 +542,14 @@ msgstr ""
 "opslaan?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Uw contacten voor {0} zullen niet beschikbaar zijn totdat Evolution herstart "
 "is."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Toevoegen"
@@ -585,7 +559,7 @@ msgid "_Discard"
 msgstr "_Verwerpen"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -628,9 +602,9 @@ msgstr "Automatsch aanvullen hier configureren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Adresboek"
 
@@ -672,8 +646,8 @@ 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:141
 #: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -688,13 +662,12 @@ msgstr "Op deze computer"
 #. 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:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -722,7 +695,7 @@ msgid "Create a new contact list"
 msgstr "Maak een nieuwe contactenlijst"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Nieuw adresboek"
 
@@ -741,75 +714,74 @@ msgid "Failed upgrading Address Book settings or folders."
 msgstr "Het opwaarderen van adresboek-instellingen of mappen is mislukt."
 
 # ?
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Basis"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "De inhoud van het adresboek lokaal kopiëren voor offline gebruik"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Algemeen"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Server-informatie"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Aanmeldingscontrole"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
 # zoekende/bezig met zoeken/zoeken...
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Zoeken"
 
 # bezig met downloaden/downloaden...
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Downloaden"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Adresboek eigenschappen"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Bezig met overzetten..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' wordt overgezet:"
@@ -884,35 +856,35 @@ msgstr "Mapnaam mag geen '/' bevatten"
 msgid "A Folder with this name already exists"
 msgstr "Een map met deze naam bestaat al"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Nieuw adresboek"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Opslaan als VCard.."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Contactenbron-selectie"
 
@@ -921,12 +893,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Anonieme verbinding met LDAP server wordt opgezet"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Fout bij het aanmelden.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Voer het wachtwoord in voor %s (gebruiker %s)"
@@ -972,7 +944,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI voor de laatst gebruikte map in het dialoog: namen selecteren."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Positie van verticale paneel"
 
@@ -1001,7 +973,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Aanmeldingscontrole</b>"
 
@@ -1052,10 +1024,8 @@ msgid "Email address"
 msgstr "E-mail adres"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution zal dit e-mailadres gebruiken om u te identificeren bij de server"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution zal dit e-mailadres gebruiken om u te identificeren bij de server"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1253,9 +1223,9 @@ msgstr "_Aanmeldmethode:"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Naam:"
 
@@ -1268,7 +1238,7 @@ msgid "_Search scope:"
 msgstr "_Zoek gebied:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1288,254 +1258,274 @@ msgstr "kaarten"
 #: ../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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "minuten"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-mail</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Thuis</b>"
 
 # was eerst: berichten versturen
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Instant Messaging</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Taak</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Overig</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Anders</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefoon</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Web adres</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Werk</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../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-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Contact"
 
-#: ../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/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Contacten bewerken"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Volledige _naam..."
 
 # plaatje/foto/afbeelding
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Foto"
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 # e-mail adres
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Postadres"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Bijnaam:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Persoonlijke informatie"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefoon"
 
 #. 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/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/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Werk"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "Ver_jaardag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "A_ssistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Geboortedatum:"
 
-#: ../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:1707
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Agenda:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "Categorieë_n..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Categorieën"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Plaats:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Bedrijf:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "A_fdeling:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Opslaan onder:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "V_rij/Bezet:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Webstek:"
 
 # beheerder
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Manager:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "Aa_ntekeningen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Kantoor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Postbus:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Beroep:"
 
 # echtgenoot
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "Pa_rtner:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Staat/Provincie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Video-chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Bij voorkeur _HTML-berichten"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Weblog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Waar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "Post_code:"
 
 #: ../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/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 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:303
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../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:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Bewerkbaar"
 
@@ -2511,7 +2501,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Naam"
@@ -2522,7 +2512,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2530,105 +2520,93 @@ msgstr "Jabber"
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-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:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-# Dienst/Service
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
-msgstr "Service"
+msgstr "Dienst"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Locatie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "Thuis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "Overige"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../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:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Bron boek"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Doel boek"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Is nieuw contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Beschrijfbare velden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Vereiste velden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Gewijzigd"
 
-#: ../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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contacten-editor - %s"
 
 # foto is beter
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Selecteer een afbeelding voor dit contact"
 
 # foto is beter
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
-msgid "_No image"
-msgstr "_Geen afbeelding"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "Geen afbeelding"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2636,31 +2614,31 @@ msgstr ""
 "De contact-data is ongeldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' heeft een ongeldige opmaak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' heeft een ongeldige opmaak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is leeg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Ongeldig contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Contact snel toevoegen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "Volledig be_werken"
 
@@ -2668,11 +2646,11 @@ msgstr "Volledig be_werken"
 msgid "_Full name"
 msgstr "_Volledige naam"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "E-_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Adresboek selecteren"
 
@@ -2680,9 +2658,9 @@ msgstr "_Adresboek selecteren"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
-"Weet u zeker dat u de\n"
+"Weet u zeker dat u\n"
 "contactenlijst (%s) wilt verwijderen?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
@@ -2697,9 +2675,9 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
-"Weet u zeker dat u het\n"
+"Weet u zeker dat u \n"
 "contact (%s) wilt verwijderen?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
@@ -2710,105 +2688,104 @@ msgstr ""
 "Weet u zeker dat u deze\n"
 "contacten wilt verwijderen?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Plaats:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Volledig adres"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Dhr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Mjfr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Dhr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Mevr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Mevr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Dhr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Voornaam:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Achternaam:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Tweede Naa_m:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "IM account toevoegen"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Accountnaam:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_IM-dienst:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2819,62 +2796,62 @@ msgstr "_Locatie:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Voeg een email toe aan de lijst"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Contactenlijst bewerken"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "E-mailadressen vanuit het adresboek invoegen"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Leden"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Verwijder een emailadres uit de lijst"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Verberg de adressen bij het sturen van post naar deze lijst"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Lijstnaam:"
 
 # selecteer
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "_Selecteren"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../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 "_Tik een e-mailadres in of sleep een contact in de onderstaande lijst:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Boek"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Is nieuwe lijst"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Leden"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Leden contactenlijst"
 
@@ -2915,18 +2892,25 @@ msgstr ""
 "De naam of het e-mailadres van dit contact bestaat reeds\n"
 "in deze map. Wilt u het toch toevoegen?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Categorie is"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-mail begint met"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Naam begint met"
@@ -2944,9 +2928,9 @@ msgstr[1] "%d contacten"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Zoekopdracht"
 
@@ -2960,7 +2944,7 @@ msgstr "Fout bij weergave boekvorm"
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Model"
 
@@ -2968,105 +2952,105 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Fout bij aanpassen van kaart"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Bron"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Opslaan als VCard.."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Openen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Nieuw contact..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Nieuwe _contactenlijst..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "Op_slaan als VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "Contact _doorsturen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "Contacten _doorsturen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Stuur _bericht aan contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Stuur _bericht naar lijst"
 
 # naar/aan
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Stuur _bericht aan contacten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "Af_drukken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Kopiëren naar adresboek..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "_Verplaatsen naar adresboek..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "K_nippen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "_Plakken"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Elke categorie"
 
@@ -3076,7 +3060,6 @@ msgid "Print cards"
 msgstr "Kaarten afdrukken"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -3105,7 +3088,7 @@ msgid "Car Phone"
 msgstr "Autotelefoon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3117,7 +3100,7 @@ msgid "Company Phone"
 msgstr "Bedrijfstelefoon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-mail"
@@ -3164,23 +3147,21 @@ msgstr "Journaal"
 
 # beheerder
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "Manager"
 
 # mobieltje? mobiele? pocket?
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiele telefoon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "Bijnaam"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Opmerkingen"
 
@@ -3189,7 +3170,7 @@ msgid "Office"
 msgstr "Kantoor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -3222,7 +3203,6 @@ msgid "Role"
 msgstr "Rol"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "Echtgeno(o)t(e)"
 
@@ -3254,7 +3234,7 @@ msgid "Web Site"
 msgstr "Website"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3265,12 +3245,12 @@ msgstr "Website"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Breedte"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3280,12 +3260,12 @@ msgstr "Breedte"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Hoogte"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "Heeft focus"
 
@@ -3309,7 +3289,7 @@ msgstr "Maximale veldnaam lengte"
 msgid "Column Width"
 msgstr "Kolombreedte"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3323,7 +3303,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:175
 msgid ""
 "\n"
 "\n"
@@ -3337,7 +3317,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:180
 msgid ""
 "\n"
 "\n"
@@ -3347,7 +3327,7 @@ msgstr ""
 "\n"
 "Zoeken naar het contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3357,147 +3337,80 @@ 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:499
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "E-mail werk"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "E-mail thuis"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "E-mail overig"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "Geselecteerd"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "Heeft cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Verwijzing in browser _openen"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "Verwijzing _kopiëren"
-
-# verzenden naar/versturen/sturen...
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "_Nieuw bericht sturen aan..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "E-mail_adres kopiëren"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(kaart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "kaart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Lijstleden"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-mail"
 
-# departement/afdeling
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Department"
-msgstr "Afdeling"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-msgid "Profession"
-msgstr "Beroep"
-
-# Functie/positie/rang
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Positie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-msgid "Video Chat"
-msgstr "Video-chat"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Agenda"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "Vrij/Bezet"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Video conferentie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "fax"
 
-# Webstek/Home page/Website
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Home Page"
-msgstr "Homepage"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "werk"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Web Log"
-msgstr "Weblog"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "Geboortedatum"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "Verjaardag"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "persoonlijk"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Functie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3529,7 +3442,7 @@ msgstr "Geen Zelf-contact gedefinieerd"
 #. 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
@@ -3555,7 +3468,7 @@ msgstr "Protocol niet ondersteund"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Geannuleerd"
 
@@ -3687,7 +3600,7 @@ msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Fout bij toevoegen kaart"
 
@@ -3704,12 +3617,12 @@ msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Fout bij verwijderen kaart"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:292
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -3718,16 +3631,12 @@ msgid_plural ""
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
 "%d contact weergeven zal %d nieuw venster openen.\n"
-"Wilt u dit contact werkelijk weergeven?%d contacten weergeven zal %d nieuwe "
-"vensters openen.\n"
-"Wilt u deze contacten werkelijk weergeven?"
+"Wilt u dit contact werkelijk weergeven?"
 msgstr[1] ""
-"%d contact weergeven zal %d nieuw venster openen.\n"
-"Wilt u dit contact werkelijk weergeven?%d contacten weergeven zal %d nieuwe "
-"vensters openen.\n"
+"%d contacten weergeven zal %d nieuwe vensters openen.\n"
 "Wilt u deze contacten werkelijk weergeven?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3736,70 +3645,70 @@ msgstr ""
 "%s bestaat reeds.\n"
 "Wilt u het overschrijven?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contact"
 msgstr[1] "contacten"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Adresboek selecteren"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lijst"
 
 # kaart verplaatsen naar
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Verplaats kaart naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Kopieer kaart naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Verplaats kaarten naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Kopieer kaarten naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Contactinformatie"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contactinformatie voor %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Adresboek wordt benaderd..."
 
@@ -3891,12 +3800,12 @@ msgstr "Evolution VCard import assistent"
 msgid "Print envelope"
 msgstr "Envelop afdrukken"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Druk contacten af"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Druk kaart af"
 
@@ -3945,7 +3854,7 @@ msgstr "Formaat"
 #: ../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-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Kop"
@@ -4049,7 +3958,7 @@ msgstr "Schaduw"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4142,8 +4051,7 @@ msgid "Export in asynchronous mode"
 msgstr "Exporteren in asynchrone modus"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "Het aantal kaarten in een uitvoerbestand in asynchrone modus, standaard "
 "aantal is 100."
@@ -4153,8 +4061,7 @@ msgid "NUMBER"
 msgstr "NUMMER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Fout in argument op opdrachtregel, gebruik --help voor uitleg."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -4214,8 +4121,7 @@ msgstr ""
 "worden hersteld."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Alle informatie in dit journaal zal verwijderd worden en kan niet hersteld "
 "worden."
@@ -4235,8 +4141,7 @@ msgstr ""
 "worden."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Alle informatie over deze afspraak zullen worden verwijderd en kunnen niet "
 "hersteld worden."
@@ -4250,8 +4155,7 @@ msgstr ""
 "kunnen worden hersteld."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Alle informatie over deze bijeenkomst zal verwijderd worden en kan niet "
 "hersteld worden."
@@ -4291,17 +4195,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Weet u zeker dat u deze afspraak wilt verwijderen?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Weet u zeker dat u deze dagboekaantekening wilt verwijderen?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Weet u zeker dat u deze bijeenkomst wilt verwijderen?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Weet u zeker dat u deze taak wilt verwijderen?"
 
@@ -4315,7 +4216,7 @@ msgstr "Weet u zeker dat u de taak zonder onderwerp wilt versturen?"
 
 #: ../calendar/calendar.error.xml.h:23
 msgid "Cannot create a new event"
-msgstr "Kan geen nieuwe agendanotitie aanmaken"
+msgstr "Kan geen nieuwe gebeurtenis aanmaken"
 
 #: ../calendar/calendar.error.xml.h:24
 msgid "Delete calendar '{0}'?"
@@ -4356,8 +4257,7 @@ msgstr ""
 "kunnen deze ook accepteren."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-mailuitnodigingen worden naar alle deelnemers verzonden zodat ze antwoord "
 "kunnen geven."
@@ -4440,17 +4340,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "De Evolution-agenda is onverwacht afgesloten."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "De Evolution-memo is onverwacht afgesloten."
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "De Evolution taken zijn ploseling afgebroken."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "De agenda is niet aangemerkt voor offline gebruik."
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "De agenda die u heeft geselecteerd is voor alleen-lezen"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "De memo's-lijst is niet aangemerkt voor offline gebruik"
@@ -4501,8 +4401,7 @@ msgstr "Wilt u deze taak versturen naar de deelnemers.?"
 
 #: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
-"Wilt u alle deelnemers de vernieuwde informatie over de bijeenkomst sturen?"
+msgstr "Wilt u alle deelnemers de vernieuwde informatie over de bijeenkomst sturen?"
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
@@ -4520,64 +4419,52 @@ msgstr ""
 "ondersteunde versie."
 
 #: ../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
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "U heeft deze afspraak gewijzigd maar nog niet opgeslagen."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr "U heeft deze taak gewijzigd maar nog niet opgeslagen."
 
 # Engels bug. (zie bug 325831)
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "U heeft deze memo gewijzigd maar nog niet opgeslagen."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Uw agenda's zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
-
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "Uw memo's zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
+msgstr "Uw agenda's zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Uw taken zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
+msgstr "Uw taken zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "Wijzigingen verwerpen"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "Op_slaan"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "Wijzigingen op_slaan"
 
 # in outlook wordt de 'e' als sneltoets gebruikt
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "V_erzenden"
 
 # bericht versturen/zenden
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "_Melding versturen"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
@@ -4595,8 +4482,8 @@ msgstr "Meerdaagse agendanotities splitsen:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Kon evolution-data-server niet starten"
 
@@ -4630,12 +4517,12 @@ 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:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Agenda en taken"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Agenda's"
 
@@ -4677,21 +4564,21 @@ msgid "Memo_s"
 msgstr "_Memo'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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Memo's"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Taken"
@@ -4709,16 +4596,16 @@ msgstr "_Taken"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution agenda alarmeringsdienst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4728,7 +4615,7 @@ msgstr[0] "uur"
 msgstr[1] "uren"
 
 # uur is beter: 5 uur en 10 minuten
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Begintijd"
 
@@ -4739,10 +4626,10 @@ msgstr "Afspraken"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Locatie:"
 
@@ -4752,16 +4639,16 @@ msgstr "Sluimer_tijd:"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "Be_werken"
 
@@ -4773,32 +4660,33 @@ msgstr "_Sluimeren"
 msgid "location of appointment"
 msgstr "locatie van de afspraak"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Geen omschrijving beschikbaar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Geen locatieinformatie beschikbaar."
 
 # wekkers/alarmen/alarmeringen
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "U heeft %d alarmeringen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4810,7 +4698,7 @@ msgstr ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4827,7 +4715,7 @@ 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:1388
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
@@ -4898,10 +4786,8 @@ msgid "Calendars to run alarms for"
 msgstr "Agenda's met alarmeringen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Kleur van de lijn van Marcus Bains in de tijdbalk (leeg voor standaard)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Kleur van de lijn van Marcus Bains in de tijdbalk (leeg voor standaard)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -4917,8 +4803,7 @@ msgstr "Bevestigen bij het leegmaken"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
-"Dagen waarop de begin- en eindtijden van werkuren zichbaar moeten zijn."
+msgstr "Dagen waarop de begin- en eindtijden van werkuren zichbaar moeten zijn."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
@@ -4934,106 +4819,92 @@ msgid "Default reminder value"
 msgstr "Standaard herinneringswaarde"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Agendanotitie-kleurverloop"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Agendanotitie-doorschijnendheid"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Vrij/bezet server-URLs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Vrij/bezet sjabloon-URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Gradiënt van de notities in agendaweergaven."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Voltooide taken verbergen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Taakeenheden verbergen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Taakwaarde verbergen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Horizontale paneelpositie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Het uur waarop de werkdag eindigt, in 24-uurs formaat, 0 tot 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Het uur waarop de werkdag begint, in 24-uurs formaat, 0 tot 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Tijdverdeling die getoont worden in dag- en werkweekweergave, in minuten."
+msgstr "Tijdverdeling die getoont worden in dag- en werkweekweergave, in minuten."
 
 # wekkertijd/alarmtijd
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Laatste alarmeringstijd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lijst met server-URLs voor vrij/bezet publicatie."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Lijn van Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Kleur van lijn van Marcus Bains - Dagweergave"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Kleur van lijn van Marcus Bains - Tijdbalk"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuut waarop de werkdag eindigt, 0 tot 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuut waarop de werkdag begint, 0 tot 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Maandweergave, horizontale paneelpositie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Maandweergave, verticale paneelpositie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Aantal eenheden voor het bepalen van een standaard herinnering."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
-msgstr ""
-"Aantal eenheden voor het bepalen wanneer taken verborgen moeten worden."
+msgstr "Aantal eenheden voor het bepalen wanneer taken verborgen moeten worden."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Kleur van verlopen taken"
 
 # wat een rotzin!
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5044,7 +4915,7 @@ msgstr ""
 # engels: zin klopt niet:
 # Position of the horizontal pane, between the view and the date navigator
 # calendar and task list in the month view, in pixels.
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5052,16 +4923,7 @@ msgstr ""
 "Positie van het horizontale paneel, tussen het weergavegedeelte en de "
 "datumkiezer-agenda en de takenlijst, bij maandweergave, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-#, fuzzy
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Positie van het verticale paneel, tussen de kaart- en lijstweergave en het "
-"voorbeeldpaneel, in pixels."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5069,7 +4931,7 @@ msgstr ""
 "Positie van het verticale paneel, tussen takenlijst en de taken-"
 "voorbeelpaneel, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5077,7 +4939,7 @@ msgstr ""
 "Positie van het verticale paneel, tussen het weergavegedeelte en de "
 "datumkiezer-agenda en takenlijst, bij maandweergave, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5087,68 +4949,68 @@ msgstr ""
 "pixels."
 
 # Programma's die kunnen fungeren als deel van een alarm
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programma's die door alarmeringen mogen worden uitgevoerd."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Het RSVP-veld tonen in de agendanotitie/taak/bijeenkomst-editor"
+msgstr "Het RSVP-veld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "Het rol-veld tonen in de agendanotitie/taak/bijeenkomst-editor"
+msgstr "Het rol-veld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Eindtijden van afspraken tonen in week- en maandweergave"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "Het categorieën-veld tonen in de agendanotitie/taak/bijeenkomst-editor"
+msgstr "Het categorieën-veld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Alarmeringen tonen in het mededelingengebied"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Het statusveld tonen in de agendanotitie/taak/bijeenkomst-editor"
+msgstr "Het statusveld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
 # FIXME: dit moet duidelijker
 # weergavepaneel/voorbeeldpaneel
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Toon het voorbeeld paneel"
 
 # BUG, betere vertaling
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Het voorbeeldweergavepaneel tonen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Het tijdzoneveld tonen in de agendanotitie/bijeenkomst-editor"
+msgstr "Het tijdzoneveld tonen in de gebeurtenis/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Het type-veld tonen in de agendanotitie/taak/bijeenkomst-editor"
+msgstr "Het type-veld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "De weeknummers tonen in datumkiezer"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Kleur van taken die vandaag verlopen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Taken verticale paneelpositie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5158,7 +5020,7 @@ msgstr ""
 "vervangen door het gebruikersnaam-deel van het mailadres en %d wordt "
 "vervangen door het domein."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5167,64 +5029,53 @@ msgstr ""
 "onvertaalde Olsen tijdzone databaselocatie zoals \"Europe/Amsterdam\"."
 
 # tijdverdeling
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Tijdonderverdeling"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tijd wanneer de laatste alarmering is afgegaan, in time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr "Doorschijnendheid van de notities in de agendaweergaven (Een waarde tussen 0 en 10, standaard niet doorzichtig)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24-uurs tijdsformaat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Eenheid voor een standaard-herinnering, \"minuten\", \"uren\" of \"dagen\"."
+msgstr "Eenheid voor een standaard-herinnering, \"minuten\", \"uren\" of \"dagen\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Eenheid wanneer taken worden verborgen, \"minuten\", \"uren\" of \"dagen\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Eenheid wanneer taken worden verborgen, \"minuten\", \"uren\" of \"dagen\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Week begint"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Weekdag waarmee de week begint, van zondag (0) tot zaterdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr ""
-"Of het mededelingengebied wordt gebruikt voor het weergeven van alarmeringen."
+msgstr "Of het mededelingengebied wordt gebruikt voor het weergeven van alarmeringen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr ""
-"Of om bevestiging wordt gevraagd bij het wissen van eem afspraak of taak."
+msgstr "Of om bevestiging wordt gevraagd bij het wissen van eem afspraak of taak."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Of om bevestiging wordt gevraagd bij het definitief verwijderen van "
 "afspraken en taken."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5232,88 +5083,78 @@ msgstr ""
 "Of weekenden in de maandweergave worden gecomprimeerd waardoor zaterdag en "
 "zondag de ruimte krijgen van één weekdag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"If de eindtijden van afspraken worden getoond in week- en maandweergave."
+msgstr "If de eindtijden van afspraken worden getoond in week- en maandweergave."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Of de lijn van Marcus Bains (lijn op de huidige tijd) wordt getoond in de "
 "agenda."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Of voltooide taken verborgen worden in in de takenweergave."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Of een standaard herinnering ingesteld wordt bij afspraken."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Of het RSVP-veld getoond wordt in de agendanotitie/taken/bijeenkomsten-editor"
+msgstr "Of het RSVP-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Of het categorieën-veld getoond wordt in de agendanotitie/taken/bijeenkomsten-editor"
+msgstr ""
+"Of het categorieën-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-"
+"editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Of het rol-veld getoond wordt in de agendanotitie/taken/bijeenkomsten-editor"
+msgstr "Of het rol-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Of het status-veld getoond wordt in de agendanotitie/taken/bijeenkomsten-editor"
+msgstr "Of het status-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Of de tijd in een 24-uursformaat getoond wordt in plaats van als am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Of de tijd in een 24-uursformaat getoond wordt in plaats van als am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Of het tijdzone-veld getoond wordt in de agendanotitie/bijeenkomsten-editor"
+msgstr "Of het tijdzone-veld getoond wordt in de gebeurtenis/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Of het type-veld getoond wordt in de agendanotitie/taken/bijeenkomsten-editor"
+msgstr "Of het type-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Of weeknummers getoond worden in de datumkiezer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "Werkdagen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Werkdag laatste uur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Werkdag laatste minuut"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Werdag eerste uur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Werkdag eerste minuut"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr ""
-
 # onderwerp/samevatting
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
@@ -5323,25 +5164,39 @@ msgstr "Samenvatting bevat"
 msgid "Description contains"
 msgstr "Omschrijving bevat"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Locatie bevat"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Niet passend"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Afdrukken"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Agenda"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5357,10 +5212,10 @@ msgstr "Verwijderen van items ouder dan"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "dagen"
 
@@ -5368,93 +5223,91 @@ msgstr "dagen"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Op het web"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "Verjaardagen & gedenkdagen"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Weer"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "_Nieuwe agenda"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "Bijwerken van agenda's mislukt."
 
 # maken ipv aanmaken hier beter
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-"Kan de agenda '%s' niet openen voor het maken van notities en bijeenkomsten"
+msgstr "Kan de agenda '%s' niet openen voor het maken van notities en bijeenkomsten"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
-msgstr ""
-"Er is geen agenda beschikbaar voor het maken van notities en bijeenkomsten"
+msgstr "Er is geen agenda beschikbaar voor het maken van notities en bijeenkomsten"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Agendabron-selectie"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Nieuwe bijeenkomst"
 
 # Combinatietoets is Shift+Ctrl+E
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "Bij_eenkomst"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Nieuwe dag-omvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "_Dag-omvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dagomvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Nieuwe agenda"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "A_genda"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe agenda aan"
 
@@ -5486,11 +5339,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:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "Alarmering bewerken"
 
@@ -5608,26 +5461,54 @@ msgid "A_dd"
 msgstr "_Toevoegen"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmeringen"
 
-#: ../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
-#, fuzzy
-msgid "_Suggest automatic display of attachment"
+#: ../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 "Probeer bijlage automatisch weer te geven"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Bestand(en) bijvoegen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../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 "Bijlage-eigenschappen"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Omschrijving:"
+
+#: ../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 "Bestandsnaam:"
+
+#: ../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-type:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Geselecteerde agenda's voor alarmeringen"
 
@@ -5647,14 +5528,13 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u en %d zullen worden vervangen door gebruiker en domein van het email-"
 "adres.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Waarschuwingen</span>"
 
@@ -5663,7 +5543,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Standaard vrij/bezet-server</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Algemeen</span>"
@@ -5680,25 +5560,27 @@ msgstr "<span weight=\"bold\">Tijd</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Werkweek</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Dag _eindigt:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Weergave"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:587
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Vrij/Bezet"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5708,13 +5590,13 @@ msgstr ""
 "Uren\n"
 "Dagen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Maandag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5732,232 +5614,221 @@ msgstr ""
 "Zaterdag\n"
 "Zondag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_Zon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Selecteer de agenda's die gealarmeerd moeten worden"
 
 # standaard wordt dit aangevuld tot:
 # Herinnering geven [15] [minuten] voor het begin van elke afspraak
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "Herinnering geven"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Week_nummers tonen in datum navigator"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Zondag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "T_aken die vandaag verlopen:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "_Don"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Sjabloon:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Tijd_zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Tijdsformaat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Woensdag"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "W_eek begint:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Werkdagen:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12-uurs (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24-uurs"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Bevestiging vragen bij het wissen van items"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "Weekeinden comprimeren in maand weergave"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Dag begint:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_Vrij"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "Verberg voltooide _taken na"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Maa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "Verl_open taken:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "_Zat"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Eindtijden van afspraken tonen in week- en maandweergave"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "Tijd_onderverdeling:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_Din"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Woe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "voor het begin van elke afspraak"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-#, fuzzy
-msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr "De inhoud van de agenda lokaal kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-#, fuzzy
-msgid "Cop_y task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr "De inhoud van de takenlijst lokaal kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-#, fuzzy
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr "De inhoud van het memo's-lijst lokaal kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Kleur:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#, fuzzy
-msgid "Task List"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
 msgstr "Takenlijst"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#, fuzzy
-msgid "Memo List"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
 msgstr "Memo's-lijst"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Agenda-eigenschappen"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Nieuwe agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Takenlijst-eigenschappen"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Nieuwe memo's-lijst"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Agenda toevoegen"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Takenlijst toevoegen"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Agenda toevoegen"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Takenlijst toevoegen"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "_Verversen:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -6003,8 +5874,7 @@ msgstr "Deze dagboekaantekening is gewijzigd."
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  U heeft iets gewijzigd. Deze wijzigingen weggooien en de editor sluiten?"
+msgstr "%s  U heeft iets gewijzigd. Deze wijzigingen weggooien en de editor sluiten?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
@@ -6016,50 +5886,50 @@ msgstr "%s U heeft niet veranderd, de editor verversen?"
 msgid "Validation error: %s"
 msgstr "Verificatiefout: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " tot "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Voltooid"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Voltooid"
 
 # verloopdatum?
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Verloopt "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Verloopdatum "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Bijgevoegd bericht - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Bijgevoegd bericht"
 msgstr[1] "%d bijgevoegde berichten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Verplaatsen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "_Slepen annuleren"
 
@@ -6067,7 +5937,7 @@ msgstr "_Slepen annuleren"
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6080,101 +5950,102 @@ msgid "Hide Attachment _Bar"
 msgstr "Bijlagenbal_k verbergen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Bijlagenbal_k tonen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Eigenschappen"
 
 # bijlage toevoegen/bestand bijvoegen
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Bijlage toevoegen..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Bijlagen tonen"
 
 # te tonen/verbergen | aan/uit te zetten
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Druk op de spatiebalk om de bijlagenbalk te tonen|verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Afspraak bewerken"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Bijeenkomst - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Toegewezen taak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekaantekening - %s"
 
 # samenvatting/onderwerp
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "bijlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "De gemaakte veranderingen aan dit item worden verworpen indien een "
 "bijwerking via e-mail arriveerd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Kan huidige niet gebruiken!"
 
@@ -6190,11 +6061,6 @@ msgstr "Kan doel niet openen"
 msgid "Destination is read only"
 msgstr "Doel is alleen lezen"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-"Dit item _verwijderen uit de postvakken van alle andere geadresseerden?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "De agendanotitie kon niet verwijderd worden door een CORBA-fout."
@@ -6213,8 +6079,7 @@ msgstr "Dit item kon niet verwijderd worden door een CORBA-probleem"
 
 #: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
-msgstr ""
-"De agendanotitie kon niet verwijderd worden omdat u geen recht hiertoe heeft"
+msgstr "De agendanotitie kon niet verwijderd worden omdat u geen recht hiertoe heeft"
 
 # u geen recht hiertoe heeft
 #: ../calendar/gui/dialogs/delete-error.c:73
@@ -6260,131 +6125,142 @@ msgstr "Overdragen aan:"
 msgid "Enter Delegate"
 msgstr "Gemachtigde invoeren"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:560
 msgid "Appoint_ment"
 msgstr "_Afspraak"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:564
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Herhaling"
 
 # wekkers/alarmen
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
-msgstr "Deze agendanotitie heeft alarmeringen"
+msgstr "Deze gebeurtenis heeft alarmeringen"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "_Agenda:"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "_Organisator:"
 
 # delegatee: One to whom something is delegated.
 # Meervoud: gedelegeerden (zelfde als delegates)
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Gedelegeerden"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Aan_wezigen"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Agendanotitie zonder begindatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Agendanotitie zonder einddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Begindatum is ongeldig"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Einddatum is fout"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Begintijd is ongeldig"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Eindtijd is fout"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "De geselecteerde organisator heeft geen account meer."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Er is minstens één aanwezige nodig."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Toevoegen"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan de agenda '%s' niet openen."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, 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:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, 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:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 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:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Aanpassen"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "Geen"
 
@@ -6401,8 +6277,8 @@ msgid "15 minutes before appointment"
 msgstr "15 minuten voor de afspraak"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-#, fuzzy
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
 msgstr "Aan_wezigen..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
@@ -6411,26 +6287,30 @@ msgid "Ca_tegories..."
 msgstr "Categorieë_n..."
 
 # aangepast alarmeringsgeluid?
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Aangepaste alarmering:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_Omschrijving:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Agendanotitie omschrijving"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Locatie: "
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Samenvatting:"
 
 # de a wordt gebruikt voor _annuleren, de m bij omschrijving
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "Ala_rm"
 
@@ -6452,6 +6332,15 @@ msgstr "voor"
 msgid "until"
 msgstr "tot"
 
+# delegatee: One to whom something is delegated.
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "_Gedelegeerden"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Van:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6499,7 +6388,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -6520,115 +6409,98 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
 # meervoud beter?
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan memo's in '%s' niet openen."
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "Aan"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "Be_gindatum:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#, fuzzy
-msgid "Su_mmary"
-msgstr "_Samenvatting:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#, fuzzy
-msgid "T_o:"
-msgstr "Bovenzijde:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Groep:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "_Memo-inhoud:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Agenda-opties</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Nieuwe agenda toevoegen"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Agendagroep"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Agendalocatie"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Agendanaam"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Takenlijst-opties</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Nieuwe takenlijst toevoegen"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Takenlijst-groep"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Takenlijst-naam"
 
 # Er wordt hier 'welke' bedoeld en niet wat.
-# (Verderop staan de mogelijkheden:
+# Verderop staan de mogelijkheden:
 # 'Only this instance, all instances etc.
 # gebeurtenis/agendanotitie
 # een .. die herhaaldelijk voorkomt
 # die zich herhaalt
-# terugkerende ...)
+# terugkerende ..
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "U bent een zich herhalende agendanotitie aan het aanpassen. Welke wilt u aanpassen?"
+msgstr ""
+"U bent een zich herhalende gebeurtenis aan het aanpassen. Welke wilt u "
+"aanpassen?"
 
 # Er wordt hier welke bedoeld ipv wat
 # overdragen/delegeren
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "U bent een zich herhalende agendanotitie aan het delegeren. Welke wilt u delegeren?"
+msgstr ""
+"U bent een zich herhalende gebeurtenis aan het delegeren. Welke wilt u "
+"delegeren?"
 
 # Er wordt hier welke bedoeld ipv wat
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr ""
-"U bent een zich herhalende taak aan het aanpassen. Welke wilt u aanpassen?"
+msgstr "U bent een zich herhalende taak aan het aanpassen. Welke wilt u aanpassen?"
 
 # Er wordt hier welke bedoeld ipv wat
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "U bent een zich herhalende dagboekaantekening aan het aanpassen. Welke wilt u aanpassen?"
+msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgstr ""
+"U bent een zich herhalende dagboekaantekening aan het aanpassen. Welke wilt "
+"u aanpassen?"
 
 # alleen deze keer/instantie/(weglaten)
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -6637,16 +6509,15 @@ 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:94
 msgid "This and Prior Instances"
-msgstr "Deze, en alle vorige"
+msgstr "Deze, en die in het verleden"
 
-# deze en die in de toekoms/deze en de komende keren/
-# deze en alle komende
+# deze en die in de toekomst
+# deze en de komende keren
 #: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
-msgstr "Deze, en alle komende"
+msgstr "Deze, en die in de toekomst"
 
 # alle instanties/allen/alle keren
 #: ../calendar/gui/dialogs/recur-comp.c:105
@@ -6764,7 +6635,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Uitzonderingen</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>Voorbeeld</b>"
 
@@ -6833,15 +6704,15 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Voltooid"
 
 #: ../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-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Hoog"
 
@@ -6850,20 +6721,20 @@ msgstr "Hoog"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "In behandeling"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Laag"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normaal"
 
@@ -6871,7 +6742,7 @@ msgstr "Normaal"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Niet gestart"
 
@@ -6884,7 +6755,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
@@ -6893,7 +6764,7 @@ msgid "_Date completed:"
 msgstr "Voltooiings _datum:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
@@ -6902,13 +6773,13 @@ msgid "_Web Page:"
 msgstr "_Webstek:"
 
 # taken/taak
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Taak"
 
 # takendetails/taakdetails
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Taakdetails"
 
@@ -6921,10 +6792,6 @@ msgstr "Voltooiingsdatum is onjuist"
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan taken in '%s' niet openen."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "Aan_wezigen..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Categorieë_n..."
@@ -6933,6 +6800,10 @@ msgstr "Categorieë_n..."
 msgid "Or_ganiser:"
 msgstr "_Organisator:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "Be_gindatum:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Tijdzone:"
@@ -6941,49 +6812,49 @@ msgstr "Tijdzone:"
 msgid "_Due date:"
 msgstr "Verloop_datum:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Vrij/bezet agendas</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Publicatiefrequentie</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>_Publicatielocatie</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Vrij/Bezet publicatie-instellingen"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Dagelijks"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "Hand_matig"
 
 # de W wordt al gebruikt voor _Wekelijks
 # de A voor _Annuleren
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "Wa_chtwoord:"
 
 # _O wordt gebruikt voor _Ok
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "Wachtwoord o_nthouden"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_Gebruikersnaam:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Wekelijks"
 
@@ -7064,43 +6935,36 @@ msgid "%s for an unknown trigger type"
 msgstr "%s voor een onbekend triggertype"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Klik hier om %s te openen"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
-msgid "Untitled"
-msgstr "Naamloos"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "Memo:"
 
-#: ../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
-msgid "Start Date:"
-msgstr "Begindatum:"
-
-#: ../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
-msgid "Description:"
-msgstr "Omschrijving:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Webstek:"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Naamloos"
+
 # samenvatting/onderwerp
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "Begindatum:"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Verloopdatum:"
@@ -7110,7 +6974,7 @@ msgstr "Verloopdatum:"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Status:"
 
@@ -7119,17 +6983,17 @@ msgid "Priority:"
 msgstr "Prioriteit:"
 
 #: ../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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Openbaar"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Privé"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
@@ -7138,25 +7002,24 @@ msgid "End Date"
 msgstr "Einddatum"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 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:5 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Samenvatting"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Vrij"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Bezig"
 
@@ -7170,17 +7033,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nee"
@@ -7191,21 +7054,21 @@ msgstr "Nee"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Toegewezen"
 
@@ -7213,7 +7076,7 @@ msgstr "Toegewezen"
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr ""
 "Selecteer een map waarin de geselecteerde bijlagen in moeten worden "
@@ -7224,9 +7087,9 @@ msgstr ""
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Opslaan als..."
 
@@ -7244,79 +7107,74 @@ msgstr "Geselecteerden op_slaan"
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: ../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:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
-#: ../calendar/gui/e-calendar-table.c: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:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Nieuwe _taak"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Open _website"
 
-#: ../calendar/gui/e-calendar-table.c: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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7324,52 +7182,44 @@ msgstr "Open _website"
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: ../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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: ../calendar/gui/e-calendar-table.c: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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Taak _toewijzen"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Kalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
-msgstr "Markeren als voltooid"
+msgstr "Markeren als Voltooid"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Geselecteerde taken als voltooid markeren"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "Markeren als _onvoltooid"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "Geselecteerde taken als _onvoltooid markeren"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
-msgstr "_Verwijder de geselecteerde taken"
+msgstr "_Verwijder de Geselecteerde Taken"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
@@ -7379,7 +7229,7 @@ msgstr "Klik hier om een taak toe te voegen"
 msgid "% Complete"
 msgstr "% voltooid"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Voltooid"
 
@@ -7404,103 +7254,107 @@ msgstr "Begindatum"
 msgid "Task sort"
 msgstr "Taken sorteren"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Verplaatsen van items"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopiëren van items"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Nieuwe _afspraak..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Nieuwe a_gendanotitie voor de hele dag"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nieuwe _bijeenkomst"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Nieuwe _taak"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Huidige weergave"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "_Selecteer vandaag"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Selecteer dag..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Naar agenda _kopiëren..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Naar agenda _verplaatsen..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Bijeenkomst delegeren..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst plannen..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Doorsturen als iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "_Allen beantwoorden"
 
 # instantie/gebeurtenis
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "_Maak deze instantie verplaatsbaar"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Verwijder deze instantie"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle instanties"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
 
 # hoe laat/tijd/wanneer
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tijd: %s %s"
@@ -7531,7 +7385,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuten delingen"
@@ -7542,22 +7396,20 @@ msgstr "%02i minuten delingen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -7649,12 +7501,10 @@ msgstr "iCalendar fout"
 
 #: ../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:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Een onbekend persoon"
 
@@ -7670,23 +7520,23 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Voorlopig geaccepteerd"
 
 # afgezegd/geweigerd/afgewezen
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Afgewezen"
 
@@ -7701,8 +7551,7 @@ msgstr ""
 
 # met punt op het einde
 #: ../calendar/gui/e-itip-control.c:1226
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "De taak is geannuleerd, echter zij is niet in uw takenlijsten terug te "
 "vinden."
@@ -7905,18 +7754,16 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
+msgstr "Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
 
 #: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
+msgstr "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
 #: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
@@ -7962,36 +7809,49 @@ msgid "Send Latest Information"
 msgstr "Laatste informatie versturen"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--naar--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Agenda-bericht"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Agenda wordt geladen"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Agenda wordt geladen..."
 
 # melding/bericht
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Servermelding:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "einddatum"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "begindatum"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Voorzitters"
@@ -8010,65 +7870,65 @@ msgid "Resources"
 msgstr "Hulpbronnen"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Persoon"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Groep"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Hulpbron"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Kamer"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Voorzitter"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Vereiste deelnemer"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Optionele deelnemer"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Niet-deelnemer"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Heeft actie nodig"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Voorlopig"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Overgedragen"
 
@@ -8078,14 +7938,14 @@ msgid "Attendee                          "
 msgstr "Aanwezige                         "
 
 # bezig/in uitvoer
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "In uitvoer"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -8093,87 +7953,87 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d-%m-%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d-%m-%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Afwezig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Geen informatie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Aan_wezigen..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pties"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Alleen kantooruren t_onen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Uitge_zoomd tonen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Vrij/Bezet _actualiseren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Automatisch uitzoeken"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Alle mensen en hulpbronnen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Alle _mensen en één hulpbron"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Vereiste mensen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Vereiste mensen en één hulpbr_on"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
 # geselecteerde memo's verwijderen/verwijder de ..
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Verwijder de geselecteerde memo's"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klik hier om een memo toe te voegen"
 
@@ -8181,8 +8041,8 @@ msgstr "Klik hier om een memo toe te voegen"
 msgid "Memo sort"
 msgstr "Memo's sorteren"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8200,7 +8060,7 @@ msgstr "Memo's laden"
 msgid "Opening memos at %s"
 msgstr "Bezig met openen memo's op %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd..."
 
@@ -8209,74 +8069,68 @@ msgstr "Geselecteerde objecten worden verwijderd..."
 msgid "Enter the password for %s"
 msgstr "Voer uw wachtwoord in voor %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Taken laden"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Bezig met openen taken op %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Bezig met afronden van taken..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Bezig met schrappen"
 
 # de/een
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Aanvraag actualiseren"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "_Aangepaste weergave"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "Aangepaste weergave op_slaan"
 
 # enkelvoud is mooier (voor het label)
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Weergave definiëren..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Bezig met het laden van afspraken uit %s"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Bezig met het laden van taken uit %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, fuzzy, c-format
-msgid "Loading memos at %s"
-msgstr "Memo's laden"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Bezig met openen van %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Legen"
 
@@ -8390,18 +8244,14 @@ msgstr "iCalendar-informatie"
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "_Nieuwe memo's-lijst"
-
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memo's"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8409,58 +8259,46 @@ msgid_plural ", %d selected"
 msgstr[0] ", %d geselecteerd"
 msgstr[1] ", %d geselecteerd"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "Bijwerken van memo's mislukt."
 
-# afspraken/bijeenkomten
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "Kan de memo's-lijst '%s' niet openen voor het aanmaken van agendanotities en bijeenkomsten"
+msgstr ""
+"Kan de memo's-lijst '%s' niet openen voor het aanmaken van gebeurtenissen en "
+"afspraken"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "Er is geen agenda beschikbaar voor het aanmaken van memo's"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Memo's-bron selectie"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Nieuwe memo"
 
-# meervoud beter?
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
-msgstr "Mem_o's"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr "_Memo"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Maak een nieuwe memo aan"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "Nieuwe gedeelde memo"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "_Gedeelde memo"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "Maak een gedeelde memo aan"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Nieuwe memo's-lijst"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
 msgstr "Memo's-li_jst"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Een nieuwe memo's-lijst toevoegen"
 
@@ -8495,8 +8333,7 @@ msgstr ""
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Het migreren van de oude instellingen van evolution/config.xmldb is mislukt"
+msgstr "Het migreren van de oude instellingen van evolution/config.xmldb is mislukt"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:794
@@ -8510,243 +8347,243 @@ msgstr "Kan de agenda '%s' niet migreren"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan de taken '%s' niet migreren"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1e"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2e"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3e"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4e"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20e"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21e"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22e"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23e"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24ste"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30e"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31e"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Zo"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Wo"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Vr"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Za"
 
 # a=afgekorte weekdag, b=afgekorte maandnaam d=dag vd maand als getal
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Geselecteerde dag (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Geselecteerde week (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Geselecteerde maand (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Geselecteerde jaar (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Taak"
 
 # samenvatting/onderwerp
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Samenvatting: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
 # urgentie/prioriteit
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteit: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent voltooid: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorieën: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Contacten: "
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Item afdrukken"
 
@@ -8768,7 +8605,9 @@ msgstr "Bijwerken van taken mislukt"
 #: ../calendar/gui/tasks-component.c:877
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "Kan de takenlijst '%s' niet openen voor het aanmaken van agendanotities en afspraken"
+msgstr ""
+"Kan de takenlijst '%s' niet openen voor het aanmaken van gebeurtenissen en "
+"afspraken"
 
 #: ../calendar/gui/tasks-component.c:890
 msgid "There is no calendar available for creating tasks"
@@ -8803,14 +8642,14 @@ msgid "New task list"
 msgstr "Nieuwe takenlijst"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
+msgid "Task l_ist"
 msgstr "Ta_kenlijst"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Nieuwe takenlijst toevoegen"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8822,11 +8661,11 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Taken afdrukken"
 
@@ -9403,7 +9242,7 @@ msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
@@ -10422,7 +10261,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Bijlagenbalk"
 
@@ -10430,43 +10269,28 @@ msgstr "Bijlagenbalk"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan bestand %s niet bijvoegen: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan bestand %s niet bijvoegen: geen normaal bestand"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Bijlage-eigenschappen"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Bestandsnaam:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-type:"
-
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Doel van bericht"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Kies een map waar het bericht geplaatst moet worden."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
@@ -10477,45 +10301,45 @@ msgstr "Klik hier voor het adresboek"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "A_ntwoordadres:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Van:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Onderwerp:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Aan:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10528,15 +10352,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Versturen naar:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Klik hier om een map te selecteren waarnaar gepost moet worden"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Versturen naar:"
 
@@ -10544,18 +10368,17 @@ msgstr "Versturen naar:"
 msgid "A_ttach"
 msgstr "_Bijlage toevoegen"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Bijlage invoegen"
 
-#: ../composer/e-msg-composer.c:827
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:828
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan uitgaand bericht niet ondertekenen: Geen ondertekeningscertificaat voor "
 "dit account"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10564,55 +10387,55 @@ msgstr ""
 "ingesteld voor dit account"
 
 # sneltoets moet k zijn
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Bijlagenbal_k verbergen"
 
 # sneltoets moet k zijn
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Bijlagenbal_k tonen"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Onbekende reden"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Kan bestand niet openen"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Naamloos Bericht"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Bestand openen"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automatisch gegenereerd"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "_Handtekening:"
 
 # een nieuw bericht opstellen/stel een nieuw bericht op
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Stel een nieuw bericht op"
 
 # # Het origineel heeft <b> in plaats van </b>
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10644,8 +10467,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"Vanwege &quot;{0}&quot; zult u mogelijk andere mail-opties moeten kiezen."
+msgstr "Vanwege &quot;{0}&quot; zult u mogelijk andere mail-opties moeten kiezen."
 
 # vanwege
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
@@ -10776,7 +10598,7 @@ msgstr "Bericht op_slaan"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10798,7 +10620,6 @@ msgid "calendar information"
 msgstr "agenda-informatie"
 
 #: ../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"
@@ -10809,17 +10630,14 @@ msgstr ""
 "Wilt u deze status veranderen naar \"Aanwezig\"?"
 
 #: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Afwezigheidsbericht:</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</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"
@@ -10830,12 +10648,10 @@ msgstr ""
 "die een bericht aan u stuurt wanneer u weg bent.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr "Ik ben op dit moment aanwezig"
 
 #: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Ik ben op dit moment afwezig"
 
@@ -10844,25 +10660,27 @@ msgid "No, Do not Change Status"
 msgstr "Nee, status niet wijzigen"
 
 #: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
 msgstr "Afwezigheidsassistent"
 
 #: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
 msgstr "Ja, status wijzigen"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>E-mail wordt ontvangen</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>E-mail wordt verstuurd:</b>"
 
 # leesbevestiging
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10877,7 +10695,7 @@ msgstr ""
 # het bericht/een bericht
 # altijd een leesbevestiging terugsturen
 # Altijd terugmelden dat het bericht is gelezen
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Altijd terugmelden dat het bericht is gelezen"
 
@@ -10885,32 +10703,32 @@ msgstr "Altijd terugmelden dat het bericht is gelezen"
 # Eerst vragen (aan wie dan?)
 # Toestemming vragen (zelfde probleem)
 # het bericht/een bericht
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Mij vragen of ik wil terugmelden dat het bericht is gelezen"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Nooit terugmelden dat het bericht is gelezen"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Leesbevestigingen"
 
 # leesbevestiging
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Een leesbevestiging vragen voor alle berichten die ik verstuur"
 
 # Engels: not to me personally (moet ws zijn not to an individual person oid)
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "Behalve als het bericht naar een mailinglijst wordt gestuurd en niet naar "
 "mij persoonlijk"
 
 # ontvangstbevestiging/leesbevestiging
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10918,7 +10736,7 @@ msgstr ""
 "Als u een bericht ontvangt met een ongeldige aanvraag voor leestbevestiging, "
 "wat moet Evolution dan doen?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10926,28 +10744,28 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution waarschuwing"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution informatie"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution zoekopdracht"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interne fout, onbekende fout '%s' gevraagd"
@@ -10968,7 +10786,7 @@ msgstr "Wilt u het overschrijven?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Bestand bestaat &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Overschrijven"
 
@@ -11044,24 +10862,24 @@ msgstr "%d/%b/%Y"
 msgid "Select a time to compare against"
 msgstr "Selecteer een tijd om mee te vergelijken"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Belangrijk"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Te doen"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Later"
 
@@ -11111,11 +10929,11 @@ msgid "Include threads"
 msgstr "Discussies bijsluiten"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Inkomend"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Uitgaand"
 
@@ -11139,7 +10957,7 @@ msgstr "Datum ontbreekt."
 msgid "Missing file name."
 msgstr "Bestandsnaam ontbreekt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Naam ontbreekt."
 
@@ -11211,7 +11029,7 @@ msgstr "geleden"
 msgid "months"
 msgstr "maanden"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "seconden"
 
@@ -11244,10 +11062,8 @@ msgid "Composer Preferences"
 msgstr "Berichten opstellen"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
@@ -11283,23 +11099,23 @@ msgstr "Evolution configuratie voor opstellen van nieuw bericht"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-mail voorkeuren"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../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:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "E-mail accounts"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-mailvoorkeuren"
 
@@ -11327,7 +11143,7 @@ msgstr ""
 "aan om deze te accepteren\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Map selecteren"
 
@@ -11335,46 +11151,46 @@ msgstr "Map selecteren"
 msgid "Ask for each message"
 msgstr "Voor elk bericht vragen"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identiteit"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "E-mail ontvangen"
 
-#: ../mail/em-account-editor.c:2014
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "Automatisch controleren op _nieuwe post, iedere"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "E-mail versturen"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Standaardinstellingen"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Beveiliging"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Ontvangstinstellingen"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Controleren op nieuwe e-mail"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Accountbeheer"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
@@ -11397,22 +11213,22 @@ msgstr "[Standaard]"
 # gebruikt/ingeschakeld
 # is tabelkop en geeft vinkjes of een lokatie wel of niet gebruikt wordt
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Accountnaam"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protocol"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Naamloos"
 
@@ -11438,9 +11254,6 @@ msgstr "-------Doorgestuurd bericht-------"
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
-# we gebruiken de volledige dagnaam ipv de afkorting
-# verder voor de duidelijkheid [tijdzone ] bij de tijdzone gezet.
-# (tino)
 #. 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
@@ -11448,7 +11261,9 @@ msgstr "een onbekende afzender"
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
-msgstr "Op ${WeekdayName} ${Day}-${Month}-${Year} om ${24Hour}:${Minute} uur [tijdzone ${TimeZone}], schreef ${Sender}:"
+msgstr ""
+"Op ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} te ${24Hour}:${Minute} "
+"${TimeZone}, schreef ${Sender}:"
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
@@ -11585,16 +11400,16 @@ msgstr "is niet"
 msgid "is not Flagged"
 msgstr "Is niet gemarkeerd"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
-msgstr "Spam"
+msgstr "Troep"
 
 #: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
-msgstr "Spamtest"
+msgstr "Troep test"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
 
@@ -11617,11 +11432,11 @@ msgstr "Berichtkop"
 
 #: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
-msgstr "Bericht is spam"
+msgstr "Bericht is troep"
 
 #: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
-msgstr "Bericht is geen spam"
+msgstr "Bericht is geen troep"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
@@ -11639,7 +11454,7 @@ msgstr "Geluid afspelen"
 msgid "Read"
 msgstr "Gelezen"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Geadresseerden"
 
@@ -11667,11 +11482,11 @@ msgstr "geeft kleiner dan"
 msgid "Run Program"
 msgstr "Start een programma"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Afzender"
 
@@ -11703,11 +11518,11 @@ msgstr "begint met"
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Onderwerp"
@@ -11721,43 +11536,10 @@ msgstr "Status herstellen"
 msgid "<b>Then</b>"
 msgstr "<b>Dan</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "_Zoekmap maken van zoekopdracht..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Alle berichten"
-
-# _o wordt gebruikt voor V_olgende
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Ongelezen berichten"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Geen label"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Gelezen berichten"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Recente berichten"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Berichten van de laatste 5 dagen"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Berichten met bijlagen"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Berichten zijn geen spam"
-
 #. 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
@@ -11775,7 +11557,7 @@ msgstr[0] "Ongelezen berichten:"
 msgstr[1] "Ongelezen berichten:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Map-eigenschappen"
 
@@ -11794,7 +11576,7 @@ msgid "Folder _name:"
 msgstr "_Naam van de map:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Zoekmappen"
 
@@ -11809,7 +11591,7 @@ msgstr "Klad"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Inbox"
 
@@ -11827,79 +11609,79 @@ msgstr "Verzonden"
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Mailmappen-boom"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "verplaatsen map %s"
 
 # map wordt gekopieerd
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Bezig met kopiëren van map %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Berichten worden verplaatst naar map %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Berichten worden gekopieerd naar map %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan bericht(en) niet neerzetten in hoogste niveau-opslag"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopiëren naar map"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Verplaatsen naar map"
 
 # mappen in %s worden gescannd/doorzocht/gelezen
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappen in \"%s\" worden doorzocht"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "Beel_d"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "In _nieuw venster openen"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Kopiëren..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Verplaatsen..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Nieuwe map..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "He_rnoemen..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Prullenbak legen"
 
@@ -11908,14 +11690,13 @@ msgstr "_Prullenbak legen"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopiëren van `%s' naar `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Map selecteren"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Kopiëren"
 
@@ -11938,171 +11719,159 @@ msgstr "Map aanmaken"
 msgid "Specify where to create the folder:"
 msgstr "Geef aan waar de map moet komen:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Afzender beantwoorden"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "Be_werken als nieuw bericht..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Naar map _verplaatsen..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "Naar map _kopiëren..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Als gelezen mar_keren"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Als o_ngelezen markeren"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Aanmerken als belan_grijk"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "Aanmerken als _onbelangrijk"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
-msgstr "Aanmerken als _spam"
+msgstr "Aanmerken als _troep"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
-msgstr "Aanmerken als _geen-spam"
+msgstr "Aanmerken als _geen-troep"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Aanmerken voor vervolg_actie..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Geen"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Aanmerken als voltooid"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Markering wissen"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Regel aanmaken van bericht"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Zoekmap op _onderwerp"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Zoekmap op afze_nder"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Zoekmap op _geadresseerden"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Zoekmap op mailing_lijst"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filter op onder_werp"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filter op af_zender"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filter op _geadresseerden"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filter op _mailinglijst"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Standaard"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Bericht afdrukken"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Ophalen van bericht mislukt"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "Verwijzing _kopiëren"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "_Zoekmap aanmaken"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "Van dit _adres"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Naar dit adres"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klik hier om mail te versturen naar %s"
 
-#: ../mail/em-folder-view.c:2860
-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:503
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Zoekresultaten: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "Zoeken:"
-
-# betere vertaling?
-#: ../mail/em-format-html-display.c:677
-#, fuzzy
-msgid "M_atch case"
-msgstr "Alles meenemen"
-
 # Niet ondertekend of positief getal?
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Niet getekend"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12110,11 +11879,11 @@ msgstr ""
 "Dit bericht is niet ondertekend, Er kan niet worden aangetoond dat het "
 "authentiek is."
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Geldige handtekening"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12122,11 +11891,11 @@ msgstr ""
 "Dit bericht is geldig en is ondertekend, de afzender van dit bericht is zeer "
 "waarschijnlijk degene die hij claimt te zijn."
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Ongeldige handtekening"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12134,11 +11903,11 @@ msgstr ""
 "De handtekening van dit bericht kan niet worden geverifieerd, het is "
 "onderweg mogelijk gewijzigd."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Geldige handtekening, kan afzender niet verifiëren"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12146,11 +11915,11 @@ msgstr ""
 "Dit bericht is ondertekend met een geldige handtekening maar de afzender van "
 "het bericht kan niet worden geverifieerd."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Niet versleuteld"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12158,11 +11927,11 @@ msgstr ""
 "Dit bericht is niet versleuteld.  De inhoud van het bericht kan tijdens de "
 "weg die het over het internet aflegt, mogelijk door anderen gelezen worden."
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Versleuteld, zwak"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12172,11 +11941,11 @@ msgstr ""
 "Het zal voor een buitenstaander moeilijk zijn, maar niet onmogelijk, om "
 "binnen een redelijke tijd de inhoud van dit bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12184,11 +11953,11 @@ msgstr ""
 "Dit bericht is versleuteld. Het zal voor een buitenstaander moeilijk zijn om "
 "de inhoud van het bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Versleuteld, sterk"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12198,75 +11967,75 @@ msgstr ""
 "voor een buitenstaander zeer moeilijk zijn om binnen een redelijke tijd de "
 "inhoud van het bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Certificaat _weergeven"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Dit certificaat is niet weer te geven"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Afgerond op %B %d, %Y, %l:%M %p"
 
 # overtijd
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Te laat:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "op %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "In bericht weerge_ven"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Op _breedte passend"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "_Oorspronkelijke grootte"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
 # in moeten worden opgeslagen / worden opgeslagen
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Selecteer een map waarin de bijlagen moeten worden opgeslagen..."
 
 # "selectie opslaan" is in principe fout, maar we kijken aan of het problemen oplevert.
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Selectie opslaan..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
 msgstr[0] "%d _bijlage"
-msgstr[1] "%d _bijlagen"
+msgstr[1] "%d bijlagen"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "Op_slaan"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "_Alles opslaan"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Geen bijlage"
 
@@ -12280,89 +12049,95 @@ msgstr "Pagina %d van %d"
 msgid "Retrieving `%s'"
 msgstr "Bezig met ophalen `%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Geldige handtekening, kan afzender niet verifiëren"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Bezig met opmaken van bericht"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Van"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Aan"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "E-mailprogramma"
 
 # a = afgekorte weeknaam, R = 24h tijd, Z is tijdzone
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Datum"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Nieuwsgroepen"
@@ -12412,7 +12187,7 @@ msgstr "Een keer per week"
 msgid "Once per month"
 msgstr "Een keer per maand"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12424,48 +12199,48 @@ msgstr ""
 "\n"
 "Een ogenblik geduld, uw mappen worden door Evolution gemigreerd..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kon nieuwe map `%s' niet aanmaken: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kon map `%s' niet kopiëren naar `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kon niet scannen voor bestaande mailboxen op `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Kon oude POP3 op-server-houden data `%s' niet openen: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Kon POP3 op-server-houden data-map `%s' niet aanmaken: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kon POP3 op-server-houden data `%s' niet kopiëren: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Aanmaken van locate mail-opslag `%s' mislukt: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kon locale mail-mappen niet maken op `%s': %s"
 
 # 'vorige versie' gebruikt ipv 'vorige installatie'
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12482,6 +12257,10 @@ msgstr "_Afzender beantwoorden"
 msgid "Reply to _List"
 msgstr "_Lijst beantwoorden"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Verwijzing in browser _openen"
+
 # verzenden naar...
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
@@ -12491,51 +12270,51 @@ msgstr "_Nieuw bericht sturen aan..."
 msgid "_Add to Address Book"
 msgstr "Aan adresboek _toevoegen"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:615
 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:612
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Map"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Dit bericht niet meer tonen."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Berichtenfilters"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "bericht"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Bericht opslaan..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Adres toevoegen"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Berichten van %s"
@@ -12544,7 +12323,7 @@ msgstr "Berichten van %s"
 msgid "Search _Folders"
 msgstr "Zoek_mappen"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Zoekmapbron"
 
@@ -12558,7 +12337,7 @@ msgstr "Automatisch herkennen van smiley"
 
 #: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
-msgstr "Binnengekomen e-mail op spam controleren"
+msgstr "Controleer binnenkomende mail op troep"
 
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
@@ -12577,112 +12356,87 @@ msgid "Composer Window default width"
 msgstr "Standaardbreedte van venster bij het opmaken van nieuwe berichten"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Standaard tekenset voor het maken van berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Standaard karakterset voor het opmaken van nieuwe berichten."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Standaard karakterset voor het weergegeven van berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Standaard karakterset voor de weergave van berichten."
 
 # manier van doorsturen
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Standaard doorstuurstijl"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
-msgstr ""
-"Standaard hoogte van het berichtvenster bij het maken van nieuwe berichten"
+msgstr "Standaard hoogte van het berichtvenster bij het maken van nieuwe berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Standaard hoogte van het bericht venster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Standaard hoogte van het aanmeld venster"
 
 # standaard manier van antwoorden
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Standaard antwoordstijl"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
-msgstr ""
-"Standaard breedte van berichtvenster bij het maken van nieuwe berichten"
+msgstr "Standaard breedte van berichtvenster bij het maken van nieuwe berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Standaard breedte van het bericht venster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Standaard breedte van het aanmeld venster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Teken indicatoren voor verkeerd gespelde woorden als u typt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Prullenbakken legen bij afsluiten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Prullenbakken legen bij het afsluiten van Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Zet cursor mode aan zodat u een cursor kan zien bij het lezen van e-mail."
-
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
+msgstr "Zet cursor mode aan zodat u een cursor kan zien bij het lezen van e-mail."
 
 # cursor modus aan/uit
 # activeren/deactiveren
 # (de)activeren
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Aanzetten/uitzetten cursor mode"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Hoogte van het berichtenlijst paneel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Hoogte van het berichtenlijst paneel."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12690,13 +12444,7 @@ msgstr ""
 "Als een gebruiker 10 of meer berichten tegelijkertijd probeert te openen, "
 "vraag de gebruiker dan of hij dat werkelijk wilt doen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-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.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12707,27 +12455,23 @@ msgstr ""
 "weergave in de GNOME mime-type database gebruikt worden voor weergave van de "
 "inhoud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "De laatste keer dat de prullenbak geleegd was"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Lijst met labels en de bijpassende kleuren"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Lijst met geaccepteerde licenties"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lijst met accounts"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12736,11 +12480,11 @@ msgstr ""
 "bestaat uit tekenreeksen die overeenkomen met subdirectories relatief aan /"
 "apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lijst van aangepaste koppen en of ze ingeschakeld zijn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12749,21 +12493,21 @@ msgstr ""
 "lijst bestaat uit tekenreeksen met naam:kleur waarbij kleur in HTML hex-"
 "codering is."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Lijst met mime-types die voor bonobo component weergave gecheckt moeten "
 "worden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lijst met protocolnamen waarvan de licentie geaccepteerd is."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Laad afbeeldingen voor HTML berichten over http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12774,105 +12518,98 @@ msgstr ""
 "Afbeeldingen ophalen als de afzender in het adresboek staat 2 - Altijd "
 "afbeeldingen van het internet ophalen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Filter acties bijhouden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Filter acties bijhouden in het gespecificeerde log bestand."
 
 # Logbestand waarin filteracties worden gelogt
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Logbestand voor filteracties"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Logbestand voor filteracties"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Markeer als gelezen na een bepaalde timeout"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Markeer als gelezen ne een bepaalde tijd."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markeer citaten in het bericht \"Voorbeeld\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markeer citaten in het bericht \"Voorbeeld\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Standaardhoogte berichtvenster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Standaardbreedte berichtvenster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Berichtweergave (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
-msgstr ""
-"Minimum aantal dagen tussen het legen van de prullenbak bij het afsluiten"
+msgstr "Minimum aantal dagen tussen het legen van de prullenbak bij het afsluiten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
-"Minimumtijd tussen het legen van de prullenbak bij afsluiten, in dagen."
+msgstr "Minimumtijd tussen het legen van de prullenbak bij afsluiten, in dagen."
 
 # Nieuwe mail melding geluidsbestand
 # geluid voor/bij nieuw bericht
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Geluidsbestand bij melding van nieuw bericht"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Nieuwe mail meldingstype"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-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.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Waarschuwen wanneer geen onderwerp is ingevuld"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Waarschuwen wanneer de gebruiker een map probeert op te ruimen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Waarschuw wanneer de gebruiker probeert om een bericht zonder onderwerp te "
 "versturen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Waarschuwen wanneer de gebruiker opruimt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Waarschuwen wanneer de gebruiker enkel het Bcc-veld invuld"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Waarschuwen wanneer de gebruiker 10 of meer berichten tegelijkertijd "
 "probeert te openen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12880,222 +12617,196 @@ msgstr ""
 "Waarschuwen wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Waarschuwen wanneer berichten worden verstuurd zonder Aan of Cc-ontvangers"
+msgstr "Waarschuwen wanneer berichten worden verstuurd zonder Aan of Cc-ontvangers"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Waarschuw als de gebruiker ongewenste HTML probeert te versturen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-#, fuzzy
-msgid "Prompt while marking multiple messages"
-msgstr "Waarschuwen wanneer de gebruiker opruimt"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Herkennen en vervangen van links in de text."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Herken smileys in de tekst en vervang deze met afbeeldingen."
 
 # arriverende/binnenkomende
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
-msgstr "Binnengekomen berichten op spam controleren"
+msgstr "Binnenkomende berichten testen op troep"
 
 # standaard email als HTML versturen
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Standaard HTML e-mail verzenden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Standaard HTML e-mail verzenden."
 
 # filmpjes weergeven
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Bewegende afbeeldingen tonen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Bewegende afbeeldingen tonen als animaties"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Verwijderde berichten (doorgestreept) tonen in de berichtenlijst."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Verwijderde berichten tonen in de berichtenlijst"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-#, fuzzy
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "Verwijderde berichten tonen in de berichtenlijst"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-#, fuzzy
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Verwijderde berichten tonen in de berichtenlijst"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Geluidsbestand afspelen bij binnenkomst van nieuwe e-mail"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
-"Geeft het type melding dat de gebruiker wenst te ontvangen bij nieuwe mail."
+msgstr "Geeft het type melding dat de gebruiker wenst te ontvangen bij nieuwe mail."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Spellingscontrole in bericht"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Standaardhoogte abonneren-dialoog"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Standaardbreedte abonneren-dialoog"
 
 # console ipv terminal?
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminal-lettertype"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"De vorige keer dat de prullenbak werd geleegd, in dagen sinds de epoch."
+msgstr "De vorige keer dat de prullenbak werd geleegd, in dagen sinds de epoch."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Het terminal-lettertype voor de weergave van mail"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Het lettertype met variabele breedte voor weergave van berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
-msgstr "Deze sleutel zou een lijst met XML structuren moeten bevatten die aangepaste koppen speciferen en of ze weergeven dienen te worden. Het formaat van de XMLstructuur is &lt;kop enabled&gt;- stel enabled in als de kop weergeven moet worden in de mail weergave."
-
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr "Dit bepaalt hoeveel adressen worden weergegeven in de standaard berichtenlijst, waarna een '...' zal worden getoond."
+msgstr ""
+"Deze sleuten zou een lijst met XML structuren moeten bevatten die aangepaste "
+"koppen speciferen en of ze weergeven dienen te worden. Het formaat van de "
+"XMLstructuur is &lt;kop enabled&gt;- stel enabled in als de kop weergeven "
+"moet worden in de mail weergave."
 
 # boomstructuur voor berichtenlijst
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Discussies tonen in berichtenlijst."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Discussies tonen in berichtenlijst"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Toon de berichtenlijst in draad vorm gebaseerd op onderwerp"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Timeout voor het markeren van berichten als gezien"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Timeout voor het markeren van berichten als gezien."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID tekenreeks van de standaard account."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Spamassassin daemon en cliënt gebruiken"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin daemon en cliënt gebruiken (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Aangepaste lettertypen gebruiken"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Aangepaste lettertypen gebruiken voor berichtweergave"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Gebruik alleen locale testen op spam."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Gebruik enkel de locale testen op spam (geen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Lettertype met variabele breedte"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Beeld/Bcc menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Beeld/Cc menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Beeld/Cc menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Beeld/From menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Beeld/From menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Beeld/PostNaar menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Beeld/PostNaar menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Beeld/AntwoordAan menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Beeld/AntwoordAan menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13103,14 +12814,6 @@ msgstr ""
 "Het wel of niet terugvallen op maken van draden op onderwerp wanneer de \n"
 "berichten geen In-Reply-To or References koppen bevatten."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Breedte van het berichtenlijstpaneel"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Breedte van het berichtenlijstpaneel."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Bezig met importeren Elm informatie"
@@ -13142,15 +12845,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importprogramma voor Berkeley Mailbox-formaat"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importeren `%s'"
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Een ogenblik geduld aub"
 
@@ -13291,8 +12994,8 @@ msgstr[1] "%d verwijderd"
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d spam"
-msgstr[1] "%d spam"
+msgstr[0] "%d troep"
+msgstr[1] "%d troep"
 
 #: ../mail/mail-component.c:546
 #, c-format
@@ -13329,35 +13032,35 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d ongelezen"
 msgstr[1] ", %d ongelezen"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Nieuw bericht"
 
 # In menu Nieuw
 # _b wordt gebruikt voor adres_boek
 # _e voor bij_eenkomst
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "Be_richt"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Een nieuwe e-mail opstellen"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Nieuwe berichtenmap"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "Berichten_map"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Nieuwe berichtenmap aanmaken"
 
 # upgraden/vernieuwen/bijwerken
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Upgraden van mail-instellingen of mappen is mislukt."
 
@@ -13385,228 +13088,233 @@ msgstr "_Te doen"
 msgid "_Later"
 msgstr "_Later"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Control_eren op ondersteunde types "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL wordt niet ondersteund in deze versie van Evolution</b>"
 
 # enkelvoud is beter hier.
 # het gaat om een stukje tekst of een plaatje onderaan je e-mail
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>_Ondertekening</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Talen</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr ""
-"<small>Dit zal het filter betrouwbaarder maken, maar ook trager</small>"
+msgstr "<small>Dit zal het filter betrouwbaarder maken, maar ook trager</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Account informatie</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Type aanmeldingscontrole</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Aanmeldingscontrole</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Opstellen berichten</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuratie</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Standaardgedrag</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Berichten verwijderen</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Weergegeven items in de berichtkop</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filteropties</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Labels en kleuren</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Afbeelding laden</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Berichtweergave</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Berichtlettertype</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Berichtontvangst</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Melding bij binnenkomend bericht</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Facultatieve informatie</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opties</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Afdruklettertypen</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Vereiste informatie</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Beveiliging</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Verzonden en kladberichten</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serverconfiguratie</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Accountbeheer"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Nieu_we handtekening toevoegen..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "_Script toevoegen"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Bij dit account, de uitgaande berichten altijd ondertekenen"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 "Bij het _versturen van versleutelde berichten, ook naar mijzelf versleuteld "
 "versturen"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Altij_d een carbonkopie (cc) naar:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Altijd een _blindecarbon kopie (bcc) naar:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sleutels in mijn sleutelbos altijd _vertrouwen bij versleutelen"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr ""
 "Bij het versturen van versleutelde berichten, altijd naar _mijzelf "
 "versleuteld versturen"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Oorspronkelijke bericht bijvoegen"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Automatisch _smileys invoegen"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "Piepen bij _binnenkomst van nieuwe e-mail"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "_tekenset:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Testen op ondersteunde types "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
-msgstr "_Binnengekomen e-mail controleren op spam"
+msgstr "_Binnenkomende mail controleren op troep"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Spelling controleren terwijl ik _tik"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
-msgstr "Controleert binnengekomen berichten op spam"
+msgstr "Controleert binnenkomende mailberichten op troep"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Wissen"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Wi_ssen"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Kleur voor _spelfouten:"
 
 # Berichtkleur/kleuren
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Kleuren"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "Bevestigen vragen bij het opruimen van een _map"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13621,117 +13329,117 @@ msgstr ""
 "\n"
 "Klik op \"Toepassen\" om uw instellingen op te slaan."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "Standaard"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Standaard teken_set:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Uitgaande berichten per standaard digitaal _ondertekenen"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Oorspronkelijke bericht niet citeren"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Klaar"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "_Klad-map:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "_Aanzetten"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-mail accounts"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-mail_adres:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "_Prullenbak legen bij het afsluiten van het programma"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Encry_ptie certificaat:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Uitgaande berichten (standaard) versleutelen"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "_Vaste breedte lettertype:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "_Vaste breedte:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Lettertype-eigenschappen"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Berichten opmaken met _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "_Volledige naam:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML e-mail"
 
 # Koppen/Berichtkop (berichtkop is beter in dit geval)
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Berichtkop"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Citaten _accentueren met"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "E_xterne testen uitvoeren"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Taaltabel"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Mailconfiguratie"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Berichtkoppentabel"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Mailbox-locatie"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Bericht opstellen"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13739,19 +13447,19 @@ msgstr ""
 "Opmerking: Er wordt pas om uw wachtwoord gevraagd wanneer u voor het eerst "
 "contact maakt"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Or_ganisatie:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _sleutel-ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Geluid afspelen bij binnenkomst van nieuwe e-mail"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13759,7 +13467,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:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13768,7 +13476,7 @@ msgstr ""
 "servertype u gebruikt, neem dan contact op met uw systeembeheerder of met uw "
 "internet-provider."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13778,45 +13486,38 @@ 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:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Maak uw keuze uit de volgende mogelijkheden"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
+msgstr "Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Oorspronkelijke bericht citeren"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Onthoud dit wachtwoord"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Ant_woordadres:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Onthoud _wachtwoord"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "S_electeren..."
 
-# leesbevestiging/ontvangstbevestiging
-#: ../mail/mail-config.glade.h:120
-#, fuzzy
-msgid "S_end message receipts:"
-msgstr "Ontvangstbevestiging versturen:"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "S_tandaardlettertype:"
@@ -13845,53 +13546,58 @@ msgstr "Kies HTML lettertype met variabele breedte voor afdrukken"
 msgid "Select sound file"
 msgstr "Selecteer een geluidsbestand"
 
-#: ../mail/mail-config.glade.h:130
+# leesbevestiging/ontvangstbevestiging
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "Ontvangstbevestiging versturen:"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "E-mail versturen"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Verzonden _berichtenmap:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Server _eist aanmeldingscontrole"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "Server-_type: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Handtekenings_certificaat:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_Handtekening:"
 
 # enkelvoud is beter.
 # Dit is het tab-label bij voorkeuren->bericht opstellen
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Ondertekening"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Handtekeningentabel"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Geef _bestandsnaam:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Spellingscontrole"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "T_ype: "
 
-#: ../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."
@@ -13899,7 +13605,7 @@ msgstr ""
 "De lijst met talen hierboven, geeft enkel aan voor welke talen een "
 "woordenboek beschikbaar is."
 
-#: ../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"
@@ -13909,7 +13615,7 @@ msgstr ""
 "uw ondertekening. De naam die u hier geeft zal\n"
 "uitsluitend voor weergavedoeleinden gebruikt worden."
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13917,15 +13623,15 @@ msgstr ""
 "Geef de naam die u aan dit account wilt geven.\n"
 "Bijvoorbeeld: \"zakelijk\" of \"persoonlijk\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Gebruikers_naam:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "V_ariabele breedte:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13935,79 +13641,75 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "Handtekening _toevoegen"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Altijd afbeeldingen van het internet ophalen"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Geen melding bij binnenkomst van nieuwe e-mail"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "_Aanvragen voor bijeenkomsten niet ondertekenen (voor Outlook "
 "compatibiliteit)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Doorstuurstijl:"
 
 # 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:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "Af_beeldingen ophalen als de afzender in het adresboek staat"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Dit instellen als standaardaccount"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Berichten als gelezen markeren na "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages 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:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Waarschuwen wanneer een bericht wordt verzonden zonder onderwerp"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Antwoordstijl:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Script:"
 
 # filmpjes weergeven
 #. 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:173
 msgid "_Show image animations"
 msgstr "_Bewegende afbeeldingen tonen"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr ""
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "Beveiligde verbinding gebr_uiken:"
@@ -14017,21 +13719,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "_Hetzelfde lettertype gebruiken als bij andere programma's"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "adressen"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "kleur"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "omschrijving"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Zoekmapbronnen</b>"
@@ -14047,67 +13741,48 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Versleuteling</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-#, fuzzy
-msgid "All active remote folders"
-msgstr "met alle actieve niet-lokale mappen"
-
-#: ../mail/mail-dialogs.glade.h:6
-#, fuzzy
-msgid "All local and active remote folders"
-msgstr "met alle lokale en actieve niet-lokale mappen"
-
-#: ../mail/mail-dialogs.glade.h:7
-#, fuzzy
-msgid "All local folders"
-msgstr "met alle lokale folders"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "_Hoofdlettergevoelig"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Voltooid"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "_Zoeken:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Zoeken in bericht"
 
 # aanmerken/vlaggen/markeren
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Vlaggen voor vervolgactie"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Mapabonnementen"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Overeenkomst"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Niets geselecteerd"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Beveiligingsinformatie"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Specifieke mappen"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14115,23 +13790,48 @@ 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:19
 msgid "_Accept License"
 msgstr "Overeenkomst _accepteren"
 
 # verloopt/verloopdatum
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Verloopdatum:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Vlag:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Subscribe"
+msgstr "_Abonneren"
+
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "Aan_vinken om de licentieovereenkomst te accepteren"
 
+#: ../mail/mail-dialogs.glade.h:24
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "Af_melden"
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "alleen specifieke mappen"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "met alle actieve niet-lokale mappen"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "met alle lokale en actieve niet-lokale mappen"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "met alle lokale folders"
+
 # bezig met %s pingen
 # %s wordt nu gepingd
 #: ../mail/mail-folder-cache.c:858
@@ -14139,21 +13839,21 @@ msgstr "Aan_vinken om de licentieovereenkomst te accepteren"
 msgid "Pinging %s"
 msgstr "Pingen van %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Map wordt gefilterd"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Berichten aan het ontvangen"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fout bij het toepassen van uitgaande filters: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14162,114 +13862,124 @@ msgstr ""
 "Toevoegen aan %s mislukt: %s\n"
 "In plaats daarvan toevoegen aan lokale `Verzonden'-map."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Fout bij toevoegen aan lokale `Verzonden'-map: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bericht %d van %d wordt verzonden"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Het versturen van %d van de %d berichten is mislukt"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Geannuleerd."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Voltooid."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Bericht wordt opgeslagen in map"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Berichten worden verplaatst naar %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Berichten worden gekopieerd naar %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Opruimen en opslaan van account '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Bezig met opslaan account '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Map wordt ververst"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prullenbak van '%s' wordt geleegd"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Lokale mappen"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Ophalen van bericht %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Ophalen van %d bericht"
 msgstr[1] "Ophalen van %d berichten"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Opslaan van %d bericht"
 msgstr[1] "Opslaan van %d berichten"
 
-#: ../mail/mail-ops.c:2013
+# dit moet kort anders wordt het afgekort met ...
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Kon uitvoerbestand niet maken: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14278,11 +13988,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14291,72 +14001,61 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
-msgstr "Service wordt gecontroleerd"
+msgstr "Dienst wordt gecontroleerd"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Annuleren..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "E-mail versturen & ontvangen"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "_Alles annuleren"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
-msgstr "Aan het actualiseren ..."
+msgstr "Aan het Actualiseren ..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
-msgstr "Aan het wachten ..."
+msgstr "Aan het Wachten ..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 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
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Voer wachtwoordzin in voor %s"
-
-# wachtwoordzin invoeren
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Voer wachtwoordzin in"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Voer uw wachtwoord in voor %s"
 
 # wachtwoord invoeren
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Gebruiker heeft actie afgebroken."
 
@@ -14369,7 +14068,7 @@ msgid "Enter a name for this signature."
 msgstr "Geef deze handtekening een naam."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Naam:"
 
@@ -14415,17 +14114,16 @@ msgstr "Zoekmappen bijwerken voor '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Zoekmappen bijwerken voor '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Zoekmap bewerken"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Nieuwe zoekmap"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Een map genaamd &quot;{1}&quot; bestaat al. Gebruik een andere naam."
 
 #: ../mail/mail.error.xml.h:2
@@ -14473,8 +14171,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u dit account wilt verwijderen?"
 
 #: ../mail/mail.error.xml.h:10
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Weet u zeker dat u dit account en al haar proxies wilt verwijderen?"
 
 #: ../mail/mail.error.xml.h:11
@@ -14504,8 +14201,7 @@ msgstr "Weet u zeker dat een bericht in HTML-formaat wilt versturen?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Weet u zeker dat u een bericht met enkel BCC-geadresseerden wilt versturen?"
+msgstr "Weet u zeker dat u een bericht met enkel BCC-geadresseerden wilt versturen?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
@@ -14696,8 +14392,7 @@ msgstr ""
 # doorgaat/verdergaat/doorzet
 #: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
-"Indien u verdergaat, zullen alle proxy-accounts definitief worden verwijderd."
+msgstr "Indien u verdergaat, zullen alle proxy-accounts definitief worden verwijderd."
 
 # als
 #: ../mail/mail.error.xml.h:59
@@ -14711,8 +14406,7 @@ msgstr ""
 # als
 #: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"Indien u verdergaat, zal de account-informatie definitief worden verwijderd."
+msgstr "Indien u verdergaat, zal de account-informatie definitief worden verwijderd."
 
 #: ../mail/mail.error.xml.h:62
 msgid ""
@@ -14751,37 +14445,33 @@ msgid "Mark all messages as read"
 msgstr "Alle berichten als gelezen markeren"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Mark all messages in subfolders as read?"
-msgstr "Alle berichten in de submappen als gelezen markeren?"
+msgid "Mark all messages as read in the selected folder"
+msgstr "Alle berichten in de geselecteerde map als gelezen markeren"
 
 #: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "Als gelezen mar_keren"
-
-#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Ontbrekende map."
 
 # gegeven/geselecteerd
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Geen bronnen geselecteerd."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Teveel berichten tegelijk openen kan lang duren."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 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:75
+#: ../mail/mail.error.xml.h:74
 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:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14789,7 +14479,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:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14802,60 +14492,59 @@ msgstr ""
 "Toch verzenden?"
 
 # een naam die niet eerder is gebruikt/niet ergens anders is gebruikt
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Geef aan deze handtekening een unieke naam."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Een ogenblik geduld."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problemen bij migreren van oude berichtenmap &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Bevragen van de server"
 
 # bevraagd voor/gevraagd om
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 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:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Leesbevestiging gevraagd."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "De map &quot;{0}&quot; en alle submappen echt verwijderen?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Zoekmappen automatisch bijgewerkt."
 
 # is dit de juiste betekenis?
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Leesbevestiging versturen"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Handtekening bestaat al"
 
-#: ../mail/mail.error.xml.h:90
-#, fuzzy
+#: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 "Systeemmappen zijn vereist om Ximian Evolution correct te laten functioneren "
 "en kunnen niet worden hernoemd, verplaatst of verwijderd."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14872,7 +14561,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:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14886,7 +14575,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "en zijn bijgewerkt."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14900,11 +14589,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "en zijn bijgewerkt."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Het script-bestand moet bestaan en uitvoerbaar zijn."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14913,7 +14602,7 @@ msgstr ""
 "editor om haar expliciet toe te voegen."
 
 # niet actief is/niet is geactiveerd/niet is aangezet
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14924,13 +14613,11 @@ 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:108
-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:107
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "Dit bericht kan niet worden verzonden omdat u geen adres heeft ingevuld"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14938,12 +14625,12 @@ msgstr ""
 "Deze server ondersteunt dit type aanmeldingscontrole niet en ondersteunt "
 "mogelijk geheel geen aanmeldingscontrole."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 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:111
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14951,11 +14638,11 @@ msgstr ""
 "Hiermee zullen alle berichten in de geselecteerde map en haar submappen als "
 "gelezen worden gemarkeerd."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kan geen verbinding krijgen met de GroupWise-server."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14963,40 +14650,40 @@ msgstr ""
 "Kan de kladmap voor dit account niet openen. In plaats daarvan de systeem-"
 "kladmap gebruiken?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Kon het licentiebestand niet lezen."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "_Standaard gebruiken"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Standaard kladmap gebruiken?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 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:118
+#: ../mail/mail.error.xml.h:117
 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:119
+#: ../mail/mail.error.xml.h:118
 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:120
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "U moet deze zoekmap een naam geven."
 
 # opgeven/aangeven/geven
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "U moet een map geven."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -15007,102 +14694,95 @@ msgstr ""
 "mappen te selecteren, alle mappen op afstand, of beide."
 
 # BUG? twee keer "{0}" in bericht?
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Uw aanmelding bij uw server &quot;{0}&quot; als &quot;{0}&quot; is mislukt."
+msgstr "Uw aanmelding bij uw server &quot;{0}&quot; als &quot;{0}&quot; is mislukt."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Bijvoegen"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Veranderingen ongedaan maken"
 
-# niet als gelezen markeren/als niet gelezen markeren ?
-#: ../mail/mail.error.xml.h:127
-#, fuzzy
-msgid "_Do not Mark as Read"
-msgstr "Als gelezen mar_keren"
-
 # Opschonen
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "_Leegmaken"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "Berichten _openen"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Gelezen"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Laagste"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Laag"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Hoog"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Hoogste"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Berichten"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
@@ -15122,15 +14802,15 @@ msgstr "Gemarkeerd"
 msgid "Follow Up Flag"
 msgstr "Antwoord Markering"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Oorspronkelijke locatie"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Ontvangen"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Verzonden berichten"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Grootte"
@@ -15278,15 +14958,8 @@ msgstr "Automatische contacten"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
-"_Automatisch kaarten aanmaken in het adresboek bij het beantwoorden van mail"
-
-#: ../plugins/bbdb/bbdb.c:460
-#, fuzzy
-msgid "Select Address book for Automatic Contacts"
-msgstr "Automatische contacten"
+msgid "_Automatically create entries in the addressbook when responding to mail"
+msgstr "_Automatisch kaarten aanmaken in het adresboek bij het beantwoorden van mail"
 
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
@@ -15294,17 +14967,11 @@ msgstr "Contacten voor expresberichten"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
+msgid "Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
 "Periodiek de contactinformatie en afbeeldingen synchroniseren uit de "
 "buddylijst van gaim"
 
-#: ../plugins/bbdb/bbdb.c:496
-#, fuzzy
-msgid "Select Address book for Gaim buddy list"
-msgstr "Adresboek selecteren"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -15415,6 +15082,10 @@ msgstr ""
 "Een test-plugin dat een popup-munu plugin toont waarmee u dingen naar het "
 "klembord kunt kopiëren."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "E-mail_adres kopiëren"
+
 # kopieren-tool/kopie-tool
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -15425,8 +15096,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Controleren of Evolution het standaard mailprogramma is"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Elke keer als Evolution wordt opgestart, controleren of het het standaard "
 "mailprogramma is."
@@ -15532,7 +15202,7 @@ msgid "Change the password for Exchange account"
 msgstr "Wachtwoord voor Exchange-account wijzigen"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Wachtwoord wijzigen"
 
@@ -15604,34 +15274,31 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr ""
-"De twee wachtwoorden zijn niet gelijk.  Voer de wachtwoorden nogmaals in."
+msgstr "De twee wachtwoorden zijn niet gelijk.  Voer de wachtwoorden nogmaals in."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "Wachtwoord bevestigen:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "Huidige wachtwoord:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "Nieuw wachtwoord:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 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:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Uw wachtwoord zal over %d dagen verlopen"
 
-#. 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
 msgid "Custom"
 msgstr "Aangepast"
 
@@ -15756,7 +15423,7 @@ msgid "Folder Size"
 msgstr "Mapgrootte"
 
 # op map van anderen/andermans map
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Abonneren op andermans map"
@@ -15772,14 +15439,14 @@ msgstr "Exchange mappen-boom"
 msgid "Unsubscribe Folder..."
 msgstr "Abonnement op map opzeggen..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Abonnement op map \"%s\" echt opzeggen?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Abonnement op map \"%s\" opzeggen"
@@ -15815,68 +15482,64 @@ msgstr "Gebruiker toevoegen:"
 msgid "Add User"
 msgstr "Gebruiker toevoegen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Rechten</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Mag niet verwijderen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Mag niet bewerken"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "items aanmaken"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Submappen aanmaken"
 
 # any niet vertaald, omdat het verwarrend is: willekeurige items verwijderen,
 # of: welk item dan ook verwijderen.
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Items verwijderen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Eigen items verwijderen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Items bewerken"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Eigen items bewerken"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Map contact"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Mapeigenaar"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Map zichtbaar"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Gelezen items"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Rol:"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Nee, status niet wijzigen"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 msgid "Select User"
 msgstr "Gebruiker selecteren"
@@ -15914,29 +15577,23 @@ msgid "Cannot display folders."
 msgstr "Kan mappen niet weergeven."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-#, fuzzy
-msgid "Cannot perform the operation."
-msgstr "Fout bij het uitvoeren van de bewerking."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-#, fuzzy
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
 "Wijzigingen in de configuratie van het Exchange-account zullen pas effect "
 "hebben nadat u Evolution afsluit en opnieuw opstart."
 
 # kon niet aanmelden bij server.
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Aanmeldingscontrole bij server is niet gelukt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Kon het wachtwoord niet wijzigen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15946,57 +15603,57 @@ msgstr ""
 "vanwege een onbekende fout. Controleer de URL,\n"
 "gebruikersnaam, en wachtwoord en probeer opnieuw."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Kon niet verbinden met Exchange-server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Kon niet verbinden met server {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Kon de maprechten voor gedelegeerden niet bepalen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Kon het Exchange Web-opslagsysteem niet vinden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Kon server {0} niet lokaliseren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Kon van {0} geen gedelegeerde maken"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Kon de maprechten niet lezen"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Kon de maprechten niet lezen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Kon afwezigheids-status niet lezen"
 
 # updaten
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Kon de maprechten niet bijwerken."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Kon afwezigheidsstatus niet bijwerken"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 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:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16026,33 +15683,28 @@ msgstr ""
 "{0}\n"
 " "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 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:34
 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:35
 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:36
 msgid "Folder offline"
 msgstr "Map is offline"
 
-#: ../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:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Generieke fout"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#, fuzzy
-msgid "Global Catalog Server is not reachable"
-msgstr "Geen Global Catalog server geconfigureerd voor dit account."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16060,70 +15712,65 @@ msgstr ""
 "Indien OWA op een ander pad draait, moet u dat opgeven in het dialoogvenster "
 "voor de accountconfiguratie."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 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:40
 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:41
 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:42
 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:43
 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:44
 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:45
 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:46
 msgid "Password successfully changed."
 msgstr "Wachtwoord is gewijzigd."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Sever name is correct."
-msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
-#, fuzzy
-msgid "Please restart Evolution for changes to take effect"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
 msgstr "Start Evolution opnieuw op"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Selecteer een gebruiker."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 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:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 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:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 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:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 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:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16131,7 +15778,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:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16145,55 +15792,54 @@ msgstr ""
 "\n"
 "Of u heeft gewoon uw wachtwoord verkeerd ingetypt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Probeer opnieuw met een ander wachtwoord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 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:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Kon gedelegeerde niet bewerken."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Onbekende fout bij opzoeken van {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Onbekend type"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Actie niet mogelijk"
 
 # quotum verbruikt/bereikt
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "U heeft bijna uw quotum verbruikt voor het opslaan van berichten op deze "
 "server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 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:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
-msgstr ""
-"U heeft uw quotum overschreden voor het opslaan van berichten op deze server."
+msgstr "U heeft uw quotum overschreden voor het opslaan van berichten op deze server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 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:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16202,7 +15848,7 @@ msgstr ""
 "berichten weg te gooien."
 
 # verzenden/versturen
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16211,7 +15857,7 @@ msgstr ""
 "ontvangen."
 
 # verzenden/versturen
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16219,19 +15865,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:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Uw wachtwoord is verlopen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 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:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} is al een gedelegeerde"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} bevindt zich al in de lijst"
 
@@ -16261,19 +15907,8 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Abonnementen op mappen opzeggen"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "Af_melden"
-
-#: ../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
-#, fuzzy
-msgid "Notes"
-msgstr "Opmerkingen"
-
 # controlelijst/aftekenlijst
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Aftekenlijst"
 
@@ -16283,19 +15918,19 @@ msgstr "Groupwise-account instellen"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
-msgstr "Spaminstellingen"
+msgstr "Troep-instellingen"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Spaminstellingen</b>"
+msgstr "<b>Troepmail-instellingen</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 msgid "Junk Mail Settings..."
-msgstr "Spaminstellingen..."
+msgstr "Troepmail-instellingen..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
-msgstr "<b>Spamlijst:</b>"
+msgstr "<b>Troeplijst:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
@@ -16303,7 +15938,7 @@ msgstr "E-mail:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "Spaminstellingen"
+msgstr "Troepmail-instellingen"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -16316,16 +15951,7 @@ msgstr "_Gebruiken"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "_Spamlijst"
-
-#: ../plugins/groupwise-features/mail-retract.c:53
-msgid "Message retracted successfully"
-msgstr ""
-
-#: ../plugins/groupwise-features/mail-retract.c:60
-#, fuzzy
-msgid "Retract Mail"
-msgstr "Berichten aan het ontvangen"
+msgstr "_Troeplijst"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
@@ -16333,7 +15959,7 @@ 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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Verzendopties"
 
@@ -16349,40 +15975,40 @@ msgstr "Groupwise-functies"
 msgid "Accept Tentatively"
 msgstr "Voorlopig accepteren"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>Gebruikers:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Bericht"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Gedeelde map meldingen"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "De deelnemers zullen de volgende melding ontvangen.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Contacten..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_Meldingsbericht aanpassen"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Niet gedeeld"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Gedeeld met ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Delen"
 
@@ -16453,10 +16079,7 @@ msgstr "Proxy-login"
 msgid "%sEnter password for %s (user %s)"
 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:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "_Proxy aanmelding..."
 
@@ -16468,8 +16091,7 @@ msgstr "Het tabblad proxy is alleen beschikbaar wanneer het account online is."
 # ingesteld/actief gemaakt/geactiveerd/aangezet
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"Het tabblad proxy is alleen beschikbaar wanneer het account is geactiveerd."
+msgstr "Het tabblad proxy is alleen beschikbaar wanneer het account is geactiveerd."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
@@ -16520,12 +16142,12 @@ msgid "Select Calendar"
 msgstr "Agenda selecteren"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importeren"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar formaat (.ics)"
 
@@ -16567,8 +16189,7 @@ msgstr "Kon adresboek niet openen!"
 
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
-msgstr ""
-"Kon het Evolution adresboek niet openen voor het exporteren van gegevens."
+msgstr "Kon het Evolution adresboek niet openen voor het exporteren van gegevens."
 
 # todo/te doen/actielijst
 #: ../plugins/ipod-sync/sync.c:291
@@ -16577,11 +16198,10 @@ msgstr "Kon agenda/actielijst niet openen!"
 
 #: ../plugins/ipod-sync/sync.c:292
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Kon de Evolution agenda/actielijst niet openen om gegevens te exporteren."
+msgstr "Kon de Evolution agenda/actielijst niet openen om gegevens te exporteren."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kon de agenda '%s' niet laden"
@@ -16589,97 +16209,96 @@ 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:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, 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:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, 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:513
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Kon geen enkele agenda vinden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kon deze bijeenkomst in geen enkele agenda terugvinden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:499
 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:528
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Kon deze dagboekaantekening in geen enkel dagboek terugvinden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Zoekende naar een bestaande versie van deze afspraak"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Kan het item niet verwerken"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, 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:864
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Verzonden aan agenda '%s' als geaccepteerd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Verzonden aan agenda '%s' als voorlopig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Verzonden aan agenda '%s' als afgewezen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Verzonden aan agenda '%s' als geannuleerd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator heeft de gedelegeerde %s verwijderd "
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Een annuleringsbericht is aan de gedelegeerde verstuurd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:909
 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:1065
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Aanwezigheidsstatus kon niet ververst worden omdat de status ongeldig is"
+msgstr "Aanwezigheidsstatus kon niet ververst worden omdat de status ongeldig is"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kon aanwezige niet updaten. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Aanwezigheidstatus ververst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "De bijgevoegde agenda is niet geldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16687,15 +16306,15 @@ msgstr ""
 "Het bericht claimt dat het een agenda bevat, maar de agenda is geen geldige "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Het item in de agenda is niet geldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16703,11 +16322,11 @@ msgstr ""
 "Het bericht bevat een agenda, maar de agenda bevat geen aantekenigen, taken "
 "of vrij/bezet-informatie"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "De bijgevoegde agenda bevat meerdere items"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16717,282 +16336,279 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Bericht verwijderen na actie"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Dubbele afspraken zoeken"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
-"Selecteer de agenda's waarbinnen naar dubbele afspraken moet worden gezocht"
+msgstr "Selecteer de agenda's waarbinnen naar dubbele afspraken moet worden gezocht"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Vandaag"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Vandaag %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 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:204
+#: ../plugins/itip-formatter/itip-view.c:202
 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:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "Morgen"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 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:228
+#: ../plugins/itip-formatter/itip-view.c:226
 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:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr ""
-"<b>%s</b> heeft via %s de volgende bijeenkomstgegevens beschikbaar gesteld:"
+msgstr "<b>%s</b> heeft via %s de volgende bijeenkomstgegevens beschikbaar gesteld:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, 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:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> heeft de volgende bijeenkomst aan u gedelegeerd:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> vraagt u op verzoek van %s bij de volgende bijeenkomst aanwezig te "
 "zijn:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> wil op verzoek van %s graag aan een bestaande bijeenkomst "
 "bijdragen:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, 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:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> wil graag de laatste informatie ontvangen voor de volgende "
 "bijeenkomst:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, 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:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, 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:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, 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:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s<b> heeft via %s de volgende bijeenkomstwijzigingen afgewezen:"
 
 # ":" ipv "."
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, 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:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, 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:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, 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:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, 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:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, 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:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, 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:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> wil via %s aan een bestaande taak iets toevoegen:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, 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:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -17001,160 +16617,120 @@ msgstr ""
 "<b>%s</b> wil graag de laatste informatie voor de volgende toegewezen taak "
 "ontvangen:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, 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:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> heeft via %s de volgende toegewezen taak geannuleerd:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, 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:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, 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:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, 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:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:482
-#, fuzzy, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> heeft via %s de volgende taak beschikbaar gesteld:"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, fuzzy, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> heeft de volgende taak beschikbaar gesteld:"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, fuzzy, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr ""
-"<b>%s</b> wil op verzoek van %s graag aan een bestaande bijeenkomst "
-"bijdragen:"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, fuzzy, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen:"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, fuzzy, 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:497
-#, fuzzy, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> heeft de volgende toegewezen taak geannuleerd:"
-
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "Agenda _openen"
 
-# afzeggen/weigeren/afwijzen
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "Af_wijzen"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "_Accepteren"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "Alles af_wijzen"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+# afzeggen/weigeren/afwijzen
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "Af_wijzen"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "Alles _voorlopig"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "_Voorlopig"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "Alles _accepteren"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "Informatie v_erzenden"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "_Aanwezigheidsstatus bijwerken"
 
 # bijwerken/updaten/verversen
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "_Bijwerken"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Begintijd:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Eindtijd:"
 
 # opmerking
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Commentaar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "_Updates naar de aanwezigen verzenden"
 
 # op ieder geval/elk geval/alle keren   toepassen
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "_Op elk geval toepassen"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "_Taken :"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "Memo's :"
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "Toont tekst/agenda-delen in berichten."
@@ -17165,10 +16741,9 @@ msgid "Itip Formatter"
 msgstr "Itip-formattering"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#, fuzzy
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; heeft de bijeenkomst gedelegeerd. Wilt u de gedelegeerde "
 "&quot;{1}&quot; toevoegen?"
@@ -17178,8 +16753,7 @@ msgid "This meeting has been delegated"
 msgstr "Deze bijeenkomst is gedelegeerd"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Dit antwoord is niet van een van de huidige aanwezigen. De afzender "
 "toevoegen als aanwezige?"
@@ -17216,8 +16790,7 @@ msgid "No store available"
 msgstr "Geen opslag beschikbaar"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Een plugin dat een CORBA-interface biedt voor het toegankelijk maken van e-"
 "mail op afstand."
@@ -17272,14 +16845,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Het geselecteerde bericht omzetten naar een nieuwe taak"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Contactenlijst _eigenaar"
 
 #: ../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 "Lijst_archief ophalen"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Lijstgebruik-informatie ophalen"
 
@@ -17299,15 +16875,18 @@ msgid ""
 msgstr "Biedt veelgebruikte mailinglijst-functies (abonneren, opzeggen, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Bericht aan lijst versturen"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "A_bonneren op lijst"
 
 # abonnement op lijst opzeggen
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Afmelden bij de lijst"
 
@@ -17381,8 +16960,7 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
-"Dit bericht bevat de header-informatie niet die vereist is voor deze actie."
+msgstr "Dit bericht bevat de header-informatie niet die vereist is voor deze actie."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -17392,34 +16970,17 @@ msgstr "Bericht be_werken"
 msgid "_Send message"
 msgstr "Bericht v_ersturen"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
-msgid "Contact List _Owner"
-msgstr "Contactenlijst _eigenaar"
-
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Contact opnemen met de eigenaar van de mailinglijst waar dit bericht bijhoort"
+msgstr "Contact opnemen met de eigenaar van de mailinglijst waar dit bericht bijhoort"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-#, fuzzy
-msgid "Get List _Archive"
-msgstr "Lijst_archief ophalen"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-#, fuzzy
-msgid "Get List _Usage Information"
-msgstr "Lijstgebruik-informatie ophalen"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Een archief ophalen van de lijst waar dit bericht bijhoort"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-"Informatie ophalen over het gebruik van de lijst waar dit bericht bijhoort"
+msgstr "Informatie ophalen over het gebruik van de lijst waar dit bericht bijhoort"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
@@ -17433,28 +16994,12 @@ msgstr "Abonneren op de mailinglijst waartoe dit bericht behoort"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Afmelden bij de mailinglijst waartoe dit bericht behoort"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
-msgid "_Post Message to List"
-msgstr "_Bericht aan lijst versturen"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
-msgid "_Subscribe to List"
-msgstr "A_bonneren op lijst"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
-msgid "_Unsubscribe from List"
-msgstr "Abonnement op map \"%s\" opzeggen"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Alles markeren als gelezen"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-#, fuzzy
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Berichten markeren als _gelezen"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -17500,8 +17045,7 @@ msgstr "Nieuwe mail melden"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr ""
-"Een plugin waarmee u kunt beheren welke plugins wel of niet worden gebruikt."
+msgstr "Een plugin waarmee u kunt beheren welke plugins wel of niet worden gebruikt."
 
 # beheerder
 #. Setup the ui
@@ -17703,12 +17247,12 @@ msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
 msgstr ""
-"Filtert spam met Spamassassin. Deze plugin vereist dat Spamassassin is "
-"geïnstalleerd"
+"Filtert troepberichten met Spamassassin. Deze plugin vereist dat "
+"Spamassassin is geïnstalleerd"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
-msgstr "Spamassassin plugin"
+msgstr "Spamassassin troep-plugin"
 
 #: ../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."
@@ -17732,16 +17276,16 @@ msgid "Save all attachments"
 msgstr "Alle bijlagen opslaan"
 
 # huh?
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Selecteer opslaan basisnaam"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Opslaan"
 
@@ -17856,7 +17400,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF-formaat (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Doelbestand selecteren"
 
@@ -17906,19 +17450,19 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Kies de informatie die u zou willen importeren:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Gegevens importeren."
 
@@ -17985,16 +17529,14 @@ msgstr "Standaard vensterbreedte"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-"ID of alias van het component dat bij het opstarten moet worden weergegeven."
+msgstr "ID of alias van het component dat bij het opstarten moet worden weergegeven."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Laatst bijgewerkte configuratieversie"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lijst met paden voor de mappen die gesynchroniseerd dienen te worden voor "
 "offline gebruik"
@@ -18011,15 +17553,11 @@ msgstr "Zijbalk is zichtbaar"
 msgid "Skip development warning dialog"
 msgstr "Waarschuwingsdialoog voor instabiele versie overslaan"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Beginnen in offline stand"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Statusbalk is zichtbaar"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18027,19 +17565,19 @@ msgstr ""
 "De configuratieversie van Evolution, met major/minor/configuratieniveau "
 "(bijvoorbeeld \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "De standaardhoogte van het hoofdvenster in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "De standaardbreedte van het hoofdvenster in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "De standaardbreedte van de zijbalk in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18047,7 +17585,7 @@ msgstr ""
 "De laatst bijgewerkte configuratieversie van Evolution, met major/minor/"
 "configuratieniveau (bijvoorbeeld \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18057,46 +17595,41 @@ msgstr ""
 "\"toolbar\". Indien \"toolbar\" wordt gebruikt, wordt de stijl bepaald door "
 "de instelling van GNOME voor werkbalken."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Werkbalk is zichtbaar"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Of Evolution opstart in offline-modus in plaats van online-modus."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Of het venster gemaximaliseerd moet zijn."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Of de zijbalk zichtbaar is."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Of de statusbalk zichtbaar is."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Of de werkbalk zichtbaar is."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Of het waarschuwingsdialoog voor de ontwikkelingsversies van Evolution wordt "
 "overgeslagen."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Of de vensterknoppen zichtbaar zijn."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Vensterknoppenstijl"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Vensterknoppen zijn zichtbaar"
 
@@ -18117,11 +17650,11 @@ msgstr "Klik op OK om deze verbindingen te verbreken en offline te gaan"
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Kies welk type importeerfilter u wilt gebruiken:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18135,12 +17668,12 @@ msgstr ""
 "U kunt \"Automatisch\" kiezen als u het niet weet; Evolution probeert het "
 "dan voor u uit te zoeken."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Kies de doel map voor deze import"
 
 # vrij vertaald
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18152,23 +17685,23 @@ msgstr ""
 "Er zijn echter niets gevonden dat geïmporteerd konden worden.\n"
 "Indien u het nogmaals wilt proberen klikt u op \"Terug\".\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "B_estandsnaam:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Bestands_type:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Informatie en instellingen importeren van _oudere programma's"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Een enkel bestand i_mporteren"
 
@@ -18232,14 +17765,15 @@ msgstr ""
 "Elros Cyriatan\n"
 "Daniel van Eeden\n"
 "\n"
-"Voor rapporteren van fouten in de vertaling:\n"
-"http://nl.gnome.org/"
+"Voor rapporteren van fouten\n"
+"in de vertaling:\n"
+"http://nl.gnome.org"
 
 #: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "Online _werken"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Offline werken"
 
@@ -18270,41 +17804,36 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Omschakelen naar %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Onbekende systeemfout."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
 # Okay/Ok/OK
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Nieuw"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Nieuw"
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Nieuwe taak"
@@ -18360,7 +17889,7 @@ msgstr ""
 "van externe bestanden in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18397,7 +17926,7 @@ msgstr ""
 "ons\n"
 "harde werk en wachten in spanning op uw bijdrage!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18405,41 +17934,37 @@ msgstr ""
 "Bedankt!\n"
 "Het Evolution team\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Dit bericht niet meer weergeven"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution met activatie van het gespecificeerde component"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
 # geforceerd laten stoppen/doen stoppen
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle componenten van Evolution geforceerd laten stoppen"
 
 # Geforceerd migreren van Evolution 1.4
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Geforceerd opnieuw migreren vanuit Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Verzend de debug-uitvoer van alle componenten naar een bestand."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Het laden van plugins deactiveren."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Het Evolution PIM en e-mailprogramma"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18858,8 +18383,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "U hebt certificaten van deze organisaties die u indentificeren:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "U hebt certificaten in uw bestand die deze certificaat authoriteiten "
 "identificeren:"
@@ -18877,7 +18401,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:676
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "Certificaat bestaat reeds"
 
@@ -19212,12 +18736,12 @@ msgstr "De geselecteerde contacten opslaan als een VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "De contacten in de geselecteerde map opslaan als VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Alles selecteren"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Alles selecteren"
@@ -19292,7 +18816,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:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Nieuw"
 
@@ -19353,7 +18877,6 @@ msgid "Month"
 msgstr "Maand"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Volgende"
 
@@ -19362,7 +18885,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de agenda"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Vorige"
 
@@ -19376,7 +18899,7 @@ msgstr "L_egen"
 
 #: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
-msgstr "Verwijder oude afspraken en agendanotities"
+msgstr "Verwijder oude afspraken en gebeurtenissen"
 
 #: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
@@ -19450,11 +18973,11 @@ msgstr "De selectie naar het klembord knippen"
 msgid "Paste from clipboard"
 msgstr "Plakken vanuit klembord"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "De tekst vanaf het klembord plakken"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Alle tekst selecteren"
 
@@ -19490,31 +19013,30 @@ msgstr "Klik hier om de hulp weer te geven"
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nvoegen"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Bijlage..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Sl_uiten"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Hulp"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Invoegen"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Opties"
@@ -19546,7 +19068,9 @@ msgstr "Aanmerken 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"
+msgstr ""
+"Klik hier om alarmeringen voor deze gebeurtenis 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"
@@ -19556,7 +19080,7 @@ msgstr "Extra verzendopties invoegen"
 # Deze gebeurtenis herhalen/laten herhalen/laten terugkomen
 #: ../ui/evolution-event-editor.xml.h:10
 msgid "Make this a recurring event"
-msgstr "Deze agendanotitie herhalen"
+msgstr "Deze gebeurtenis herhalen"
 
 #: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
 #: ../ui/evolution-task-editor.xml.h:6
@@ -19608,7 +19132,7 @@ msgstr "Schakelt de weergave van categorieën aan/uit"
 
 #: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to have All Day Event"
-msgstr "Schakelt het hebben van een agendanotitie voor de hele dag aan/uit"
+msgstr "Schakelt het hebben van een gebeurtenis voor de hele dag aan/uit"
 
 # ingeplande tijd
 #: ../ui/evolution-event-editor.xml.h:25
@@ -19619,11 +19143,6 @@ msgstr "Schakelt de weergave van tijd die bezet is aan/uit"
 msgid "_Alarms"
 msgstr "_Alarmeringen"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorieën"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19689,80 +19208,57 @@ msgstr "_Prullenbak legen"
 msgid "F_older"
 msgstr "_Mappen"
 
+# berichtenweergave/berichten weergeven/bericht weergeven/
+# berichtweergave
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Berichten_weergave"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Verplaats de geselecteerde map naar een andere map"
 
 #. 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 "Alle verwijderde berichten definitief uit alle mappen verwijderen"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "_Zoekmappen"
 
-# berichtenweergave/berichten weergeven/bericht weergeven/
-# berichtweergave
-#: ../ui/evolution-mail-global.xml.h:13
-#, fuzzy
-msgid "Show Message _Preview"
-msgstr "Berichten_weergave"
-
-#: ../ui/evolution-mail-global.xml.h:14
-#, fuzzy
-msgid "Show message preview below the message list"
-msgstr "Verwijderde berichten tonen in de berichtenlijst"
-
-#: ../ui/evolution-mail-global.xml.h:15
-#, fuzzy
-msgid "Show message preview side-by-side with the message list"
-msgstr "Verwijderde berichten tonen in de berichtenlijst"
-
 # beter dan berichtvoorbeeldvenster
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Berichtinhoud tonen"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abboneren of abbonnement opzeggen voor mappen op externe servers"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Klassieke weergave"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "Map _kopiëren naar..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "_Berichtenfilters"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "Map _verplaatsen naar..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Nieuw..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Voorbeeld"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Abonnementen"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "Verticale weergave"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "De naam van deze map wijzigen"
@@ -19813,8 +19309,7 @@ msgid "Hide _Read Messages"
 msgstr "Ge_lezen berichten verbergen"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Weggegooide berichten verbergen in plaats van ze te laten zien met een "
 "streep erdoor"
@@ -19851,8 +19346,7 @@ msgstr "Selecteer alle en alleen de berichten die nu niet zijn geselecteerd"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Selecteer alle berichten in dezelfde discussie als het geselecteerde bericht"
+msgstr "Selecteer alle berichten in dezelfde discussie als het geselecteerde bericht"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
@@ -19911,7 +19405,7 @@ msgstr "Filterregels toepassen op geselecteerde berichten"
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr "Controleren op _spam"
+msgstr "Controleren op _troep"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -20031,7 +19525,7 @@ msgstr "Filter op _onderwerp..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "Filter de geselecteerde berichten op spamstatus"
+msgstr "Filter de geselecteerde berichten op troepstatus"
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
@@ -20047,8 +19541,7 @@ msgstr "Afbeeldingen in HTML-berichten altijd laden"
 
 #: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
-msgstr ""
-"Het geselecteerde bericht doorsturen in de inhoud van een nieuw bericht"
+msgstr "Het geselecteerde bericht doorsturen in de inhoud van een nieuw bericht"
 
 #: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
@@ -20080,11 +19573,11 @@ msgstr "Geselecteerde berichten als belangrijk markeren"
 
 #: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages as junk"
-msgstr "Geselecteerde berichten als spam markeren"
+msgstr "Geselecteerde berichten als troep markeren"
 
 #: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected messages as not being junk"
-msgstr "Geselecteerde berichten als geen-spam markeren"
+msgstr "Geselecteerde berichten als geen-troep markeren"
 
 #: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
@@ -20117,7 +19610,7 @@ msgstr "Volgende o_ngelezen bericht"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
-msgstr "Geen spam"
+msgstr "Geen troep"
 
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
@@ -20285,7 +19778,7 @@ msgstr "_Ingebonden"
 
 #: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
-msgstr "_Spam"
+msgstr "_Troep"
 
 #: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
@@ -20305,7 +19798,7 @@ msgstr "_Normale afmeting"
 
 #: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
-msgstr "_Geen spam"
+msgstr "_Geen troep"
 
 #: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
@@ -20332,11 +19825,6 @@ msgid "_Unread"
 msgstr "O_ngelezen"
 
 #: ../ui/evolution-mail-message.xml.h:131
-#, fuzzy
-msgid "_Zoom"
-msgstr "In_zoomen"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "In_zoomen"
 
@@ -20344,7 +19832,7 @@ msgstr "In_zoomen"
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Hoofdwerkbalk"
 
@@ -20423,6 +19911,11 @@ msgstr "Ontvang een leesbevestiging wanneer uw bericht wordt gelezen"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nvoegen"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Bestand openen"
@@ -20752,59 +20245,50 @@ msgstr "Pictogrammen _en tekst"
 msgid "Import data from other programs"
 msgstr "Importeer gegevens van andere programma's"
 
-# indeling/layout
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "La_yout"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Nieu_w venster"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Voorkeuren"
 
 # post uit / in
 # postbezorging
 # post bezorgen
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Versturen & ontvangen"
 
 # post uit / in
 # postbezorging
 # post bezorgen
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Versturen & _ontvangen"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Items in de wachtrij versturen en nieuwe items ophalen"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Pilotconfiguratie instellen"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Informatie tonen over Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "_Zijbalk tonen"
+msgid "Side _Bar"
+msgstr "_Zijbalk"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "_Statusbalk tonen"
-
-#: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Werk_balk tonen"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Informatie tonen over Evolution"
+msgid "Status _Bar"
+msgstr "_Statusbalk"
 
 # opsturen/insturen
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Foutmelding insturen"
 
@@ -20812,35 +20296,39 @@ msgstr "Foutmelding insturen"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "_Foutmelding insturen"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Foutmelding insturen met Bug Buddy."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Offline werken aan- of uitschakelen."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Werk_balk"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Werk_balkstijl"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "De statusbalk tonen/verbergen"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "De statusbalk tonen/verbergen"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "I_nfo"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "Venster sl_uiten"
 
@@ -20849,39 +20337,39 @@ msgstr "Venster sl_uiten"
 # Nieu_w venster
 # V_ersturen
 # Afdruk_voorbeeld
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Wachtwoorden ver_geten"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Knoppen verbergen"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Alleen _pictogrammen"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Verkorte handleiding"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Wisselaar uiterlijk"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_Synchronisatieopties..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Alleen _tekst"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Venster"
 
@@ -20918,36 +20406,26 @@ msgid "_Work Week View"
 msgstr "_Werkweekweergave"
 
 #: ../views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As Sent Folder for Wi_de View"
-msgstr "Als map voor verzonden berichten"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Als map voor verzonden berichten"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Op s_tatus"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Op afze_nder"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Op onder_werp"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Op op_volgingsmarkering"
 
-#: ../views/mail/galview.xml.h:7
-#, fuzzy
-msgid "For _Wide View"
-msgstr "Werkweek weergave"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "Be_richten"
 
@@ -20963,32 +20441,28 @@ msgstr "Met _verloopdatum"
 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Tijdzones</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Selectie</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Selecteer een tijdzone"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "Tijdzone combinatieveld"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21024,7 +20498,7 @@ msgid "_Edit..."
 msgstr "Be_werken..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -21039,11 +20513,11 @@ msgstr "Instantie"
 msgid "Save Current View"
 msgstr "Huidige weergave opslaan"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "Nieuwe weergave _aanmaken"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "Bestaande weergave _vervangen"
 
@@ -21079,31 +20553,26 @@ msgstr "Fabriek"
 msgid "Define New View"
 msgstr "Nieuwe weergave definiëren"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "Naam van de nieuwe weergave:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "Soort weergave"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 msgstr "Soort weergave:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Probeer bijlage automatisch weer te geven"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21114,8 +20583,8 @@ msgstr "Maandkalender"
 
 #: ../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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Vullen met kleur"
 
@@ -21124,16 +20593,16 @@ msgstr "Vullen met kleur"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "GDK vulkleur"
 
 #: ../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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Vullen met stippels"
 
@@ -21173,11 +20642,11 @@ msgstr "Minimumbreedte"
 
 # saptiering
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Ruimtes"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Nu"
 
@@ -21306,41 +20775,33 @@ msgstr "Combinatieveld om de tijd te selecteren"
 msgid "Time"
 msgstr "Tijd"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "N_u"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Vandaag"
-
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Uitvouwen"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Of de uitvouwer uitgevouwd moet zijn"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Labeltekst van de uitvouwer"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Gebruik onderstrepen"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -21348,93 +20809,75 @@ msgstr ""
 "Indien ingesteld, geeft een onderstreping in de tekst aan dat het opvolgende "
 "teken gebruikt moet worden voor de sneltoets"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "De ruimte tussen het label en de dochter"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Labelwidget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
-msgstr ""
-"Een widget dat wordt weergegeven in plaats van het gebruikelijke uitvouwlabel"
+msgstr "Een widget dat wordt weergegeven in plaats van het gebruikelijke uitvouwlabel"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Uitvouwer-grootte"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Grootte van de uitvouwpijl"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indicator ruimtes"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Spatiëring rondom uitvouwpijl"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
-# bewaren/opslaan
-# bewaren is hier mooier
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Zoekopdracht opslaan"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Zoeken"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Zoekenopdrachten"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+# bewaren/opslaan
+# bewaren is hier mooier
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Zoekopdracht opslaan"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "Zoekopdracht _opslaan..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "Opgeslagen zoekopdrachten be_werken..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Uitgebreid zoeken..."
 
-# E-mailaccounts / E-mail-accounts / E-mail accounts
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Alle accounts"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Huidige account"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Huidige map"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Huidige bericht"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Kies een afbeelding"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Wereldkaart"
 
-#: ../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."
@@ -21470,48 +20913,46 @@ msgstr "Terugvloeimodel"
 msgid "Column width"
 msgstr "Kolombreedte"
 
-#: ../widgets/misc/e-search-bar.c:527
+# zoekopdracht
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Zoeken"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "Nu _zoeken"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Zoektype"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Item ID"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "Subitem ID"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Tekst"
 
-#. 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:911
-msgid "Show: "
-msgstr ""
-
-# zoekopdracht
-#. 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:927
-#, fuzzy
-msgid "Sear_ch: "
-msgstr "Zoeken"
-
-#. 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:939
-#, fuzzy
-msgid " i_n "
-msgstr " en "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "_Nu zoeken"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -21561,8 +21002,8 @@ msgid "A_uto-delete sent item"
 msgstr "Verzonden item a_utomatisch verwijderen"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classificatie"
+msgid "C_lassification"
+msgstr "_Classificatie"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -21587,23 +21028,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
+"Openbaar\n"
+"Privé\n"
+"Vertrouwelijk\n"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "_Antwoord verwacht"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "_Status volgen"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -21617,53 +21058,53 @@ msgstr ""
 
 # Indien ge_accepteerd:
 # bij acceptatie/accepteren/aannemen/aanname
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "Bij _accepteren"
 
 # voltooiing/voltooien
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Bij _voltooien:"
 
 # bij afwijzing
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Bij a_fwijzing:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "_Binnen"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Na:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "A_lle informatie"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "Bezorging ver_tragen"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Bezorgd"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "Verloo_pdatum instellen"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Tot:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Wanneer het uitkomt"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "Bij _openen:"
 
@@ -21682,21 +21123,21 @@ msgid "Click here to go to URL"
 msgstr "Klik hier om naar de URL te gaan"
 
 # vertalen of niet?
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "Hoofdcategorielijst bewerken..."
 
 # meervoud gemaakt anders moet behoren/behoor ook
 # worden opgesplitst
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "Items behoren tot deze _categoriëen:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "_Beschikbare categorieën:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "categorieën"
 
@@ -21720,23 +21161,23 @@ msgstr "Kolom met invoeraandacht"
 msgid "Unselected Column"
 msgstr "Niet geselecteerde kolom"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Doorgehaalde kolom"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Onderstreepte kolom"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Vetgedrukte kolom"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Gekleurde kolom"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Kolom met achtergrondkleur"
 
@@ -21751,7 +21192,6 @@ msgstr "_Beschikbare velden"
 
 #: ../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
 msgid "Ascending"
 msgstr "Oplopend"
 
@@ -21762,7 +21202,6 @@ msgstr "Alles wissen"
 
 #: ../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 "Descending"
 msgstr "Aflopend"
 
@@ -21863,14 +21302,14 @@ msgstr "_Deze velden op volgorde tonen:"
 #: ../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-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD-code"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Volledige kop"
 
@@ -21890,19 +21329,25 @@ 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:346
 #, 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)"
+msgstr "%s : %s (%d item)"
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d items)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d item)"
-msgstr[1] "%s (%d items)"
+msgstr "%s (%d item)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d items)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21982,70 +21427,65 @@ msgstr "Uniforme rijhoogte"
 msgid "Frozen"
 msgstr "Bevroren"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Huidige weergave aanpassen"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Oplopend sorteren"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Aflopend sorteren"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Niet sorteren"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Groeperen op dit veld"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Groeperen op box"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Deze kolom verwijderen"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Kolom toevoegen..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Uitlijning"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Best passend"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Kolommen aanpassen..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Huidige weergave aanpassen..."
 
-# sortering/sorteer
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Sorteren op"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Lettertype"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Informatie sorteren"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -22099,9 +21539,9 @@ msgstr "Dit zou het minicard canvas-item moeten testen"
 
 # actieverwerking
 #: ../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:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
-msgstr "Agendanotitieverwerking"
+msgstr "Gebeurtenisverwerking"
 
 #: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
 msgid "Font"
@@ -22113,58 +21553,58 @@ msgstr "GDKLettertype"
 
 # uitlijning/rectificatie
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Rectificatie"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Ellips gebruiken"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Ellipsis"
 
 # regeldoorloop
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Regelafbreking"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Afbreektekens"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Max regels"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Nieuwe regels toestaan"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Rand tekenen"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Achtergrond tekenen"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Knop tekenen"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Cursorpositie"
 
@@ -22173,159 +21613,60 @@ msgstr "Cursorpositie"
 msgid "Emulate label resize"
 msgstr "Labelgrootte aanpassen emuleren"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Invoermethodes"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Vet"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Doorgehaald"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Anker"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Clip-breedte"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Clip-hoogte"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Cliprechthoek vullen"
 
 # verschuiving/afwijking
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "X afwijking"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Y afwijking"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Tekstbreedte"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Teksthoogte"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "IM Omgeving"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Sleepbalkpopup"
 
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "work"
-#~ msgstr "werk"
-
-#~ msgid "personal"
-#~ msgstr "persoonlijk"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "De agenda die u heeft geselecteerd is voor alleen-lezen"
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "_Agenda:"
-
-#~ msgid "Memo:"
-#~ msgstr "Memo:"
-
-#~ msgid "_Memo"
-#~ msgstr "_Memo"
-
-#~ msgid "      "
-#~ msgstr "      "
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Abonneren"
-
-#~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "Alle berichten in de geselecteerde map als gelezen markeren"
-
-#~ msgid "C_lassification"
-#~ msgstr "_Classificatie"
-
-#~ msgid ""
-#~ "Public\n"
-#~ "Private\n"
-#~ "Confidential\n"
-#~ msgstr ""
-#~ "Openbaar\n"
-#~ "Privé\n"
-#~ "Vertrouwelijk\n"
-
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s : %s (%d items)"
-
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d items)"
-
-#~ msgid "Category is"
-#~ msgstr "Categorie is"
-
-# delegatee: One to whom something is delegated.
-#~ msgid "Dele_gatees"
-#~ msgstr "_Gedelegeerden"
-
-#~ msgid "From:"
-#~ msgstr "Van:"
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "date-end"
-#~ msgstr "einddatum"
-
-#~ msgid "date-start"
-#~ msgstr "begindatum"
-
-#~ msgid "Original Location"
-#~ msgstr "Oorspronkelijke locatie"
-
-#~ msgid "Search Type"
-#~ msgstr "Zoektype"
-
-#~ msgid "Subitem ID"
-#~ msgstr "Subitem ID"
-
-#, fuzzy
-#~ msgid "Find No_w"
-#~ msgstr "_Nu zoeken"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Video conferentie"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "_Locatie: "
-
-# dit moet kort anders wordt het afgekort met ...
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Kon uitvoerbestand niet maken: %s\n"
-#~ " %s"
-
-#~ msgid "_Insert"
-#~ msgstr "_Invoegen"
diff --git a/po/nn.po b/po/nn.po
index f3288a3e68..d30a8e48cc 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-14 12:52+0200\n"
-"PO-Revision-Date: 2006-04-14 13:06+0200\n"
+"POT-Creation-Date: 2006-04-14 17:38+0200\n"
+"PO-Revision-Date: 2006-04-14 12:50+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
@@ -38,12 +38,12 @@ msgstr "Ny kontakt"
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "noverande adressebokmappe %s har %d kort"
-msgstr[1] "noverande adressebokmappe %s har %d kort"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "noverande adressebokmappe har %d kort"
+msgstr[1] "noverande adressebokmappe har %d kort"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -406,8 +406,10 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution-adresseboka har avslutta uventa."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Biletet du har valt er stort. Vil du endra biletets storleik og lagra det?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Biletet du har valt er stort. Vil du endra biletets storleik og lagra det?"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid ""
@@ -486,7 +488,8 @@ msgid ""
 msgstr "Du har endra denne kontakten. Vil du lagra endringane?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Kontaktane dine for {0} vil ikkje vera tilgjengelege før Evolution vert "
 "starta på nytt."
@@ -647,7 +650,8 @@ msgstr "Lag ei ny adressebok"
 
 #: ../addressbook/gui/component/addressbook-component.c:406
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "Klarte ikkje å oppgradera innstillingane eller mappene til adresseboka."
+msgstr ""
+"Klarte ikkje å oppgradera innstillingane eller mappene til adresseboka."
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 #, fuzzy
@@ -798,10 +802,10 @@ msgstr "_Ny adressebok"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
@@ -827,7 +831,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
@@ -957,7 +961,8 @@ msgid "Email address"
 msgstr "E-postadresse"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kjem til å bruka denne e-postaddressa til å autentisera deg mot "
 "tenaren."
@@ -1068,7 +1073,7 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "Søkjebasen er det eintydige namnet (DN) på oppføringa der søka dine vil "
-"starta. Dersom du let denne stå blank, vil søka byrja ved rota på "
+"starta. Dersom du let denne stå blank, vil søka byrja ved rota av "
 "katalogtreet."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
@@ -1208,6 +1213,7 @@ msgstr "minutt"
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
@@ -2533,15 +2539,15 @@ msgstr "Endra"
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Vel eit bilete til denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Ikkje noko bilete"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2549,7 +2555,7 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
@@ -2577,7 +2583,7 @@ msgstr "_Vel adressebok"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Er du sikker på at du vil\n"
 "sletta kontaktlista (%s)?"
@@ -2594,7 +2600,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Er du sikker på at du vil\n"
 "sletta kontakten (%s)?"
@@ -2891,8 +2897,8 @@ msgstr "Lagra som VCard ..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Opna"
@@ -2949,13 +2955,13 @@ msgstr "Klipp u_t"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopier"
@@ -3964,7 +3970,8 @@ msgid "Export in asynchronous mode"
 msgstr "Eksporter i asynkron modus"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr "Talet på kort i ei utfil i asynkron modus, vanleg er 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
@@ -3972,7 +3979,8 @@ msgid "NUMBER"
 msgstr "TAL"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "Feil i kommandolinjeargumenta. Bruk --help for å sjå ein hjelpetekst."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -4015,7 +4023,8 @@ msgstr ""
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
-msgstr "Eit meiningsfullt samandrag vil fortelja mottakarane kva oppgåva handlar om."
+msgstr ""
+"Eit meiningsfullt samandrag vil fortelja mottakarane kva oppgåva handlar om."
 
 #: ../calendar/calendar.error.xml.h:3
 msgid ""
@@ -4026,7 +4035,8 @@ msgstr ""
 "gjenopprettast."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid "All information in this journal will be deleted and can not be restored."
+msgid ""
+"All information in this journal will be deleted and can not be restored."
 msgstr ""
 "All informasjonen i denne journalen vil verta sletta, og kan ikkje "
 "gjenopprettast."
@@ -4046,7 +4056,8 @@ msgstr ""
 "gjenopprettast."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om denne avtalen vil verta sletta og kan ikkje "
 "gjenopprettast."
@@ -4060,7 +4071,8 @@ msgstr ""
 "gjenopprettast."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om dette møtet vil verta sletta, og kan ikkje "
 "gjenopprettast."
@@ -4100,17 +4112,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på at du vil sletta denne avtalen?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Er du sikker på at du vil sletta denne journaloppføringa?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil sletta dette møtet?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil sletta denne oppgåva?"
 
@@ -4163,7 +4172,8 @@ msgstr ""
 "høve til å godta denne oppgåva."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-post-invitasjonar vil verta sendt til alle deltakarane, som óg vil verta "
 "bedne om å svara."
@@ -4200,7 +4210,9 @@ msgstr ""
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre deltakarane veit at oppgåva er sletta."
+msgstr ""
+"Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre "
+"deltakarane veit at oppgåva er sletta."
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
@@ -4544,7 +4556,7 @@ msgstr "Tid alarmen skal utsetjast:"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
@@ -4670,7 +4682,8 @@ msgstr "Be om stadfesting når oppføringar vert sletta"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Bakgrunnsfarge på oppgåver som skal vera ferdige i dag, i «#rrggbb»-format."
+msgstr ""
+"Bakgrunnsfarge på oppgåver som skal vera ferdige i dag, i «#rrggbb»-format."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
@@ -4681,7 +4694,8 @@ msgid "Calendars to run alarms for"
 msgstr "Kalender å køyra alarmar for"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Farge å teikna Marcus Bains-linja i tidslinja (tom for standard)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
@@ -4933,7 +4947,8 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Einingar for standard påminnar, «minutt», «timar» eller «dagar»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einingar for å avgjera når oppgåver skal gøymast, «minutt», «timar» eller "
 "«dagar»"
@@ -4975,8 +4990,10 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "Om sluttidspunkt for avtalar i veke- og månadsframsyning skal visast."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "Om Marcus Bains-linja (linje som markerer «no») skal teiknast i kalenderen."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Om Marcus Bains-linja (linje som markerer «no») skal teiknast i kalenderen."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
@@ -4988,7 +5005,8 @@ msgstr "Om avtalar skal ha ei standardpåminning."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Om svar etterlyst-feltet skal visast i hending/oppgåve/møte-redigeringa"
+msgstr ""
+"Om svar etterlyst-feltet skal visast i hending/oppgåve/møte-redigeringa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
@@ -5003,7 +5021,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Om statusfeltet skal visast i hending/oppgåve/møte-redigeringa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal visast i 24-timarsformat i staden for 12-timarsformat."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
@@ -5350,18 +5369,19 @@ msgstr "Alarmar"
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-msgid "_Suggest automatic display of attachment"
-msgstr "_Foreslå automatisk framsyning av vedlegget"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Foreslå automatisk framsyning av vedlegget"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Legg ved filer"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Vedleggseigenskapar"
@@ -5370,19 +5390,19 @@ msgstr "Vedleggseigenskapar"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Skildring:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Filnamn:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME-type:"
@@ -5407,7 +5427,8 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u og %d vil bytast ut med brukar og domene frå e-post-adressa.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
@@ -5748,7 +5769,8 @@ msgstr "Journalopføringa er endra."
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
+msgstr ""
+"%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
@@ -5797,7 +5819,7 @@ msgstr[1] "%d vedlagte meldingar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1725
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Flytt"
 
@@ -5930,10 +5952,6 @@ msgstr "Klarte ikkje opna mål"
 msgid "Destination is read only"
 msgstr "Målet er skrivebeskytta"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Sletta dette elementet frå alle dei andre mottakarane sine postkassar?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
@@ -6344,8 +6362,10 @@ msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Du endrar ei oppgåve som skal gjerast fleire gongar. Kva vil du endra?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
+msgid ""
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr ""
+"Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6365,7 +6385,8 @@ msgstr "Alle instansane"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
+msgstr ""
+"Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
@@ -6538,7 +6559,7 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Ferdig"
@@ -6763,7 +6784,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s for ein ukjend utløysartype"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2828
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å opna %s"
@@ -6846,7 +6867,7 @@ msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Oppteke"
 
@@ -6862,15 +6883,15 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nei"
@@ -6881,8 +6902,8 @@ msgstr "Nei"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1309
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6912,9 +6933,9 @@ msgstr "Vel mappe å lagra utvalde vedlegg i..."
 msgid "untitled_image.%s"
 msgstr "bilete_utan_namn.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Lagra som ..."
 
@@ -6981,25 +7002,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7007,44 +7028,44 @@ msgstr "_Opna nettside"
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../calendar/gui/e-calendar-table.c:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tildel oppgåve"
 
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Send _vidare som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valde oppgåver som ferdige"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Trykk her for å leggje til ei oppgåve"
@@ -7079,105 +7100,105 @@ msgstr "Startdato"
 msgid "Task sort"
 msgstr "Sortér oppgåver"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Flyttar meldingar"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopierer element"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nytt _møte"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Ny _oppgåve"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Aktiv framsyning"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Vel _i dag"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Vel dato ..."
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_er til kalender ..."
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Flytt til _kalender ..."
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Deleger møte ..."
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Gjer denne førekomsten _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2141
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2161 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Stad: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2192
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -7344,7 +7365,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7357,7 +7378,7 @@ msgstr "Mellombels godteke"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7370,7 +7391,8 @@ msgid ""
 msgstr "Møtet er avlyst, men det var ikkje ført opp i kalenderane dine"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "Oppgåva er avlyst, men ho var ikkje ført opp i oppgåvelistene dine"
 
 #: ../calendar/gui/e-itip-control.c:1305
@@ -7528,7 +7550,8 @@ msgstr "Ledig/oppteken-førespurnad"
 #: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
+msgstr ""
+"<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
 #: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
@@ -7570,7 +7593,8 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
+msgstr ""
+"Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
 #: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
@@ -7579,7 +7603,8 @@ msgstr "Deltakarstatus oppdatert\n"
 #: ../calendar/gui/e-itip-control.c:1974
 #: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
+msgstr ""
+"Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
 #: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
@@ -7684,63 +7709,63 @@ msgid "Resources"
 msgstr "Ressursar"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Ressurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Rom"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Møteleiar"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Deltakar som må vera med"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Valfri deltakar"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Krev handling"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Mellombels"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7751,14 +7776,14 @@ msgstr "Delegert"
 msgid "Attendee                          "
 msgstr "Deltakar                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Under prossering"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B, %Y"
 
@@ -7766,78 +7791,78 @@ msgstr "%A, %d. %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute av kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Deltakarar ..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Val"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Vis berre _arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Vis _forminska"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/oppteken"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Autoplukk"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Alle personar og ressursar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Alle _pesonar og ein ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Påkravde deltakarar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Påkravde folk _og ein ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Slutt-tid:"
 
@@ -10190,7 +10215,8 @@ msgid "Insert Attachment"
 msgstr "Sett inn vedlegg"
 
 #: ../composer/e-msg-composer.c:828
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikkje signera utgåande melding. Ingen signeringssertifikat til denne "
 "kontoen"
@@ -10396,11 +10422,11 @@ msgstr "_Lagra melding"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Gruppevarepakke"
 
@@ -10517,7 +10543,8 @@ msgstr "Bortsett frå viss meldinga er til e postliste og ikkje berre til meg"
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr "Kva skal Evolution gjera når du får ei melding som ber om lesekvittering?"
+msgstr ""
+"Kva skal Evolution gjera når du får ei melding som ber om lesekvittering?"
 
 #: ../e-util/e-dialog-utils.c:281
 msgid ""
@@ -10842,7 +10869,8 @@ msgid "Composer Preferences"
 msgstr "Redigeringsinstillingar"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsframsyning"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -10877,7 +10905,7 @@ msgstr "Evolution oppsettkontroll for e-postredigering"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-postinnstillingskontroll"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11449,13 +11477,13 @@ msgstr "_Tøm papirkorga"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -11477,143 +11505,143 @@ msgstr "Lag ei ny mappe"
 msgid "Specify where to create the folder:"
 msgstr "Oppgje kor mappa skal lagast:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Merk som _ulesen"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Marker som ikkje vi_ktig"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marker som _skrot"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marker som _ikkje skrot"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marker for _oppfølging..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Merkelapp"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Søkjemappe på _emne"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Søkjemapppe frå av_sendar"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Søkjemappe på _mottakar"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Søkjemappe på på e-post_liste"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1973 ../mail/em-folder-view.c:2017
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "Forvald"
 
-#: ../mail/em-folder-view.c:2116
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: ../mail/em-folder-view.c:2272
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "Kunne ikkje henta melding"
 
-#: ../mail/em-folder-view.c:2465
+#: ../mail/em-folder-view.c:2460
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkjeadresse"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "Lag ny _søkjemappe"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_Frå denne adressa"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "_Til denne adressa"
 
-#: ../mail/em-folder-view.c:2823
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å senda e-post til %s"
@@ -12239,7 +12267,8 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
-msgstr "Liste over MIME-typar som skal bruka bonobo-komponent-framsynarar om mogleg"
+msgstr ""
+"Liste over MIME-typar som skal bruka bonobo-komponent-framsynarar om mogleg"
 
 #: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
@@ -12305,11 +12334,13 @@ msgstr "Korleis meldingar vert viste («normal», «full headers», «source»)"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
-msgstr "Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
+msgstr ""
+"Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
 
 #: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
+msgstr ""
+"Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
 
 #: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
@@ -12328,7 +12359,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Sei ifrå når brukaren tømmer ei av mappe."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Spør brukaren når han prøver å senda ei melding utan emne."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
@@ -12347,7 +12379,8 @@ msgstr "Spør når brukaren prøver å opne ti eller fleire meldingar på ein go
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr "Spør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slikt."
+msgstr ""
+"Spør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slikt."
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
@@ -13316,7 +13349,8 @@ msgstr "T_ype:"
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "Denne lista av språk inneheld berre språk du har installert ordliste til."
+msgstr ""
+"Denne lista av språk inneheld berre språk du har installert ordliste til."
 
 #: ../mail/mail-config.glade.h:143
 msgid ""
@@ -13368,7 +13402,8 @@ msgstr "Ikkje varsla når det kjem _ny e-post"
 
 #: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "Ikkje signer førespurnader om _møter (for å vera kompatibel med Outlook)"
+msgstr ""
+"Ikkje signer førespurnader om _møter (for å vera kompatibel med Outlook)"
 
 #: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
@@ -13396,7 +13431,8 @@ msgstr "_Sti:"
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
+msgstr ""
+"S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -13817,7 +13853,8 @@ msgid "New Search Folder"
 msgstr "Ny søkjemappe"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Ei mappe som har namnet «{1}» finst frå før. Bruk eit anna namn."
 
 #: ../mail/mail.error.xml.h:2
@@ -13836,7 +13873,8 @@ msgstr ""
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
-msgstr "«{1}» har bede om kvittering på mottak/lesing. Senda kvittering til {0}?"
+msgstr ""
+"«{1}» har bede om kvittering på mottak/lesing. Senda kvittering til {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -13848,7 +13886,8 @@ msgstr "Ein signatur som heiter «{0}» finst frå før. Bruk eit anna namn."
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "Eit meiningsfullt emne vil fortelja mottakarane kva e-posten din er om."
+msgstr ""
+"Eit meiningsfullt emne vil fortelja mottakarane kva e-posten din er om."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -13859,7 +13898,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil sletta denne kontoen?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Er du sikker på at du vil kopla ut denne kontoen og sletta alle dei "
 "tilhøyrande mellomtenarane?"
@@ -13890,7 +13930,8 @@ msgstr "Er du sikker på at du vil senda ei melding i HTML-format?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Er du sikker på at du vil senda ein e-post med berre blindkopi-mottakarar?"
+msgstr ""
+"Er du sikker på at du vil senda ein e-post med berre blindkopi-mottakarar?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -14288,17 +14329,21 @@ msgstr ""
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "Denne meldinga kan ikkje sendast fordi kontoen du sender frå er slått av"
+msgstr ""
+"Denne meldinga kan ikkje sendast fordi kontoen du sender frå er slått av"
 
 #: ../mail/mail.error.xml.h:110
-msgid "This message cannot be sent because you have not specified any recipients"
-msgstr "Denne meldinga kan du ikkje senda. Du har ikkje oppgjeve nokon mottakarar"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Denne meldinga kan du ikkje senda. Du har ikkje oppgjeve nokon mottakarar"
 
 #: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
+msgstr ""
+"SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
 
 #: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
@@ -14632,22 +14677,25 @@ msgstr "Automatiske kontaktar"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid "_Automatically create entries in the addressbook when responding to mail"
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr "Legg _automatisk kontaktar til i adresseboka når du svarar på e-post"
 
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
-msgstr "Lynmelding-kontaktar"
+msgstr "Lynmeldingar"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Jamnleg synkronisera kontaktinformasjon og bilete frå kameratlista i Gaim"
+msgid ""
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr ""
+"Jamnleg synkronisera kontaktinformasjon og bilete frå kameratlista i Gaim"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
-msgstr "Synkronisér med kontaktliste no"
+msgstr "Synkronisér med _kameratlista no"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
@@ -14656,7 +14704,8 @@ msgid ""
 "lists."
 msgstr ""
 "Fyller automatisk ut adresseboka di med namn og e-post-adresser når du "
-"svarar på e-post. Fyller også i lynmeldingsinformasjon frå kameratlistene dine."
+"svarar på e-post. Fyller også i lynmeldingsinformasjon frå kameratlistene "
+"dine."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14765,7 +14814,8 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Kontroller om Evolution er standard e-post-program"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Kvar gong Evolution startar kontrollerer han om han er standard e-post-"
 "program."
@@ -15357,7 +15407,8 @@ msgstr "Generell feil"
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr "Dersom OWA køyrer langs ein annan sti må du oppgje det i oppsettdialogen."
+msgstr ""
+"Dersom OWA køyrer langs ein annan sti må du oppgje det i oppsettdialogen."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
@@ -15493,13 +15544,16 @@ msgstr ""
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr "Noverande bruk er: {0} kiB. Du kan ikkje senda eller motta meir e-post no."
+msgstr ""
+"Noverande bruk er: {0} kiB. Du kan ikkje senda eller motta meir e-post no."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr "Noverande bruk er: {0} kiB. Du kan ikkje senda mer e-post før du har rydda meir plass."
+msgstr ""
+"Noverande bruk er: {0} kiB. Du kan ikkje senda mer e-post før du har rydda "
+"meir plass."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15952,7 +16006,8 @@ msgstr "Kalenderen som er lagt ved inneheld fleire oppføringar"
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr "For å handsama alle desse elementa bør fila lagrast og kalenderen importerast"
+msgstr ""
+"For å handsama alle desse elementa bør fila lagrast og kalenderen importerast"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
@@ -16150,7 +16205,8 @@ msgstr "<b>%s</b> ber om å leggje til eit eksisterande møte:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen om:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
@@ -16344,7 +16400,7 @@ msgstr "Itip-formaterar"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr "«{0}» har delegert møtet. Vil du leggje til delegaten «{1}»?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16352,7 +16408,8 @@ msgid "This meeting has been delegated"
 msgstr "Dette møtet har verte delegert"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
@@ -16388,7 +16445,8 @@ msgid "No store available"
 msgstr "Inga lagringsplass tilgjengeleg"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Eit tillegg som inneheld eit CORBA-grensesnitt for å aksessera e-post-data "
 "eksternt."
@@ -16415,7 +16473,8 @@ msgstr "E-post til møte"
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr "Eit tillegg som tillet oppretting av oppgåver frå innhaldet i ein e-post."
+msgstr ""
+"Eit tillegg som tillet oppretting av oppgåver frå innhaldet i ein e-post."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -16544,7 +16603,8 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr "Denne meldinga inneheld ikkje hovudinformasjonen som denne handlinga krev."
+msgstr ""
+"Denne meldinga inneheld ikkje hovudinformasjonen som denne handlinga krev."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -16628,7 +16688,8 @@ msgstr "Varsling om ny e-post"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Eit tillegg for å handsama kva for nokre tillegg som er slått av og på."
+msgstr ""
+"Eit tillegg for å handsama kva for nokre tillegg som er slått av og på."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -16670,7 +16731,8 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"Eit testtillegg som viser eit formateringstillegg som let deg slå av HTML-e-post.\n"
+"Eit testtillegg som viser eit formateringstillegg som let deg slå av HTML-e-"
+"post.\n"
 "\n"
 "Dette tillegget er berre meint som demonstrasjon og er ikkje støtta.\n"
 
@@ -16852,7 +16914,7 @@ msgid "MIME Type"
 msgstr "MIME-type"
 
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Lagra"
 
@@ -17081,14 +17143,16 @@ msgstr "Standard breidde på vindauget"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID eller alias til komponenten som vert vist som standard ved oppstart."
+msgstr ""
+"ID eller alias til komponenten som vert vist som standard ved oppstart."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "Sist oppgraderte versjon av oppsettet"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste over stiar til mapper som skal synkroniserast til disk for fråkopla "
 "bruk"
@@ -17105,7 +17169,7 @@ msgstr "Sidestolpen er synleg"
 msgid "Skip development warning dialog"
 msgstr "Om utviklarversjonsvindauget skal hoppast over"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Start i fråkopla modus"
 
@@ -17113,7 +17177,8 @@ msgstr "Start i fråkopla modus"
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Oppsettsversjonen av Evolution, med stor/liten/oppsettnivå (t.d. «2.6.0»)."
+msgstr ""
+"Oppsettsversjonen av Evolution, med stor/liten/oppsettnivå (t.d. «2.6.0»)."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
@@ -17150,7 +17215,8 @@ msgstr "Verktøylinja er synleg"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
+msgstr ""
+"Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether the sidebar should be visible."
@@ -17161,7 +17227,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinja skal vera synleg."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Om åtvaringsvindauget utviklarversjonane av Evolution skal droppast."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:24
@@ -17273,7 +17340,8 @@ msgstr "«.» og «..» er resverte mappenamn."
 
 #: ../shell/e-shell-window-commands.c:71
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
+msgstr ""
+"GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
 
 #: ../shell/e-shell-window-commands.c:79
 #, c-format
@@ -17291,7 +17359,7 @@ msgstr "Bug Buddy kan ikkje køyrast."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Åsmund Skjæveland <aasmunds@fys.uio.no> 2003-2006\n"
@@ -17300,15 +17368,15 @@ msgstr ""
 "\n"
 "Send feilmeldingar og kommentarar til <i18n-nn@lister.ping.uio.no>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
@@ -17409,7 +17477,7 @@ msgstr ""
 "med å importera filer frå andre program til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17446,7 +17514,7 @@ msgstr ""
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17454,35 +17522,35 @@ msgstr ""
 "Takk frå\n"
 "Evolution-laget\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution, og start opp den oppgjevne delen"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tving ny migrering frå Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Kopla frå lasting av tillegg."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17570,8 +17638,8 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"Å oppgradera dataane og innstillingane dine vil krevja opp til {0} diskplass, "
-"men du har berre {1} tilgjengeleg.\n"
+"Å oppgradera dataane og innstillingane dine vil krevja opp til {0} "
+"diskplass, men du har berre {1} tilgjengeleg.\n"
 "\n"
 "Du må gjera meir plass tilgjengeleg i heimekatalogen din før du kan halda "
 "fram."
@@ -17876,11 +17944,13 @@ msgstr "Stol på at sertifikatet er autentisk"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr "Stol på denne sertifiseringsinstansen ved identifisering av e-postbrukarar."
+msgstr ""
+"Stol på denne sertifiseringsinstansen ved identifisering av e-postbrukarar."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr "Stol på denne sertifiserinsinstansen ved identifisering av programutviklarar."
+msgstr ""
+"Stol på denne sertifiserinsinstansen ved identifisering av programutviklarar."
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
@@ -17895,7 +17965,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikat som identifiserer deg frå desse organisasjonane:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Du har sertifikat som identifiserer desse sertifiseringsinstansane:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -18244,7 +18315,7 @@ msgid "Select All"
 msgstr "Vel alle"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vel _alt"
@@ -18471,11 +18542,11 @@ msgstr "Klipp ut merka tekst og legg på utklippstavla"
 msgid "Paste from clipboard"
 msgstr "Lim inn frå utklippstavla"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst frå utklippstavla"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Merk all tekst"
 
@@ -18510,31 +18581,30 @@ msgstr "Klikk her for å sjå den tilgjengelege hjelpeteksten"
 msgid "Close"
 msgstr "Lukk"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Set _inn"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Vedlegg ..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Fil"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Hjelp"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "Set _inn"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Val"
@@ -18794,7 +18864,8 @@ msgid "Hide _Read Messages"
 msgstr "Gøym _lesne meldingar"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Gøym dei sletta meldingane i staden for å visa dei gjennomstreka"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -19382,6 +19453,11 @@ msgstr "Få leveringskvittering når meldinga vert lesen"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Set _inn"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Opna ei fil"
@@ -19672,7 +19748,8 @@ msgstr "Lag eit nytt vindauge som viser denne mappa"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Vis vindaugeknappane i tråd med skrivebordet si verktøylinjeinnstilling"
+msgstr ""
+"Vis vindaugeknappane i tråd med skrivebordet si verktøylinjeinnstilling"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -20016,10 +20093,6 @@ msgstr "Type framsyning"
 msgid "Type of view:"
 msgstr "Type framsyning:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Foreslå automatisk framsyning av vedlegget"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: ../widgets/misc/e-calendar-item.c:416
@@ -21096,4 +21169,3 @@ msgstr "Inndatametode-kontekst"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Oppsprett med handtak"
-
diff --git a/po/pa.po b/po/pa.po
index 9ca508ccf8..f7f3dc138f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,30 +1,27 @@
-# translation of evolution.HEAD.po to Punjabi
-# translation of pa2.po to Punjabi
-# translation of evolution.po to Punjabi
-# translation of evolution.HEAD.pa.po to Punjabi
-# translation of pa.po to Punjabi
+# translation of evolution.gnome-2-14.po to Punjabi
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
+#
 # Punjab Linux Technology <punjablinux@netscape.net>, 2004.
 # Amanpreet Singh Alam <aalam@redhat.com>, 2004.
 # Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005, 2006.
 # Amanpreet Singh Brar <amanpreetsinghalam@redhat.com>, 2005.
 # Amanpreet Singh Brar <amanpreetalam@yahoo.com>, 2005.
 # Amanpreet Singh Brar Alamwalia <apbrar@gmail.com>, 2006.
-#
+# A S Alam <apbrar@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD\n"
+"Project-Id-Version: evolution.gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-24 06:07+0100\n"
-"PO-Revision-Date: 2006-02-25 12:41+0530\n"
-"Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
+"POT-Creation-Date: 2006-05-20 04:37+0200\n"
+"PO-Revision-Date: 2006-05-20 13:34+0530\n"
+"Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "\n"
 "\n"
 "\n"
@@ -69,32 +66,32 @@ msgstr "ਸੰਪਰਕ:  "
 msgid "evolution minicard"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਛੋਟਾ-ਕਾਰਡ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "ਇਸ ਲਈ ਅਲਾਰਮ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "ਅੱਜ ਮੀਟਿੰਗ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ: %s ਸੰਖੇਪ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ: ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਣ ਘਟਨਾ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "ਕੇਂਦਰਿਤ ਹੋਵੇ"
 
@@ -123,32 +120,32 @@ msgstr "ਮਿਤੀ ਤੇ ਜਾਓ"
 msgid "a table to view and select the current time range"
 msgstr "ਮੌਜੂਦਾ ਸਮੇਂ ਸੀਮਾ ਵੇਖਣ ਅਤੇ ਚੁਣਨ ਲਈ ਸਾਰਣੀ"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "ਇਸ ਵਿੱਚ %d ਘਟਨਾ ਹੈ"
 msgstr[1] "ਇਸ ਵਿੱਚ %d ਘਟਨਾਵਾਂ ਹਨ।"
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "ਇਸ ਵਿੱਚ ਕੋਈ ਘਟਨਾ ਨਹੀਂ ਹੈ।"
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "ਕੰਮ ਹਫਤਾ ਦਰਿਸ਼: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ਦਿਨ ਝਲਕ: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "ਕੰਮ ਹਫਤੇ ਲਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਦਿਨਾਂ ਲ਼ਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
@@ -224,21 +221,21 @@ msgstr "ਜੰਪ ਬਟਨ"
 msgid "Click here, you can find more events."
 msgstr "ਹੋਰ ਘਟਨਾਵਾਂ ਵੇਖਣ ਲ਼ਈ ਇਸ ਨੂੰ ਦਬਾਓ।"
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ਮਹੀਨਾ ਝਲਕ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "ਹਫਤਾ ਝਲਕ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "ਮਹੀਨੇ ਦੀ ਕੈਲੰਡਰ ਦਿੱਖ"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਹਫਤਿਆਂ ਲ਼ਈ ਕੈਲੰਡਰ ਦਰਿਸ਼"
 
@@ -554,9 +551,9 @@ msgstr "ਸਵੈ-ਪੂਰਤੀ ਦੀ ਸੰਰਚਨਾ ਇਥੇ ਦਿਓ"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "ਸੰਪਰਕ"
 
@@ -827,7 +824,7 @@ msgstr "Vcard ਇੰਝ ਸੰਭਾਲੋ..."
 msgid "_Properties..."
 msgstr "ਵਿਸ਼ੇਸਤਾ(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "ਸੰਪਰਕ ਸਰੋਤ ਚੋਣਕਾਰੀ"
 
@@ -836,12 +833,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨੂੰ ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ।\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ਉਪਭੋਗਤਾ %s) ਲਈ ਗੁਪਤ ਕੋਡ ਭਰੋ"
@@ -1029,8 +1026,8 @@ msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP "
-"ਸਰਵਰ SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
+"SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
@@ -1189,13 +1186,10 @@ msgstr "ਕਾਰਡ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2020
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1453,7 +1447,7 @@ msgstr "ਸਿਰਨਾਵਾਂ"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2462,7 +2456,7 @@ msgstr "ਸੇਵਾ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
@@ -2526,15 +2520,15 @@ msgstr "ਤਬਦੀਲ"
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2759
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2760
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3044
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2542,7 +2536,23 @@ msgstr ""
 "ਸੰਪਰਕ ਡਾਟਾ ਗਲਤ ਹੈ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "'%s' ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s'%s' ਦਾ ਫਾਰਮੈਟ ਗਲਤ ਹੈ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s'%s' ਖਾਲੀ ਹੈ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "ਗਲਤ ਸੰਬੰਧ"
 
@@ -2699,8 +2709,8 @@ msgstr "_IM ਸੇਵਾ:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:222
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "ਟਿਕਾਣਾ(_L):"
 
@@ -2870,7 +2880,7 @@ msgstr "ਸਰੋਤ"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2883,7 +2893,7 @@ msgid "Save as VCard..."
 msgstr "VCard ਇਸਤਰਾਂ ਸੰਭਾਲੋ..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -2944,7 +2954,7 @@ msgstr "ਕੱਟੋ(_t)"
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1182
 #: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
@@ -3103,7 +3113,7 @@ msgstr "ਰੇਡੀਓ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:497
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
@@ -3142,7 +3152,7 @@ msgstr "ਵੈਬ ਸਾਇਟ"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:656
@@ -3150,7 +3160,7 @@ msgstr "ਵੈਬ ਸਾਇਟ"
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "ਚੌਡ਼ਾਈ"
@@ -3158,14 +3168,14 @@ msgstr "ਚੌਡ਼ਾਈ"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-field-chooser-item.c:663
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "ਉਚਾਈ"
@@ -3680,19 +3690,19 @@ msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 msgid "Importing ..."
 msgstr "ਅਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾਟਾ ਅੰਤਰ ਤਬਦੀਲੀ ਫਾਰਮੈਟ (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ LDIF ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ VCard ਆਯਾਤਕਾਰ"
 
@@ -3755,7 +3765,7 @@ msgstr "ਫਾਰਮੈਟ"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "ਸਿਰਲੇਖ"
@@ -3859,9 +3869,9 @@ msgstr "ਛਾਂ"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:205
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "ਅਕਾਰ:"
 
@@ -4154,8 +4164,8 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr ""
-"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਹੋਰ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ "
-"ਜਰਨਲ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
+"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਹੋਰ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਜਰਨਲ ਹਟਾ "
+"ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
@@ -4170,8 +4180,8 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
-"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਕੰਮ ਨੂੰ "
-"ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
+"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਕੰਮ ਨੂੰ ਹਟਾ "
+"ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
@@ -4321,7 +4331,7 @@ msgid "_Save Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ(_S)"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "ਭੇਜੋ(_S)"
 
@@ -4434,14 +4444,14 @@ msgid "Memos"
 msgstr "ਮੀਮੋ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "ਕੰਮ"
@@ -4460,9 +4470,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰਟ"
@@ -4594,70 +4601,34 @@ msgstr "ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ ਫੈਕਟਰੀ
 msgid "invalid time"
 msgstr "ਗਲਤ ਸਮਾਂ"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld ਸਕਿੰਟ)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "ਦੂਜਾ"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "ਸਕਿੰਟ"
-
-#  strftime format %d = day of month, %B = full
-#  month name. You can change the order but don't
-#  change the specifiers or add anything.
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u ਸਕਿੰਟ"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u ਸਕਿੰਟ"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u ਮਿੰਟ"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
 #, c-format
-msgid " %u minutes"
-msgstr " %u ਮਿੰਟ"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ਘੰਟਾ"
+msgstr[1] "%d ਘੰਟੇ"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
 #, c-format
-msgid "%u hour"
-msgstr " %u ਘੰਟਾ"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ਮਿੰਟ"
+msgstr[1] "%d ਮਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
 #, c-format
-msgid "%u hours"
-msgstr " %u ਘੰਟੇ"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ਸਕਿੰਟ"
+msgstr[1] "%d ਸਕਿੰਟ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -4897,8 +4868,8 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਨਮੂਨਾ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਦੇ ਉਪਭੋਗੀ ਖੇਤਰ ਅਤੇ %d ਨੂੰ "
-"ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
+"ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਨਮੂਨਾ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਦੇ ਉਪਭੋਗੀ ਖੇਤਰ ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ "
+"ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
@@ -5059,10 +5030,10 @@ msgstr "ਛਾਪੋ"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../plugins/hula-account-setup/camel-hula-listener.c:379
 #: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -5320,7 +5291,7 @@ msgstr "ਮਿੰਟ"
 msgid "start of appointment"
 msgstr "ਰੁਝੇਵੇਂ ਨਾਲ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "ਕਾਰਵਾਈ/ਤਬਦੀਲ"
 
@@ -5435,7 +5406,7 @@ msgid "Display"
 msgstr "ਦਰਿਸ਼"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ"
@@ -5775,131 +5746,131 @@ msgstr "ਨੱਥੀ ਸੁਨੇਹਾ - %s"
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
 #: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3034
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ਸ਼ਾਮਿਲ ਸੁਨੇਹਾ"
 msgstr[1] "%d ਨੱਥੀ ਸੁਨੇਹੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "ਭੇਜੋ(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "ਚੁੱਕਣਾ ਰੱਦ(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> ਨੱਥੀ"
 msgstr[1] "<b>%d</b> ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3597
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "ਹਟਾਓ(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "ਵਿਸ਼ੇਸਤਾ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3600
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
-#: ../mail/em-format-html-display.c:2063
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "ਨੱਥੀ ਵੇਖਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਨੂੰ ਬਦਲਣ ਲਈ ਸਪੇਸ ਸਵਿੱਚ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "ਰੁਝੇਵਾਂ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮੀਟਿੰਗ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਰੁਝੇਵਾਂ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲੇ ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "ਜਰਨਲ ਇੰਦਰਾਜ਼ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "ਸੰਖੇਪ ਨਹੀਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ਜੇਕਰ ਅੱਪਡੇਟ ਕੀਤਾ ਇਸ ਇਕਾਈ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਵਰਤਣ ਵਿੱਚ ਅਸਫਲ!"
 
@@ -5986,106 +5957,106 @@ msgid "Recurrence"
 msgstr "ਦੁਹਰਾਓ"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "ਕੈਲੰਡਰ(_n):"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "ਪ੍ਰਬੰਧਕ(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "ਪ੍ਰਤੀਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼ਕ(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "ਬਿਨਾਂ ਸ਼ੁਰੂਆਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "ਬਿਨਾਂ ਅੰਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "ਚੁਣੇ ਪ੍ਰਬੰਧਕ ਦਾ ਖਾਤਾ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "ਸ਼ਾਮਿਲ(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
 msgstr[1] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਘੰਟਾ"
 msgstr[1] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਘੰਟੇ"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 msgstr[1] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
@@ -6094,7 +6065,7 @@ msgstr "ਪਸੰਦ"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6224,14 +6195,14 @@ msgstr "ਮੈਂਬਰ"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6268,7 +6239,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱਚ ਮੀਮੋ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "ਸਮੂਹ(_G):"
@@ -6367,6 +6338,15 @@ msgstr "ਚਾਲੂ"
 msgid "first"
 msgstr "ਪਹਿਲਾਂ"
 
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+msgid "second"
+msgstr "ਦੂਜਾ"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
@@ -6511,7 +6491,7 @@ msgstr "<span weight=\"bold\">ਸਥਿਤੀ</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
@@ -6587,11 +6567,11 @@ msgstr "ਕੰਮ(_T)"
 msgid "Task Details"
 msgstr "ਕੰਮ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' ਵਿੱਚ ਕਾਰਜ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
@@ -6675,30 +6655,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d ਹਫਤਾ"
 msgstr[1] "%d ਹਫਤਾ"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ਘੰਟਾ"
-msgstr[1] "%d ਘੰਟੇ"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d ਮਿੰਟ"
-msgstr[1] "%d ਮਿੰਟ"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ਸਕਿੰਟ"
-msgstr[1] "%d ਸਕਿੰਟ"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "ਅਣਪਛਾਤੀ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਹੈ"
@@ -6760,7 +6716,7 @@ msgid "%s for an unknown trigger type"
 msgstr "ਅਣਪਛਾਤੀ ਤਬਦੀਲੀ ਕਿਸਮ ਲਈ  %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ਖੋਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
@@ -6859,27 +6815,27 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ਹਾਂ"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ਨਹੀ"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6896,35 +6852,35 @@ msgstr "ਆਵਿਰਤੀ"
 msgid "Assigned"
 msgstr "ਜਾਰੀ ਕੀਤੇ"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "ਇਸਤਰਾਂ ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "ਨੱਥੀ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "ਬਿਨਾਂ ਸਿਰਲੇਖ ਚਿੱਤਰ %s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "ਇਸ ਤਰਾਂ ਸੰਭਾਲੋ(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "ਪਿੱਠਭੂਮੀ ਬਣਾਉ(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ਨਾਲ ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
@@ -7156,25 +7112,25 @@ msgid "Delete _All Occurrences"
 msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2030
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ੍ਰਬੰਧਕ: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2034
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ੍ਰਬੰਧਕ: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "ਟਿਕਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾਂ: %s %s"
@@ -7338,7 +7294,7 @@ msgstr "<br> ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕ
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7351,7 +7307,7 @@ msgstr "ਆਰਜ਼ੀ ਸਵੀਕਾਰ"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7676,81 +7632,81 @@ msgid "Resources"
 msgstr "ਸਰੋਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "ਇੱਕਲਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "ਸਮੂਹ"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "ਕਮਰਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "ਕੁਰਸੀ"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "ਲੋਡ਼ੀਦੇ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਂਣ ਵਾਲੇ"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "ਕੋਈ ਭਾਗ ਲੈਣ ਵਾਲਾ ਨਹੀਂ ਹੈ"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "ਆਰਜ਼ੀ"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼ਕ                          "
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "ਕਾਰਵਾਈ ਅਧੀਨ"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7759,7 +7715,7 @@ msgstr "%A, %B %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -7845,7 +7801,7 @@ msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 msgid "Memo sort"
 msgstr "ਮੀਮੋ ਕ੍ਰਮਬੱਧ"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7864,7 +7820,7 @@ msgstr "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 msgid "Opening memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "ਚੁਣੀਆਂ ਇਕਾਈਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
@@ -7873,20 +7829,20 @@ msgstr "ਚੁਣੀਆਂ ਇਕਾਈਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹ�
 msgid "Enter the password for %s"
 msgstr "%s ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "ਕੰਮ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "ਕੰਮ ਪੂਰੇ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "ਨਿਕਾਲਾ"
 
@@ -8168,12 +8124,6 @@ msgstr "ਕੈਲੰਡਰ `%s' ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ
 msgid "Unable to migrate tasks `%s'"
 msgstr "ਕੰਮ `%s' ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ"
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d ਸਕਿੰਟ)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1ਹਿਲਾਂ"
@@ -10086,7 +10036,7 @@ msgid "%.0fG"
 msgstr "%.0f ਗੈਗਾ"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ"
 
@@ -10211,7 +10161,7 @@ msgid "Hide _Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_A)"
 
 #: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
-#: ../composer/e-msg-composer.c:3843
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_A)"
 
@@ -10246,12 +10196,12 @@ msgstr "ਸਵੈ-ਨਿਰਮਤ"
 msgid "Si_gnature:"
 msgstr "ਦਸਤਖਤ(_g):"
 
-#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
-#: ../composer/e-msg-composer.c:3728
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../composer/e-msg-composer.c:4952
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10286,7 +10236,7 @@ msgstr "ਕਿਉਕਿ &quot;{0}&quot;, ਤੁਹਾਨੂੰ ਵੱਖਰੀ�
 #  system:no-save-file secondary
 #  system:no-load-file secondary
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "ਕਿਉਕਿ &quot; {1}&quot;।"
 
@@ -10404,11 +10354,11 @@ msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "ਸਮੂਹਿਕ ਸਰੂਪ"
 
@@ -10577,7 +10527,7 @@ msgstr "ਕੀ ਤੁਸੀਂ ਉੱਪਰ ਲਿਖਣਾ ਚਾਹੁੰਦ�
 msgid "File exists &quot;{0}&quot;."
 msgstr "ਫਾਇਲ ਬੰਦ &quot;{0}&quot;।"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ(_O)"
 
@@ -10749,7 +10699,7 @@ msgstr "ਫਾਇਲ਼ ਨਾਂ ਗੁੰਮ ਹੈ।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "ਨਾਂ ਗੁੰਮ ਹੈ।"
 
@@ -10822,6 +10772,10 @@ msgstr "ਪਹਿਲਾਂ"
 msgid "months"
 msgstr "ਮਹੀਨੇ"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "ਸਕਿੰਟ"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "ਮੌਜੂਦਾ ਸਮਾਂ"
@@ -10936,46 +10890,46 @@ msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 msgid "Ask for each message"
 msgstr "ਹਰ ਸੁਨੇਹੇ ਲਈ ਪੁੱਛੋ"
 
-#: ../mail/em-account-editor.c:1779 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "ਪਛਾਣ"
 
-#: ../mail/em-account-editor.c:1828 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "ਈ-ਪੱਤਰ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2012
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਦੀ ਜਾਂਚ ਕਰੋ(_n)"
 
-#: ../mail/em-account-editor.c:2193 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "ਈ-ਪੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2252 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "ਮੂਲ"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2318 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "ਸੁਰੱਖਿਆ"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2355 ../mail/em-account-editor.c:2446
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣ"
 
-#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
-#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ਖਾਤਾ ਸੰਪਾਦਕ"
 
-#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਖਾਤਾ ਸਹਾਇਕ"
 
@@ -10997,7 +10951,7 @@ msgstr "[ਮੂਲ]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "ਯੋਗ ਕੀਤਾ"
 
@@ -11026,7 +10980,7 @@ msgstr "ਇੱਕ ਦਸਤਖਤੀ ਸਕਰਿਪਟ ਸ਼ਾਮਿਲ"
 msgid "Signature(s)"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/em-composer-utils.c:873 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ --------"
 
@@ -11363,7 +11317,7 @@ msgstr "ਡਰਾਫਟ"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
@@ -11449,7 +11403,7 @@ msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 msgid "_Rename..."
 msgstr "ਨਾਂ ਤਬਦੀਲ(_R)..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_E)"
 
@@ -11593,37 +11547,37 @@ msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਤੇ ਫਿਲਟਰ ਲਗਾਓ(_M)"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "ਮੂਲ"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "ਸੁਨੇਹਾ ਛਾਪੋ"
 
-#: ../mail/em-folder-view.c:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "ਸਬੰਧ ਟਿਕਾਣੇ ਦੀ ਨਕਲ(_C)"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_S)"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "ਇਸ ਸਿਰਨਾਵੇਂ ਤੋਂ(_F)"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "ਇਸ ਸਿਰਨਾਵੇਂ ਲਈ(_T)"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
@@ -11695,8 +11649,8 @@ msgid ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"ਇਹ ਸੁਨੇਹੇ ਇਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ "
-"ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
+"ਇਹ ਸੁਨੇਹੇ ਇਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ "
+"ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
 #: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
@@ -11718,8 +11672,8 @@ msgid ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"ਇਹ ਸੁਨੇਹੇ ਇਕਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਨੂੰ "
-"ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
+"ਇਹ ਸੁਨੇਹੇ ਇਕਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ "
+"ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
 
 #: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
@@ -11729,64 +11683,64 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
 msgid "This certificate is not viewable"
 msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
 
-#: ../mail/em-format-html-display.c:1172
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ਤੇ ਸਮਾਪਤ"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ:"
 
-#: ../mail/em-format-html-display.c:1183
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ਵੱਲੋਂ %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "ਕਤਾਰ ਵਿੱਚ ਦਰਿਸ਼(_V)"
 
-#: ../mail/em-format-html-display.c:1244
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "ਓਹਲੇ(_H)"
 
-#: ../mail/em-format-html-display.c:1245
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "ਚੌੜਾਈ ਦੇ ਫਿੱਟ(_F)"
 
-#: ../mail/em-format-html-display.c:1246
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "ਅਸਲੀ ਅਕਾਰ ਵੇਖਾਓ(_O)"
 
-#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ਨੱਥੀ"
 
-#: ../mail/em-format-html-display.c:1872
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "ਸਭ ਨੱਥੀਆਂ ਨੂੰ ਫੋਲਡਰ 'ਚ ਸੰਭਾਲੋ"
 
-#: ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d ਨੱਥੀ"
 msgstr[1] "%d ਨੱਥੀ"
 
-#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:2004
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:2065
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "ਕੋਈ ਨੱਥੀ ਨਹੀਂ"
 
@@ -11899,7 +11853,7 @@ msgstr "ਖਬਰਸਾਰ ਸਮੂਹ"
 msgid "%s attachment"
 msgstr "%s ਨੱਥੀ"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸੁਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
@@ -11915,11 +11869,11 @@ msgstr "ਬਹੁਭਾਗ/ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇ�
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਅਣਜਾਣੀ ਗਲਤੀ"
 
@@ -11995,8 +11949,8 @@ msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
-"ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸਥਾਪਨ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ "
-"ਨਿਕਾਰਾ ਹੋ ਗਈ ਹੈ।"
+"ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸਥਾਪਨ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ ਨਿਕਾਰਾ "
+"ਹੋ ਗਈ ਹੈ।"
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
@@ -12049,20 +12003,20 @@ msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ।"
 msgid "Message Filters"
 msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "ਸਿਰਨਾਵਾਂ ਜੋੜ੍ਹੋ"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤੋਂ ਸੁਨੇਹਾ"
@@ -13735,7 +13689,7 @@ msgid "Checking for new mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:681
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
@@ -13820,30 +13774,28 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"quit."
 msgstr ""
 "&quot;{1}&quot; 'ਤੇ ਇੱਕ ਨਾ-ਖਾਲੀ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।\n"
 "\n"
 "ਤੁਸੀਂ ਇਸ ਫੋਲਡਰ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰ ਸਕਦੇ ਹੋ, ਉੱਪਰ ਲਿਖ ਸਕਦੇ ਹੋ ਜਾਂ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਬੰਦ ਕਰ "
-"ਸਕਦੇ ਹੋ।\n"
+"ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
-msgstr ""
-"&quot;{1}&quot; ਲਈ ਪੜਨ ਰਸੀਦ ਸੂਚਨਾ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ। ਕੀ {0} ਨੂੰ ਰਸੀਦ ਸੂਚਨਾ "
-"ਭੇਜਣੀ ਹੈ?"
+msgstr "&quot;{1}&quot; ਲਈ ਪੜਨ ਰਸੀਦ ਸੂਚਨਾ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ। ਕੀ {0} ਨੂੰ ਰਸੀਦ ਸੂਚਨਾ ਭੇਜਣੀ ਹੈ?"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr "ਨਾਂ &quot;{1}&quot; ਨਾਲ ਇੱਕ ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ।"
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13851,141 +13803,141 @@ msgstr ""
 "ਆਪਣੇ ਪੱਤਰ ਦੇ ਵਿਸ਼ੇ ਵਿੱਚ ਕੁਝ ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤੁਹਾਡੇ ਪੱਤਰ ਬਾਰੇ "
 "ਆਸਾਨੀ ਨਾਲ ਸਮਝ ਜਾਦੇ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਖਾਤਾ ਅਤੇ ਇਸ ਦੇ ਸਭ ਪਰਾਕਸੀਆਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "ਕੀ ਤੁਸੀਂ ਖਾਤਾ ਜਾਣਕਾਰੀ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਖਾਤਾ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ ਅਤੇ ਇਸ ਦੇ ਸਭ ਪਰਾਕਸੀਆਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "ਕੀ ਤੁਸੀਂ {0} ਸੁਨੇਹੇ ਇੱਕ ਸਮੇਂ ਹੀ ਖੋਲਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਹਟਾਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚੋਂ ਹਮੇਸ਼ਾ ਲਈ ਸਮਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸਾਰੇ ਹਟਾਏ ਸੁਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਉਣ ਲ਼ਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ HTML ਫਾਰਮੈਟ ਵਿੱਚ ਭੇਜਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੁਨੇਹਾ ਸਿਰਫ BCC ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਹੀ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #  mail:ask-send-no-subject primary
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "ਕੀ ਤੁਸੀਂ ਪੱਤਰ ਨੂੰ ਵਿਸ਼ੇ ਬਿਨਾਂ ਹੀ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "ਕਿਉਕਿ &quot;{0}&quot;।"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "ਕਿਉਕਿ &quot;{2}&quot;।"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "ਖਾਲੀ ਦਸਤਖਤ"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; ਫੋਲਡਰ ਨੂੰ &quot;{1}&quot; ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨਹੀਂ ਬਣ ਸਕਿਆ।"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "ਆਰਜ਼ੀ ਸੰਭਾਲ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "ਆਰਜ਼ੀ ਸੰਭਾਲ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਫੋਲਡਰ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਹ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ &quot;{1}&quot; ਵਿੱਚ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "ਸਰੋਤ &quot;{1}&quot; ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "ਸਰੋਤ &quot;{2}&quot; ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "ਨਿਯਤ &quot;{2}&quot; ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
-"ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। "
-"ਤੁਸੀਂ ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹੁੰਦੇ।"
+"ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। ਤੁਸੀਂ "
+"ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹੁੰਦੇ।"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; ਦਾ ਨਾਂ &quot;{1}&quot; ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਦਾ ਨਾਂ ਤਬਦੀਲ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "ਖਾਤੇ ਲਈ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "ਡਾਇਰੈਕਟਰੀ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "ਦਸਤਖਤ ਸਕ੍ਰਿਪਟ&quot;{0}&quot; ਸੈਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13993,85 +13945,85 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਸਹੀਂ ਤਰਾਂ ਭਰਿਆ ਹੈ। ਇਹ ਯਾਦ ਰੱਖੋ ਕਿ ਗੁਪਤ-ਕੋਡ ਅੱਖਰ ਪ੍ਰਤੀ "
 "ਸੰਵੇਦਨਸ਼ੀਲ ਹੈ, ਤੁਸੀਂ ਸ਼ਾਇਦ ਆਪਣਾ ਕੈਪਸ ਲਾੱਕ ਚਾਲੂ ਕੀਤਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "ਦਸਤਖਤੀ ਫਾਇਲ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "ਕੀ &quot;{0}&quot; ਹਟਾਓਣਾ ਹੈ?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "ਖਾਤਾ ਹਟਾਓ?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "ਕੀ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰਨੀਆਂ ਹਨ?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "ਨਾ ਹਟਾਓ"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "ਅਯੋਗ ਨਾ ਕਰੋ"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ ਕਾਰਵਾਈ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹਿਆ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "ਗੁਪਤ-ਕੋਡ ਭਰੋ।"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "ਫਿਲਟਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ।"
 
 #  mail:async-error-nodescribe primary
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "ਕਾਰਵਾਈ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ।"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "{0} ਦੌਰਾਨ ਗਲਤੀ।"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "ਫਾਇਲ ਮੌਜੂਦ ਤਾਂ ਹੈ, ਪਰ ਇਸ ਉੱਪਰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #  mail:no-write-path-notfile secondary
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "ਫਾਇਲ ਮੌਜੂਦ ਤਾਂ ਹੈ, ਪਰ ਇਹ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
 #  mail:ask-expunge secondary
 #  mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਿਆ ਤਾਂ ਤੁਸੀਂ ਇਹਨਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮੁੜ-ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਫੋਲਡਰ ਹਟਾ ਦਿੱਤਾ ਤਾਂ, ਇਸ ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰਾਂ ਦੇ ਸਾਰੇ ਭਾਗ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਸਭ ਪਰਾਕਸੀ ਖਾਤਾ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14079,11 +14031,11 @@ msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਖਾਤਾ ਜਾਣਕਾਰੀ ਅਤੇ ਸਭ ਪਰਾਕਸੀ ਜਾਣਕਾਰੀ ਨੂੰ\n"
 "ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਖਾਤਾ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14091,19 +14043,19 @@ msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਬੰਦ ਕਰ ਦਿੱਤਾ, ਤਾਂ ਇਹ ਸੁਨੇਹੇ ਉਦੋਂ ਤੱਕ ਭੇਜੇ ਨਹੀਂ ਜਾਣਗੇ, ਜਦੋਂ ਤੱਕ ਕੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਨਹੀਂ "
 "ਕੀਤਾ ਜਾਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "ਅਣਡਿੱਠਾ"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਗਲਤ"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "ਪੱਤਰ-ਫਿਲਟਰ ਸਵੈ-ਚਾਲਿਤ ਹੀ ਨਵੀਨੀਕ੍ਰਿਤ ਕੀਤੇ ਗਏ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14114,35 +14066,35 @@ msgstr ""
 "ਸਿਰਲੇਖ, ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤੁਹਾਨੂੰ ਘੱਟੋ-"
 "ਘੱਟ ਇੱਕ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਪੜੇ ਬਣਾਓ"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ 'ਚ ਸਭ ਸੁਨੇਹੇ ਪੜੇ ਬਣਾਓ"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "ਫੋਲਡਰ ਗੁੰਮ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "ਕੋਈ ਸਰੋਤ ਨਹੀਂ ਚੁਣਿਆ।"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "ਇੱਕੋ ਸਮੇਂ ਇੰਨੇ ਸੁਨੇਹੇ ਖੋਲਣ ਲ਼ਈ ਲੰਮਾ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਖਾਤਾ ਸਥਾਪਨ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਖਾਤਾ ਸਥਾਪਨ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14150,7 +14102,7 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਵੱਲ ਲਈ ਜਾਇਜ ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਦਿਓ। ਤੁਸੀਂ ਵੱਲ ਤੇ ਕਲਿੱਕ ਕਰਕੇ ਈਪੱਤਰ ਸਿਰਨਾਵਾਂ ਖੋਜ "
 "ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14162,48 +14114,48 @@ msgstr ""
 "{0}\n"
 "ਕਿਸੇ ਤਰਾਂ ਭੇਜੋ?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਦਸਤਖਤ ਲਈ ਵਿਲੱਖਣ ਨਾਂ ਦਿਓ।"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ।"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "ਪੁਰਾਣੇ ਪੱਤਰ ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "ਕਿਊਰਿੰਗ ਸਰਵਰ"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਦੀ ਸੂਚੀ ਲਈ ਸਰਵਰ ਨੂੰ ਬੇਨਤੀ ਕੀਤੀ ਗਈ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "ਪੜਨ ਰਸੀਦ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "ਖੋਜ ਫੋਲਡਰਾਂ ਨੂੰ ਸਵੈ-ਚਾਲਤ ਹੀ ਅੱਪਡੇਟ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "ਰਸੀਦ ਭੇਜੋ"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14211,7 +14163,7 @@ msgstr ""
 "ਸਿਸਟਮ ਫੋਲਡਰ Ximian ਈਵੇਲੂਸ਼ਨ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਲਾਜ਼ਮੀ ਹਨ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਤਬਦੀਲ, ਨਾਂ-ਤਬਦੀਲ ਜਾਂ "
 "ਹਟਾਉਣਾ ਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14227,7 +14179,7 @@ msgstr ""
 "ਘੱਟ ਇੱਕ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
 #  mail:vfolder-updated secondary
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14241,7 +14193,7 @@ msgstr ""
 "     &quot;{1}&quot;\n"
 "ਅਤੇ ਅੱਪਡੇਟ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14255,23 +14207,12 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "ਅਤੇ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application. "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors and "
-"resend."
-msgstr ""
-"ਇਹ ਸੁਨੇਹਾ ਬਾਹਰੀ ਕਾਰਜ &quot;sendmail &quot; ਕਾਰਜ ਰਾਹੀ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਸੀ। Sendmail "
-"ਨੇ ਹੇਠ ਲਿਖੀ ਗਲਤੀ ਦਿੱਤੀ ਹੈ: ਹਾਲਤ 67: ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"ਇਹ ਸੁਨੇਹਾ ਬਾਹਰੀ-ਬਕਸਾ (Outbox) ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ। ਸੁਨੇਹੇ ਵਿੱਚ ਗਲਤੀਆਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਮੁੜ ਭੇਜੋ।"
-
 #  mail:signature-notscript secondary
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਮੌਜੂਦ ਅਤੇ ਚੱਲਣਯੋਗ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14279,7 +14220,7 @@ msgstr ""
 "ਇਹ ਫੋਲਡਰ ਲੁਪਤ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਖੋਜ\n"
 "ਫੋਲਡਰ ਸੰਪਾਦਕ ਵਿੱਚ ਜਾ ਕੇ ਇਸ ਨੂੰ ਪਰਤੱਖ ਸ਼ਾਮਿਲ ਕਰੋ, ਜੇ ਲੋੜ ਹੈ ਤਾਂ।"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14287,74 +14228,72 @@ msgstr ""
 "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਜਿਸ ਖਾਤੇ ਨਾਲ ਤੁਸੀਂ ਭੇਜਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ, ਉਹ ਤਾਂ "
 "ਆਯੋਗ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਤੁਸੀਂ ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ ਦਿੱਤਾ ਹੈ"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "ਸਰਵਰ ਇਸ ਤਰਾਂ ਦੀ ਪ੍ਰਮਾਣਿਤ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਅਤੇ ਸਭ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਸਹਾਈ ਵੀ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗਏ ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗਏ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr ""
-"ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ "
-"ਜਾਣਗੇ।"
+msgstr "ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "ਗਰੁੱਪਵਾਇਸ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"ਇਸ ਖਾਤੇ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਕੀ ਇਸ ਦੀ ਬਜਾਏ ਸਿਸਟਮ "
-"ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
+"ਇਸ ਖਾਤੇ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਕੀ ਇਸ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਡਰਾਫਟ ਫੋਲਡਰ "
+"ਵਰਤਿਆ ਜਾਵੇ?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "ਲਾਇਸੈਂਸ ਫਾਇਲ ਪੜਨ ਵਿੱਚ ਆਯੋਗ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "ਮੂਲ ਵਰਤੋਂ(_D)"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "ਮੂਲ ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
 
 #  mail:account-incomplete secondary
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "ਤੁਸੀਂ ਸਾਰੀ ਲਾਜ਼ਮੀ ਜਾਣਕਾਰੀ ਭਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕਈ ਨਾ-ਭੇਜੇ ਸੁਨੇਹੇ ਹਨ, ਕੀ ਤੁਸੀਂ ਕਿਸੇ ਤਰਾਂ ਵੀ ਬਾਹਰ ਆਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "ਤੁਸੀਂ ਇੱਕ ਸਮੇਂ ਦੋ ਖਾਤੇ ਨਹੀਂ ਬਣਾ ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "ਤੁਹਾਨੂੰ ਇਸ ਖੋਜ ਫੋਲਡਰ ਦਾ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "ਤੁਹਾਨੂੰ ਫੋਲਡਰ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14363,27 +14302,23 @@ msgstr ""
 "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸਰੋਤ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।\n"
 "ਜਾਂ ਇੱਕਲਾ-ਇੱਕਲਾ ਫੋਲਡਰ ਚੁਣ ਕੇ ਅਤੇ/ਜਾਂ ਸਾਰੇ ਸਥਾਨਿਕ, ਸਾਰੇ ਰਿਮੋਟ ਫੋਲਡਰ ਜਾਂ ਦੋਵੇਂ ਚੁਣ ਕੇ।"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "ਤੁਹਾਡਾ ਸਰਵਰ &quot;{0}&quot; 'ਤੇ &quot;{0}&quot; ਦੇ ਤੌਰ ਤੇ ਲਾਗਿੰਨ ਅਸਫਲ"
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "ਤੁਹਾਡਾ ਸੁਨੇਹਾ &quot;{0}&quot; ਵਿਸ਼ੇ ਨਾਲ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "ਖੋਲ੍ਹੋ(_A)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "ਨਿਕਾਰਾ(_E)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "ਸੁਨੇਹੇ ਖੋਲੋ(_O)"
 
@@ -14454,7 +14389,7 @@ msgstr "%b %d %Y"
 msgid "Messages"
 msgstr "ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
@@ -14888,24 +14823,24 @@ msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 msgid "Exchange Settings"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਸਥਾਪਨ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਕਿਸਮ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:166
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -14944,7 +14879,7 @@ msgstr "ਨਵਾਂ ਗੁਪਤ-ਕੋਡ:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਗੁਪਤ-ਕੋਡ ਦੀ ਮਿਆਦ ਖਤਮ ਹੋ ਗਈ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਗੁਪਤ-ਕੋਡ ਹੁਣੇ ਬਦਲੋ।"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਦੀ ਮਿਆਦ ਅਗਲੇ %d ਦਿਨਾਂ 'ਚ ਖਤਮ ਹੋਵੇਗੀ"
@@ -15085,14 +15020,14 @@ msgstr "ਐਕਸ਼ਚੇਜ਼ ਫੋਲਡਰ ਲੜੀ"
 msgid "Unsubscribe Folder..."
 msgstr "ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਹਟਾਓ..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ਕੀ ਫੋਲਡਰ \"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
@@ -15526,7 +15461,7 @@ msgstr "ਫੋਲਡਰ ਲੜੀ ਪਰਸੰਗ ਮੇਨੂ ਵਿੱਚ ਪ�
 msgid "Unsubscribe Folders"
 msgstr "ਫੋਲਡਰਾਂ ਲਈ ਨਾ-ਮੈਂਬਰੀ"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "ਜਾਂਚ ਸੂਚੀ"
 
@@ -16653,8 +16588,8 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"ਇੱਕ ਜਾਂਚ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML ਪੱਤਰਾਂ "
-"ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
+"ਇੱਕ ਜਾਂਚ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML "
+"ਪੱਤਰਾਂ ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
 "\n"
 "ਇਹ ਪਲੱਗ-ਇਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾਇਕ ਝਲਕ ਕੋਡ ਹੀ ਹੈ।\n"
 
@@ -16722,7 +16657,7 @@ msgstr "ਟਿਕਾਣੇ"
 msgid "_Publish Calendar Information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਤ(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "ਕੀ ਤੁਸੀਂ URL ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
@@ -17060,64 +16995,68 @@ msgid "Default window height"
 msgstr "ਮੂਲ ਝਰੋਖਾ ਉਚਾਈ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "ਮੂਲ ਝਰੋਖਾ ਹਾਲਤ"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "ਮੂਲ ਝਰੋਖਾ ਚੌੜਾਈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ਭਾਗ ਦਾ ID ਜਾਂ ਉਪਨਾਂ ਨੂੰ ਸ਼ੁਰੂਆਤ ਤੇ ਵੇਖਿਆ ਜਾਇਆ ਕਰੇਗਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "ਆਖਰੀ ਨਵੀਨ ਸੰਰਚਨਾ ਵਰਜਨ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ਫੋਲਡਰ, ਜੋ ਕਿ ਆਫਲ਼ਾਇਨ ਲਈ ਸਮਕਾਲੀ ਕਰਨੇ ਹਨ, ਦੇ ਰਸਤੇ ਦੀ ਸੂਚੀ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "ਪ੍ਰਿੰਟਰ ਸਥਾਪਨ..."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "ਬਾਹੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "ਵਿਕਾਸ ਚੇਤਾਵਨੀ ਪੁੱਛਗਿੱਛ ਵਾਰਤਾਲਾਪ ਛੱਡੋ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "ਈਵੂਲੇਸ਼ਨ ਦਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖਾ ਦੀ ਮੂਲ ਉਚਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹੀ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr ""
-"ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ "
-"(ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
+"ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0"
+"\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17126,35 +17065,39 @@ msgstr ""
 "ਝਰੋਖਾ ਬਟਨਾਂ ਦੀ ਸ਼ੈਲੀ ਹੈ। \"ਪਾਠ\", \"ਆਈਕਾਨ\", \"ਦੋਵੇਂ\", \"ਸੰਦ-ਪੱਟੀ\" ਸੰਭਵ ਹੈ। ਜੇ \"ਸੰਦ-ਪੱਟੀ"
 "\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਸੰਦ-ਪੱਟੀ ਸਥਾਪਨ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦੀ ਸ਼ੈਲੀ ਨਿਰਧਾਰਿਤ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "ਸੰਦਪੱਟੀ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਢੰਗ ਨਾਲ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾਵੇਗਾ, ਨਾਕਿ ਆਨਲਾਇਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "ਕੀ ਝਰੋਖਾ ਅਧਿਕਤਮ ਹੋਵੇ ਜਾਂ ਨਾ।"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "ਕੀ ਬਾਹੀ ਵੇਖਾਈ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਿਕਾਸ ਵਰਜਨ ਵਾਰਤਾਲਾਪ ਨੂੰ ਵੇਖਾਇਆ ਨਾ ਜਾਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "ਕੀ ਝਰੋਖਾ ਬਟਨ ਵੇਖਾਈ ਦੇਣ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "ਝਰੋਖਾ ਬਟਨ ਸ਼ੈਲੀ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "ਝਰੋਖਾ ਬਟਨ ਦਿੱਖ ਹਨ।"
 
@@ -17271,44 +17214,44 @@ msgstr "ਬੱਗ-ਬੱਡੀ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸ
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
-"ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ (amanpreetalam@yahoo.com)\n"
-"ਪੰਜਾਬ ਲੀਨਕਸ ਤਕਨਾਲੋਜੀ (http://punlinux.sf.net)"
+"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n"
+"(aalam@redhat.com)"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "ਆਨਲਾਇਨ(_W)"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
-msgstr "ਆਫਲਾਇਨ(_W)"
+msgstr "ਆਫ਼ਲਾਇਨ(_W)"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "ਆਫਲਾਇਨ"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਨਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਫਲਾਇਨ ਹੋਣ ਲਈ ਦਬਾਓ।"
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਹੋਣ ਦੀ ਕਾਰਵਾਈ ਅਧੀਨ ਹੈ।"
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਨਲਾਇਨ ਜਾਣ ਲਈ ਵਰਤੋਂ।"
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲਈ ਤਬਦੀਲ"
 
 #: ../shell/e-shell.c:633
 msgid "Uknown system error."
-msgstr "ਅਣਪਛਾਤੀ ਸਿਸਟਮ ਗਲਤੀ।"
+msgstr "ਅਣਜਾਣੀ ਸਿਸਟਮ ਗਲਤੀ।"
 
 #: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
@@ -17386,7 +17329,7 @@ msgstr ""
 "ਕਰ ਸਕਦੇ ਹੋ।"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17406,7 +17349,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "ਮਿੱਤਰ, ਈਵੇਲੂਸ਼ਨ ਸਮੂਹ ਉਤਾਪਦ ਦੇ ਇਸ ਪਹਿਲਾਂ ਜਾਰੀ ਵਰਜਨ ਨੂੰ ਡਾਊਨ ਲੋਡ ਕਰਨ\n"
-"ਧੰਨਵਾਦ।\n"
+"ਧੰਨਵਾਦ ਹੈ।\n"
 "\n"
 "ਈਵੇਲੂਸ਼ਨ ਦਾ ਇਹ ਵਰਜਨ ਸੰਪੂਰਨ ਨਹੀਂ ਹੈ, ਇਸ ਨੂੰ ਬਣਾ ਤਾਂ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਪਰ\n"
 "ਇਸ ਦੇ ਕਈ ਫੀਚਰ ਤਾਂ ਸਮਾਪਤ ਨਹੀਂ ਹੋਏ ਜਾਂ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰਦੇ ਹਨ।\n"
@@ -17415,13 +17358,13 @@ msgstr ""
 "ਵਰਜਨ ਹਟਾਉਣਾ ਪਵੇਗਾ ਅਤੇ ਇਸ ਦੀ ਬਜਾਏ %s ਵਰਜਨ ਇੰਸਟਾਲ ਕਰੋ।\n"
 "\n"
 "ਜੇਕਰ ਤੁਸੀਂ ਬੱਗ ਲੱਭ ਲਿਆ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਦੀ ਸੂਚਨਾ bugzilla.gnome.com\n"
-"ਤੇ ਦਿਓ। ਇਹ ਉਤਾਪਦ ਬਿਨਾਂ ਕਿਸੇ ਵਾਰੰਟੀ ਦੇ ਹੈ ਅਤੇ ਕਿਸੇ ਦੇ ਗੁੱਸੇ ਲਈ ਜਿੰਮਵਾਰ\n"
+"ਤੇ ਦਿਓ। ਇਹ ਉਤਾਪਦ ਬਿਨਾਂ ਕਿਸੇ ਵਾਰੰਟੀ ਦੇ ਹੈ ਅਤੇ ਕਿਸੇ ਦੇ ਗੁੱਸੇ ਲਈ ਜਿੰਮੇਵਾਰ\n"
 "ਨਹੀਂ ਹੈ।\n"
 "\n"
 "ਸਾਨੂੰ ਉਮੀਦ ਹੈ ਮਿੱਤਰ ਤੂੰ ਸਾਡੀ ਮੇਹਨਤ ਦਾ ਆਨੰਦ ਮਾਣੇਗਾ ਅਤੇ ਅਸੀਂ ਤੇਰੇ ਇਸ ਸਹਿਯੋਗ ਦਾ\n"
-"ਤਹਿ ਦਿਲੋਂ ਧੰਨਵਾਦ ਕਰਦੇ ਹਾਂ\n"
+"ਤਹਿ ਦਿਲੋਂ ਧੰਨਵਾਦ ਕਰਦੇ ਹਾਂ।\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17429,35 +17372,35 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "ਈਵੇਲੂਸ਼ਨ ਟੀਮ\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਦੱਸੋ"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਖਾਸ ਭਾਗ ਦੀ ਸਰਗਰਮੀ ਨਾਲ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "ਆਨਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "ਸਭ ਈਵੇਲੂਸ਼ਨ ਭਾਗ ਮਜਬੂਰ ਕਰਕੇ ਬੰਦ ਕਰੋ"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ਈਵੇਲੂਸ਼ਨ ੧.੪ ਤੋਂ ਮਜਬੂਰ ਕਰਕੇ ਵਾਪਿਸ"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰੇ ਭਾਗਾਂ ਦੀ ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਇੱਕ ਫਾਇਲ ਵਿੱਚ ਭੇਜੋ।"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "ਕੋਈ ਪਲੱਗ-ਇਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17472,11 +17415,11 @@ msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਯਾਦ ਰੱਖੇ ਹੋਏ ਗੁਪ
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
-msgstr "ਜਾਰੀ"
+msgstr "ਜਾਰੀ ਰੱਖੋ"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
-msgstr "ਵਰਜਨ {0} ਦਾ ਪੁਰਾਣਾ ਡਾਟਾ ਹਟਾਓ?"
+msgstr "ਕੀ ਵਰਜਨ {0} ਦਾ ਪੁਰਾਣਾ ਡਾਟਾ ਹਟਾਓਣਾ ਹੈ?"
 
 #: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
@@ -17517,8 +17460,8 @@ msgstr ""
 "ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਦੀ ਹੈ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਪੱਤਰ, ਸੰਪਰਕ ਤੇ ਕੈਲੰਡਰ ਡਾਟਾ, ਜੋ ਵੀ ਮੌਜੂਦ ਹੈ, ਦੀ ਖੁਦ ਜਾਂਚ "
 "ਕਰ ਲਵੋ ਅਤੇ ਇਹ ਵੀ ਕੇ ਈਵੇਲੂਸ਼ਨ ਇਸ ਪੁਰਾਣੇ ਡਾਟਾ ਨਾਲ ਪਹਿਲਾਂ ਠੀਕ ਕੰਮ ਕਰਦਾ ਸੀ।\n"
 "\n"
-"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, "
-"ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਖੁਦ ਨਾ ਵਰਤੋਂ।\n"
+"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਖੁਦ "
+"ਨਾ ਵਰਤੋਂ।\n"
 
 #: ../shell/shell.error.xml.h:15
 msgid ""
@@ -17531,9 +17474,9 @@ msgid ""
 msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੇ ਡਾਟਾ ਕਿਸੇ ਵੱਖਰੇ ਟਿਕਾਣੇ ਉੱਤੇ ਸੰਭਾਲਿਆ ਸੀ।\n"
 "\n"
-"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ "
-"ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚੁਣਿਆ, ਤਾਂ "
-"ਤੁਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
+"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ "
+"ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚੁਣਿਆ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;"
+"evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -17547,8 +17490,8 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"ਤੁਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸਥਾਪਨ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ "
-"{1} ਉਪਲੱਬਧ ਹੈ।\n"
+"ਤੁਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸਥਾਪਨ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ {1} ਉਪਲੱਬਧ "
+"ਹੈ।\n"
 "\n"
 "ਤੁਹਾਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਹੋਰ ਥਾਂ ਬਣਾਉਣ ਦੀ ਲੋੜ ਹੈ।"
 
@@ -19929,7 +19872,7 @@ msgid "_Edit..."
 msgstr "ਸੋਧ(_E)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20054,17 +19997,17 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
@@ -20319,15 +20262,15 @@ msgstr "ਨਿੱਜੀ ਰਿਕਾਰਡ ਸਮਕਾਲੀ:"
 msgid "Sync Categories:"
 msgstr "ਵਰਗ ਸਮਕਾਲੀ:"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "ਖਾਲੀ ਸੁਨੇਹਾ"
 
-#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr "ਮੁੜ-ਵਹਾ ਮਾਡਲ"
 
-#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
@@ -20371,12 +20314,12 @@ msgstr "ਪਾਠ"
 msgid "Find _Now"
 msgstr "ਹੁਣ ਖੋਜ(_N)"
 
-#: ../widgets/misc/e-selection-model-array.c:546
+#: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
-#: ../widgets/misc/e-selection-model-array.c:553
+#: ../widgets/misc/e-selection-model-array.c:554
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "ਕਰਸਰ ਕਾਲਮ"
@@ -20569,23 +20512,23 @@ msgstr "ਕੇਂਦਰਿਤ ਕਾਲਮ"
 msgid "Unselected Column"
 msgstr "ਨਾ-ਚੁਣਿਆ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1744
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "ਕਾਲਮ ਵਿੰਨੋ"
 
-#: ../widgets/table/e-cell-text.c:1751
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "ਕਾਲਮ ਹੇਠ ਰੇਖਾ"
 
-#: ../widgets/table/e-cell-text.c:1758
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "ਗੂੜਾ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1765
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "ਕਾਲਮ ਰੰਗ"
 
-#: ../widgets/table/e-cell-text.c:1779
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "BG ਰੰਗ ਕਾਲਮ"
 
@@ -20633,6 +20576,7 @@ msgid "Sh_ow these fields in order:"
 msgstr "ਇਹ ਫੋਲਡਰ ਕਰਮ ਵਿੱਚ ਵੇਖਾਓ(_o):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "ਖੇਤਰ ਵੇਖਾਓ"
@@ -20691,6 +20635,10 @@ msgstr "ਨਾ ਕ੍ਰਮਬੱਧ"
 msgid "No grouping"
 msgstr "ਨਾ ਵਰਗੀਕ੍ਰਿਤ"
 
+#: ../widgets/table/e-table-config.c:584
+msgid "Available Fields"
+msgstr "ਉਪਲੱਬਧ ਖੇਤਰ"
+
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "ਇੰਞ ਗਰੁੱਪ(_G)..."
@@ -20702,14 +20650,14 @@ msgstr "ਇਹ ਫੋਲਡਰ ਲੜੀਬੱਧ ਵੇਖਾਓ(_S):"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD ਕੋਡ"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "ਪੂਰਾ ਸਿਰਲੇਖ"
 
@@ -20753,7 +20701,7 @@ msgstr "%s (%d ਇਕਾਈਆਂ)"
 #: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "ਬਦਲਵਾਂ ਕਤਾਰ ਰੰਗ"
 
@@ -20761,7 +20709,7 @@ msgstr "ਬਦਲਵਾਂ ਕਤਾਰ ਰੰਗ"
 #: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
 #: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "ਖਿਤਿਜੀ ਗਰਿੱਡ ਬਣਾਓ"
@@ -20770,7 +20718,7 @@ msgstr "ਖਿਤਿਜੀ ਗਰਿੱਡ ਬਣਾਓ"
 #: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "ਲੰਬਕਾਰੀ ਗਰਿੱਡ ਬਣਾਓ"
@@ -20779,7 +20727,7 @@ msgstr "ਲੰਬਕਾਰੀ ਗਰਿੱਡ ਬਣਾਓ"
 #: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "ਕੇਂਦਰ ਬਣਾਓ"
@@ -20788,7 +20736,7 @@ msgstr "ਕੇਂਦਰ ਬਣਾਓ"
 #: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "ਕਰਸਰ ਢੰਗ"
 
@@ -20796,7 +20744,7 @@ msgstr "ਕਰਸਰ ਢੰਗ"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "ਚੋਣ ਨਮੂਨਾ"
 
@@ -20804,7 +20752,7 @@ msgstr "ਚੋਣ ਨਮੂਨਾ"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
 #: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
 #: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
@@ -20814,7 +20762,7 @@ msgstr "ਮੁੱਢਲੀ ਲੰਬਾਈ"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
 #: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
@@ -20875,31 +20823,31 @@ msgstr "ਕਾਲਮ ਫਾਰਮੈਟ..."
 msgid "Customize Current View..."
 msgstr "ਮੌਜੂਦਾ ਦਰਿਸ਼ ਪਸੰਦ..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "ਫੋਂਟ-ਸਮੂਹ"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "ਕਰਮਬੱਧ ਜਾਣਕਾਰੀ"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "ਲੜੀ"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "ਸਾਰਣੀ ਸਿਰਲੇਖ"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "ਸਾਰਣੀ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
diff --git a/po/pt.po b/po/pt.po
index b45c5cb65c..3116140a28 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-10 23:24+0000\n"
-"PO-Revision-Date: 2006-03-10 23:30+0000\n"
+"POT-Creation-Date: 2006-03-10 23:36+0000\n"
+"PO-Revision-Date: 2006-03-10 23:40+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -2526,15 +2526,15 @@ msgstr "Alterado"
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Seleccione uma imagem para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2542,7 +2542,7 @@ msgstr ""
 "Os dados do contacto são inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2570,7 +2570,7 @@ msgstr "_Seleccione o Livro de Endereços"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar a lista de contactos (%s)?"
@@ -2587,7 +2587,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar este contacto (%s)?"
@@ -16472,7 +16472,7 @@ msgstr "Formatador Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; delegou a reunião. Deseja adicionar o delegado &quot;{1}"
 "&quot;?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 14d14097cb..f195ac584e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 06:32+0100\n"
-"PO-Revision-Date: 2005-08-24 23:21-0300\n"
-"Last-Translator: Afonso Celso Medina <afmedina@uol.com.br>\n"
+"POT-Creation-Date: 2006-03-10 23:54-0300\n"
+"PO-Revision-Date: 2006-03-10 21:12-0300\n"
+"Last-Translator: Leandro A. F. Pereira <leandro@linuxmag.com.br>\n"
 "Language-Team: Português/Brasil <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,23 +87,23 @@ msgstr "visão de evento da agenda"
 msgid "Grab Focus"
 msgstr "Capturar foco"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "Novo Compromisso"
 
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "Novo Evento de Dia Inteiro"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "Ir para Hoje"
 
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "Ir para Data"
 
@@ -112,32 +112,32 @@ msgstr "Ir para Data"
 msgid "a table to view and select the current time range"
 msgstr "uma tabela para ver e selecionar o intervalo de tempo corrente"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Tem %d evento."
 msgstr[1] "Tem %d eventos."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Não tem eventos."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Visão de Semana Útil: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Visão de Dia: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "visão de agenda para uma semana útil"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "visão de agenda para um ou mais dias"
 
@@ -154,8 +154,8 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:322
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -186,8 +186,8 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:336
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -213,21 +213,21 @@ msgstr "Botão de salto"
 msgid "Click here, you can find more events."
 msgstr "Clique aqui, você pode encontrar mais eventos."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Visão de Mês: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Visão de Semana: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "visão de agenda para um mês"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "visão de agenda para uma ou mais semanas"
 
@@ -279,7 +279,7 @@ msgstr "Célula de Tabela"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
+#: ../widgets/table/e-table-click-to-add.c:574
 msgid "click to add"
 msgstr "clique para adicionar"
 
@@ -546,30 +546,30 @@ msgstr "Configure aqui o autocompletar"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1344
+#: ../addressbook/gui/component/addressbook-view.c:1334
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:629
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "Contatos"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+msgid "Evolution Address Book"
 msgstr "Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+msgid "Evolution Address Book address pop-up"
 msgstr "Pop-up de endereços do Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+msgid "Evolution Address Book address viewer"
 msgstr "Visualizador de endereços do Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+msgid "Evolution Address Book card viewer"
 msgstr "Visualizador de cartões do Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
+msgid "Evolution Address Book component"
 msgstr "Componente do Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
@@ -587,7 +587,7 @@ msgstr "Gerencie aqui os seus certificados S/MIME"
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:141
-#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:209
 #: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
@@ -603,20 +603,19 @@ msgstr "Neste Computador"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:149
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:217
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1054 ../mail/mail-config.c:87
-#: ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:159
-#: ../addressbook/gui/component/addressbook-migrate.c:525
+#: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "Em servidores LDAP"
 
@@ -637,7 +636,7 @@ msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contatos"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Novo Catálogo de Endereços"
 
@@ -649,8 +648,8 @@ msgstr "Catálogo de _Endereços"
 msgid "Create a new address book"
 msgstr "Criar um novo catálogo de endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:386
-msgid "Failed upgrading Addressbook settings or folders."
+#: ../addressbook/gui/component/addressbook-component.c:406
+msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Falha ao atualizar as pastas ou configurações do Catálogo de Endereços."
 
@@ -664,50 +663,52 @@ msgstr "Base"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr ""
 "Copiar o conteúdo do catálogo localmente para funcionamento desconectado"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Geral"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
-msgid "Addressbook"
+msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Informação do Servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Procurando"
 
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Baixando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Propriedades do Catálogo de Endereços"
@@ -723,15 +724,15 @@ msgstr "Migrando..."
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:653
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:768
+#: ../addressbook/gui/component/addressbook-migrate.c:744
 msgid "Autocompletion Settings"
 msgstr "Configurações do Autocompletar"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1143
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -743,7 +744,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -753,7 +754,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1166
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -763,7 +764,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1176
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -775,54 +776,54 @@ msgstr ""
 "Por favor, aguarde enquanto o Evolution migra os dados de sincronização com "
 "pilot..."
 
-#: ../addressbook/gui/component/addressbook-view.c:444
+#: ../addressbook/gui/component/addressbook-view.c:434
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: ../addressbook/gui/component/addressbook-view.c:447
+#: ../addressbook/gui/component/addressbook-view.c:437
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Renomear Pasta"
 
-#: ../addressbook/gui/component/addressbook-view.c:452
+#: ../addressbook/gui/component/addressbook-view.c:442
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "O nome da pasta não pode conter o caractere '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:455
+#: ../addressbook/gui/component/addressbook-view.c:445
 msgid "A Folder with this name already exists"
 msgstr "Uma pasta com este nome já existe"
 
-#: ../addressbook/gui/component/addressbook-view.c:963
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Novo Catálogo de Endereços"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:964
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1196
-#: ../calendar/gui/e-calendar-view.c:1628 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
 #: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: ../addressbook/gui/component/addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Salvar como Vcard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:968
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1355
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Seletor de Fonte de Contatos"
 
@@ -940,7 +941,7 @@ msgid "Add Address Book"
 msgstr "Adicionar Catálogo de Endereços"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
+#: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Sempre"
 
@@ -975,31 +976,46 @@ msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
+#: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "Nunca"
 
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:304
+msgid "No encryption"
+msgstr "Sem criptografia"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Um"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:312
+msgid "SSL encryption"
+msgstr "Criptografado (SSL)"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtro de Pesquisa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_Base de pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Filtro de pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtro de pesquisa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1009,47 +1025,51 @@ msgstr ""
 "pesquisa é feita. Se não for modificado, o padrão é procurar no objectclass "
 "do tipo \"pessoa\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL."
 msgstr ""
 "A seleção desta opção significa que o Evolution apenas se conectará ao seu "
-"servidor LDAP se este suportar SSL ou TLS."
+"servidor LDAP se este suportar SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 msgstr ""
-"A seleção desta opção significa que o Evolution apenas tentará usar SSL/TLS "
-"se você estiver em um ambiente inseguro. Por exemplo, se você e seu servidor "
-"LDAP estiverem atrás de uma firewall no trabalho, então o Evolution não "
-"precisa usar SSL/TLS, pois a sua conexão já é segura."
+"A seleção desta opção significa que o Evolution apenas se conectará ao seu "
+"servidor LDAP se este suportar TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 msgstr ""
 "A seleção desta opção significa que o seu servidor não suporta nem SSL nem "
 "TLS.  Isto significa que a sua conexão será insegura e que você estará "
 "vulnerável a falhas de segurança. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de Pesquisa Suportadas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:308
+msgid "TLS encryption"
+msgstr "Criptografado (TLS)"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
@@ -1057,7 +1077,7 @@ msgstr ""
 "suas pesquisas começarão. Se você deixar este campo vazio as pesquisas "
 "começarão na raiz da árvore do diretório."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1070,7 +1090,7 @@ msgstr ""
 "pesquisa de \"um\" incluirá apenas as entradas que estão um nível abaixo da "
 "sua base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1078,7 +1098,7 @@ msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
 "minhaempresa.com.br\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1086,7 +1106,7 @@ msgstr ""
 "Este é o número máximo de entradas a serem baixadas. Atribuir um valor muito "
 "grande a este número diminuirá a velocidade de seu catálogo de endereços."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1095,7 +1115,7 @@ msgstr ""
 "Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
 "\"Endereço de Email\" requer acesso anônimo ao seu servidor LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1103,7 +1123,7 @@ msgstr ""
 "Este é o nome deste servidor que aparecerá na lista de pastas do Evolution. "
 "Ele é usado apenas para exibição. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1113,79 +1133,74 @@ msgstr ""
 "lista de portas padrão foi fornecida. Pergunte ao seu administrador de "
 "sistemas qual porta você deve escolher."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Usando distinguished name (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Usando endereço de email"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-#: ../mail/em-account-editor.c:303
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Quando Possível"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Adicionar Catálogo de Endereços"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Limite de transferência:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "Localizar Bases de Pesquisa _Possíveis"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "Método de _login:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../calendar/gui/dialogs/calendar-setup.c:244
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Escopo da pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Tempo limite:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Usar conexão segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartões"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:1987
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1198,7 +1213,6 @@ msgstr "minutos"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
@@ -1265,9 +1279,9 @@ msgid "Contact"
 msgstr "Contato"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:568
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2406
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Editor de Contatos"
 
@@ -1310,7 +1324,7 @@ msgstr "Telefone"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
-#: ../mail/mail-config.c:86 ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Trabalho"
 
@@ -1332,12 +1346,13 @@ msgid "_Birthday:"
 msgstr "Aniver_sário:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "Agen_da:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Categorias"
 
@@ -1443,9 +1458,9 @@ msgstr "Endereço"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3612
-#: ../widgets/text/e-text.c:3613
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Editável"
 
@@ -2418,9 +2433,9 @@ msgid "Zimbabwe"
 msgstr "Zimbábue"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:42
 #: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
@@ -2452,7 +2467,7 @@ msgstr "Serviço"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Local"
@@ -2510,21 +2525,21 @@ msgstr "Campos Necessários"
 msgid "Changed"
 msgstr "Alterado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:563
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2401
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contatos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2739
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Por favor, selecione uma imagem para este contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2532,7 +2547,7 @@ msgstr ""
 "Os dados do contato são inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contato inválido."
 
@@ -2689,8 +2704,8 @@ msgstr "Serviço de M_I:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:216
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "_Local:"
 
@@ -2739,7 +2754,7 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
@@ -2794,11 +2809,28 @@ msgstr ""
 "O nome ou email deste contato já existe nesta pasta.\n"
 "Você deseja adicioná-lo mesmo assim?"
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
-#: ../widgets/misc/e-filter-bar.c:162
-msgid "Advanced Search"
-msgstr "Pesquisa Avançada"
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
+msgid "Any field contains"
+msgstr "Qualquer campo contém"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Categoria é"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "Email começa com"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr "Nome começa com"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
@@ -2813,7 +2845,7 @@ msgstr[1] "%d contatos"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -2824,12 +2856,12 @@ msgid "Error getting book view"
 msgstr "Erro ao obter visão do catálogo"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
 #: ../widgets/table/e-tree-selection-model.c:825
 #: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Modelo"
 
@@ -2837,139 +2869,108 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartão"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Name begins with"
-msgstr "Nome começa com"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-msgid "Email begins with"
-msgstr "Email começa com"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:50
-msgid "Category is"
-msgstr "Categoria é"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Any field contains"
-msgstr "Qualquer campo contém"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:174
-msgid "Advanced..."
-msgstr "Avançado..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
-msgid "_Advanced..."
-msgstr "_Avançado..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Fonte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:479
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:550
-msgid "Address Book"
-msgstr "Catálogo de Endereços"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2051
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Salvar como VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1093
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1606 ../calendar/gui/e-memo-table.c:854
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "A_brir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Novo Contato..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Nova _Lista de Contatos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Salvar como VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Encaminhar Contato"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Encaminhar Contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Enviar _Mensagem ao Contato"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Enviar _Mensagem à Lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Enviar _Mensagem aos Contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Copiar para o Catálogo de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver para o Catálogo de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Recor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1184
-#: ../calendar/gui/e-calendar-view.c:1613 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3102
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "C_olar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Qualquer Categoria"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1786
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "Imprimir cartões"
 
@@ -3002,7 +3003,7 @@ msgid "Car Phone"
 msgstr "Telefone do Carro"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3108,9 +3109,9 @@ msgstr "Rádio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:490
+#: ../calendar/gui/e-meeting-list-view.c:497
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "Papel"
 
@@ -3147,31 +3148,31 @@ msgstr "Sítio da Web"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
+#: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Largura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Altura"
 
@@ -3376,8 +3377,8 @@ msgstr "Protocolo não suportado"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2377
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3388,7 +3389,7 @@ msgstr "Não foi possível cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "A autenticação falhou"
 
@@ -3691,19 +3692,19 @@ msgstr "Importador CSV e Tab do Evolution"
 msgid "Importing ..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de Troca de Dados LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Importador VCard do Evolution"
 
@@ -3712,12 +3713,12 @@ msgstr "Importador VCard do Evolution"
 msgid "Print envelope"
 msgstr "Imprimir envelope"
 
-#: ../addressbook/printing/e-contact-print.c:1033
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Imprimir contatos"
 
-#: ../addressbook/printing/e-contact-print.c:1124
-#: ../addressbook/printing/e-contact-print.c:1152
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Imprimir contato"
 
@@ -3762,11 +3763,11 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Cabeçalho"
@@ -3870,9 +3871,9 @@ msgstr "Sombreamento"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:965
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:199
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "Tamanho:"
 
@@ -4144,8 +4145,8 @@ msgid "Delete task list '{0}'?"
 msgstr "Excluir a lista de tarefas '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Do not Send"
-msgstr "Não Enviar"
+msgid "Do _not Send"
+msgstr "_Não Enviar"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the appointment?"
@@ -4212,15 +4213,6 @@ msgstr ""
 "não saber que a tarefa foi excluída."
 
 #: ../calendar/calendar.error.xml.h:39
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Send"
-msgstr "Enviar"
-
-#: ../calendar/calendar.error.xml.h:40
-msgid "Send Notice"
-msgstr "Enviar Notificação"
-
-#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4228,7 +4220,7 @@ msgstr ""
 "Enviar informação atualizada permite que os outros participantes mantenham "
 "as suas agendas atualizadas."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4236,7 +4228,7 @@ msgstr ""
 "Enviar informação atualizada permite que os outros participantes mantenham "
 "as suas listas de tarefas atualizadas."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4244,7 +4236,7 @@ msgstr ""
 "Existem alguns anexos sendo baixados. Salvar o compromisso agora causará a "
 "perda destes anexos."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4252,81 +4244,85 @@ msgstr ""
 "Existem alguns anexos sendo baixados. Salvar a tarefa agora causará a perda "
 "destes anexos."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Alguns recursos podem não funcionar corretamente com a versão do seu "
 "servidor atual"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "A agenda do Evolution terminou de forma inesperada."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution terminaram de forma inesperada."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "A agenda não está configurada para uso desconectado."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:47
 msgid "The calendar you have selected is read-only"
 msgstr "A agenda que você selecionou é apenas para leitura"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "A lista de memorandos não está configurada para uso desconectado"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas não está configurada para uso desconectado."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
 msgstr "Esta agenda será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de memorandos será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Você deseja salvar as alterações realizadas neste compromisso?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to save your changes to this memo?"
+msgstr "Você deseja salvar as alterações realizadas nesta tarefa?"
+
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this task?"
 msgstr "Você deseja salvar as alterações realizadas nesta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "Você deseja enviar um aviso de cancelamento deste item de diário?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Você deseja enviar um aviso de cancelamento a todos os participantes?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Você deseja enviar convites de reunião aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send this task to participants?"
 msgstr "Você deseja enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Você deseja enviar informação atualizada de reunião aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
 msgstr "Você deseja enviar informação atualizada de tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:62
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4336,12 +4332,16 @@ msgstr ""
 "problemas utilizando o Evolution. Para os melhores resultados o servidor "
 "deve ser atualizado para uma versão suportada"
 
+#: ../calendar/calendar.error.xml.h:63
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Você fez alterações neste compromisso, mas ainda não as salvou."
+
 #: ../calendar/calendar.error.xml.h:64
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "Você fez alterações a este compromisso, mas ainda não as salvou."
+msgid "You have changed this task, but not yet saved it."
+msgstr "Você fez alterações nesta tarefa, mas ainda não as salvou."
 
 #: ../calendar/calendar.error.xml.h:65
-msgid "You have made changes to this task, but not yet saved them."
+msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Você fez alterações nesta tarefa, mas ainda não as salvou."
 
 #: ../calendar/calendar.error.xml.h:66
@@ -4369,16 +4369,20 @@ msgid "_Save Changes"
 msgstr "_Salvar Alterações"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "_Enviar"
 
 #: ../calendar/calendar.error.xml.h:72
+msgid "_Send Notice"
+msgstr "_Enviar Notificação"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
 #: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:48
+#: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Digite a senha"
 
@@ -4425,7 +4429,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Não foi possível escrever os dados do aplicativo de tarefas do pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Agenda e Tarefas"
 
@@ -4472,18 +4476,19 @@ msgid "Memo_s"
 msgstr "Memorando_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:530
-#: ../calendar/gui/memos-component.c:1000 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Memorandos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1833
-#: ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1015 ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:635
+#: ../plugins/exchange-operations/exchange-folder.c:591
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4504,9 +4509,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Serviço de notificação de alarme da Agenda do Evolution"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
@@ -4535,10 +4537,10 @@ msgstr "Compromissos"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1270
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1276
-#: ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
+#: ../calendar/gui/e-itip-control.c:1113
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Local:"
 
@@ -4547,17 +4549,17 @@ msgid "Snooze _time:"
 msgstr "_Tempo de adiamento:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:39
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "E_ditar"
 
@@ -4569,32 +4571,32 @@ msgstr "_Adiar"
 msgid "location of appointment"
 msgstr "localização do compromisso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1109
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1252
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Sem resumo disponível."
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1118
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1120
 msgid "No description available."
 msgstr "Sem descrição disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Sem informação de local disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1186
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Você tem %d alarmes"
 
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1370
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Alerta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1350
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4606,7 +4608,7 @@ msgstr ""
 "com notificações por e-mail. Em lugar disso, o Evolution\n"
 "exibirá uma caixa de diálogo de lembrete normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1376
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4623,7 +4625,7 @@ msgstr ""
 "\n"
 "Você tem certeza que deseja executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1390
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Não me pergunte sobre este programa novamente."
 
@@ -4639,61 +4641,34 @@ msgstr "Não foi possível criar a fábrica de serviço de notificação de alar
 msgid "invalid time"
 msgstr "hora inválida"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58 ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d segundos)"
-
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:992 ../calendar/gui/misc.c:111
-msgid "second"
-msgstr "segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "segundos"
-
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
-#, c-format
-msgid " %u second"
-msgstr " %u segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
-#, c-format
-msgid " %u seconds"
-msgstr " %u segundos"
-
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
-#, c-format
-msgid " %u minute"
-msgstr " %u minuto"
-
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
 #, c-format
-msgid " %u minutes"
-msgstr " %u minutos"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
 #, c-format
-msgid "%u hour"
-msgstr "%u hora"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
 
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
 #, c-format
-msgid "%u hours"
-msgstr "%u horas"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -5105,12 +5080,12 @@ msgstr "Comentário contém"
 msgid "Location contains"
 msgstr "Local contém"
 
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Não combinadas"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2514
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:18
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
@@ -5118,14 +5093,14 @@ msgstr "Imprimir"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2123
-#: ../plugins/exchange-operations/exchange-folder.c:623
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:579
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Agenda"
@@ -5236,7 +5211,6 @@ msgid "New calendar"
 msgstr "Nova agenda"
 
 #: ../calendar/gui/calendar-component.c:1482
-#: ../calendar/gui/dialogs/event-page.c:872
 msgid "Cale_ndar"
 msgstr "Age_nda"
 
@@ -5260,22 +5234,26 @@ msgstr "Visão de Semana"
 msgid "Month View"
 msgstr "Visão de Mês"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Method not supported when opening the calendar"
 msgstr "Método não suportado ao abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr "Permissão negada para abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "Editar Alarme"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarme</b>\t"
@@ -5305,17 +5283,17 @@ msgid "Mes_sage:"
 msgstr "Men_sagem:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
 msgstr "Tocar um som"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Pop up an alert"
 msgstr "Exibir um alerta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:461
+#: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "Executar um programa"
 
@@ -5324,7 +5302,7 @@ msgid "Send To:"
 msgstr "Enviar Para:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:457
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "Enviar um email"
 
@@ -5352,8 +5330,10 @@ msgstr "após"
 msgid "before"
 msgstr "antes"
 
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "dia(s)"
 
@@ -5377,7 +5357,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Ação/Gatilho"
 
@@ -5388,7 +5368,7 @@ msgstr "A_dicionar"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmes"
 
@@ -5414,7 +5394,7 @@ msgstr "Propriedades do Anexo"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1165
+#: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5433,7 +5413,7 @@ msgstr "Nome do arquivo:"
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:470
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Agendas que devem ter alarmes"
 
@@ -5469,7 +5449,6 @@ msgstr "<span weight=\"bold\">Servidor Livre/Ocupado Padrão</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Geral</span>"
@@ -5495,14 +5474,14 @@ msgid "Display"
 msgstr "Exibição"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:566
+#: ../calendar/gui/dialogs/event-editor.c:572
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Livre/Ocupado"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -5517,8 +5496,8 @@ msgstr ""
 "Dias"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -5542,7 +5521,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
@@ -5551,8 +5530,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/recurrence-page.c:1052
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -5569,8 +5548,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Exibir _números da semana no navegador de datas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -5587,13 +5566,13 @@ msgid "Template:"
 msgstr "Modelo:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Quinta-feira"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "F_uso horário:"
 
@@ -5602,127 +5581,128 @@ msgid "Time format:"
 msgstr "Formato de hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Terça-feira"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "W_eek starts:"
-msgstr "A sema_na começa na:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
+#. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr "A sema_na começa na:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Dias úteis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ação ao apagar itens"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir finais de semana na visão de mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_O dia começa às:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "Se_x"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas concluídas após"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Seg"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "Ta_refas atrasadas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "Sá_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "Exibir _hora de término de compromissos nas visões de semana e mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "_Frações de tempo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_Ter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Qua"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:287
+#: ../calendar/gui/dialogs/calendar-setup.c:288
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Copiar o conteúdo da agenda localmente para funcionamento desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Copy task list contents locally for offline operation"
 msgstr ""
 "Copiar o conteúdo da lista de tarefas localmente para funcionamento "
 "desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Copy memo list contents locally for offline operation"
 msgstr ""
 "Copiar o conteúdo da lista de memorandos localmente para funcionamento "
 "desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_or:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Lista de Memorandos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Propriedades da Agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Nova Agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Propriedades da Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 #: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Nova Lista de Memorandos"
@@ -5811,158 +5791,161 @@ msgstr "%s  Você não fez alterações, atualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validação: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2276
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Concluída "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2278
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Concluída "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2283
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2285
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2854
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensagem anexa - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2859
-#: ../composer/e-msg-composer.c:3038
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensagem anexa"
 msgstr[1] "%d mensagens anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3103
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1730
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3105
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1732
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Cancelar _Arraste"
 
-#: ../calendar/gui/dialogs/comp-editor.c:806
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2483
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Esconder _Barra de Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:985
-#: ../calendar/gui/dialogs/comp-editor.c:1457
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Exibir _Barra de Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094
-#: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/meeting-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3601
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3602 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3604
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Adicionar anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1481
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
-"Botão de Anexo: Pressione a tecla de espaço para alternar a barra de anexos"
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
+msgid "Show Attachments"
+msgstr "Exibir Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:1469
+msgid "Press space key to toggle attachment bar"
+msgstr "Pressione a barra de espaço para exibir ou esconder a barra de anexos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editar Compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../calendar/gui/dialogs/comp-editor.c:2137
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunião - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2096
-#: ../calendar/gui/dialogs/comp-editor.c:2139
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2100
-#: ../calendar/gui/dialogs/comp-editor.c:2143
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa Atribuída - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2145
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de diário - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2116
-#: ../calendar/gui/dialogs/comp-editor.c:2158
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2668
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:156
-#: ../mail/em-utils.c:502 ../mail/em-utils.c:539
-#: ../widgets/misc/e-attachment-bar.c:342
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
+#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2761
-#: ../calendar/gui/dialogs/comp-editor.c:2818
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As alterações feitas a este item poderão ser descartadas se houver uma "
 "atualização"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Impossível usar a versão atual!"
 
@@ -6039,19 +6022,31 @@ msgstr "Delegar Para:"
 msgid "Enter Delegate"
 msgstr "Especificar Representante"
 
-#: ../calendar/gui/dialogs/event-editor.c:541
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Compro_misso"
 
-#: ../calendar/gui/dialogs/event-editor.c:545
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Recorrência"
 
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
+msgid "This event has alarms"
+msgstr "Este evento possui alarmes"
+
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Age_nda:"
+
 #: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:446
-msgid "Or_ganizer"
-msgstr "Or_ganizador"
+msgid "Or_ganizer:"
+msgstr "Or_ganizador:"
 
 #: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
@@ -6061,148 +6056,171 @@ msgstr "_Delegados"
 msgid "Atte_ndees"
 msgstr "Participa_ntes"
 
-#: ../calendar/gui/dialogs/event-page.c:1085
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Evento sem data de início"
 
-#: ../calendar/gui/dialogs/event-page.c:1088
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Evento sem data de término"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
-#: ../calendar/gui/dialogs/task-page.c:851
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "A data de início está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1264
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "A data de término está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "A hora de início está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1294
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "A hora de término está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:908
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador selecionado não possui mais uma conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:929
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/meeting-page.c:915
-#: ../calendar/gui/dialogs/task-page.c:1207
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "_Adicionar "
 
-#: ../calendar/gui/dialogs/event-page.c:2625
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Não é possível abrir a agenda '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2893
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia para o compromisso"
 msgstr[1] "%d dias para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2901
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora para o compromisso"
 msgstr[1] "%d horas para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2909
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto para o compromisso"
 msgstr[1] "%d minutos para o compromisso"
 
+#: ../calendar/gui/dialogs/event-page.c:2956
+msgid "Customize"
+msgstr "Personalizar"
+
+#. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:649
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "Nenhum"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "1 dia para o compromisso"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr "1 hora para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr "15 minutos para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 dia para o compromisso"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
 msgstr "Participa_ntes..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "_Personalizar..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Cale_ndar:"
-msgstr "Age_nda:"
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Custom Alarm:"
+msgstr "Alarme Personalizado:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "D_escrição:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Descrição do Evento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
 msgstr "_Local:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Or_ganizador:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "_Descrição:"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "_Configurar alarme\t"
+msgid "_Alarm"
+msgstr "_Alarme"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Hora:"
 
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "for"
 msgstr "para"
 
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
 msgid "until"
 msgstr "até"
 
@@ -6214,28 +6232,6 @@ msgstr "Dele_gados"
 msgid "From:"
 msgstr "De:"
 
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:321
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2275
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:468
-#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
-#: ../widgets/misc/e-dateedit.c:1514 ../widgets/misc/e-dateedit.c:1728
-msgid "None"
-msgstr "Nenhum"
-
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6273,14 +6269,14 @@ msgstr "Membro"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:502
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6307,47 +6303,22 @@ msgstr "Organizador"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2313
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Memorando"
 
-#: ../calendar/gui/dialogs/memo-page.c:490
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Não é possível abrir memorandos em '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Fundamentos</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Classi_fication:"
-msgstr "Classi_ficação:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
-msgid "Private"
-msgstr "Particular"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
-msgid "Public"
-msgstr "Público"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.c:439
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "Conteúdo do _Memorando:"
 
@@ -6424,51 +6395,107 @@ msgstr "Esta e Instâncias Futuras"
 msgid "All Instances"
 msgstr "Todas as instâncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:499
+#: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso possui recorrências que o Evolution não pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:820
+#: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrência é inválida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:931
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "primeiro"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+msgid "second"
+msgstr "segundo"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "terceiro"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "quarto"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:995
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "último"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Outra Data"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+msgid "1st to 10th"
+msgstr "Primeiro ao décimo"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+msgid "11th to 20th"
+msgstr "Décimo-primeiro ao vigésimo"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
+msgid "21st to 31st"
+msgstr "Vigésimo-primeiro ao trigésimo-primeiro"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "day"
 msgstr "dia"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1183
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1219
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1372
+#: ../calendar/gui/dialogs/recurrence-page.c:1408
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2343
+#: ../calendar/gui/dialogs/recurrence-page.c:2377
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -6485,27 +6512,37 @@ msgstr "<b>Visualizar</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Recorrência</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
 msgstr "A cada"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "This appointment rec_urs"
 msgstr "Este com_promisso se repete"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "para sempre"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "mês(es)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "ano(s)"
 
@@ -6514,7 +6551,7 @@ msgstr "ano(s)"
 msgid "Completed date is wrong"
 msgstr "A data de conclusão está errada"
 
-#: ../calendar/gui/dialogs/task-details-page.c:523
+#: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
 msgstr "Página da Web"
 
@@ -6531,46 +6568,46 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../calendar/gui/print.c:2374 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Concluída"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:228
 #: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2371
+#: ../calendar/gui/e-cal-model-tasks.c:653
+#: ../calendar/gui/e-cal-model-tasks.c:728
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Em Progresso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
-#: ../mail/message-list.c:1015
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2368
+#: ../calendar/gui/e-cal-model-tasks.c:651
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Não Iniciada"
 
@@ -6583,7 +6620,7 @@ msgid "Stat_us:"
 msgstr "_Estado:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -6600,24 +6637,20 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Página da _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:423
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Detalhes de Tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:439
-msgid "_Group"
-msgstr "_Grupo"
-
-#: ../calendar/gui/dialogs/task-page.c:824
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Due date is wrong"
 msgstr "O prazo de conclusão está errado"
 
-#: ../calendar/gui/dialogs/task-page.c:1659
+#: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Não é possível abrir tarefas em '%s'."
@@ -6626,10 +6659,6 @@ msgstr "Não é possível abrir tarefas em '%s'."
 msgid "Categor_ies..."
 msgstr "Ca_tegorias..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "D_escription:"
-msgstr "D_escrição:"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "Or_ganizador:"
@@ -6671,7 +6700,7 @@ msgid "_Manual"
 msgstr "_Manual"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "S_enha:"
 
@@ -6705,86 +6734,62 @@ msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutos"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segundo"
-msgstr[1] "%d segundos"
-
-#: ../calendar/gui/e-alarm-list.c:467
+#: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Ação desconhecida a ser executada"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do início do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:483
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s após o início do compromisso"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:493
+#: ../calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s no início do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes do término do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:506
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s após o término do compromisso"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:516
+#: ../calendar/gui/e-alarm-list.c:513
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s no término do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:540
+#: ../calendar/gui/e-alarm-list.c:537
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:548
+#: ../calendar/gui/e-alarm-list.c:545
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
@@ -6795,11 +6800,11 @@ msgstr "%s para um tipo de gatilho desconhecido"
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:201
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
 msgid "Memo:"
 msgstr "Memorando:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:234
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Página da Web:"
@@ -6809,7 +6814,7 @@ msgid "Untitled"
 msgstr "Sem título"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
@@ -6826,9 +6831,9 @@ msgstr "Data de Conclusão:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1133
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-itip-control.c:1127
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Estado:"
 
@@ -6836,6 +6841,21 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridade:"
 
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+msgid "Public"
+msgstr "Público"
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:365
+msgid "Private"
+msgstr "Particular"
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Confidential"
+msgstr "Confidencial"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data de Término"
@@ -6852,17 +6872,17 @@ msgid "Summary"
 msgstr "Resumo"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Livre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:441
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:608
+#: ../calendar/gui/e-cal-model-tasks.c:603
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6872,196 +6892,191 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:809
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Não"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:107 ../calendar/gui/e-cal-popup.c:122
-#: ../calendar/gui/e-cal-popup.c:166 ../calendar/gui/e-itip-control.c:1150
-#: ../calendar/gui/e-itip-control.c:1291
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1312
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:691
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../calendar/gui/e-cal-model.c:922
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Atribuído"
 
-#: ../calendar/gui/e-cal-popup.c:172 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Salvar Como..."
 
-#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1866
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Selecione a pasta para salvar os anexos selecionados..."
 
-#: ../calendar/gui/e-cal-popup.c:217 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagem_sem_titulo.%s"
 
-#: ../calendar/gui/e-cal-popup.c:271 ../calendar/gui/e-calendar-table.c:1178
-#: ../calendar/gui/e-calendar-view.c:1607 ../calendar/gui/e-memo-table.c:856
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Salvar Como..."
 
-#: ../calendar/gui/e-cal-popup.c:272 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Usar como Imagem de _Fundo"
 
-#: ../calendar/gui/e-cal-popup.c:273
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Salvar Selecionado"
 
-#: ../calendar/gui/e-cal-popup.c:395 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir com %s..."
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:527
-msgid "Task Table"
-msgstr "Tabela de Tarefas"
-
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
+#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: ../calendar/gui/e-calendar-table.c:884
-#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1034
-#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
-#: ../composer/e-msg-composer.c:1354
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Abrir Página da _Web"
 
-#: ../calendar/gui/e-calendar-table.c:1179
-#: ../calendar/gui/e-calendar-view.c:1592
-#: ../calendar/gui/e-calendar-view.c:1608 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
 #: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1612 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Recor_tar"
 
-#: ../calendar/gui/e-calendar-table.c:1185
-#: ../calendar/gui/e-calendar-view.c:1595
-#: ../calendar/gui/e-calendar-view.c:1614 ../calendar/gui/e-memo-table.c:863
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:41
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "C_olar"
 
-#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Atribuir Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Encaminhar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1191
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcar Como Concluída"
 
-#: ../calendar/gui/e-calendar-table.c:1192
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar Tarefas Selecionadas como Concluídas"
 
-#: ../calendar/gui/e-calendar-table.c:1197
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir Tarefas Selecionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1430
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
@@ -7096,105 +7111,105 @@ msgstr "Data de início"
 msgid "Task sort"
 msgstr "Ordenar tarefas"
 
-#: ../calendar/gui/e-calendar-view.c:1267
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Movendo os itens"
 
-#: ../calendar/gui/e-calendar-view.c:1269
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copiando os itens"
 
-#: ../calendar/gui/e-calendar-view.c:1586
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: ../calendar/gui/e-calendar-view.c:1587
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Dia Inteiro"
 
-#: ../calendar/gui/e-calendar-view.c:1588
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nova _Reunião"
 
-#: ../calendar/gui/e-calendar-view.c:1589
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1599
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Visão Atual"
 
-#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Selecionar _Hoje"
 
-#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Selecionar Data..."
 
-#: ../calendar/gui/e-calendar-view.c:1618
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Copiar para a A_genda..."
 
-#: ../calendar/gui/e-calendar-view.c:1619
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para a Agenda..."
 
-#: ../calendar/gui/e-calendar-view.c:1620
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegar Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1621
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Agendar _Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1622
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1623
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1624 ../mail/em-folder-view.c:1082
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: ../calendar/gui/e-calendar-view.c:1629
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Tor_nar esta Ocorrência Móvel"
 
-#: ../calendar/gui/e-calendar-view.c:1630
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Exc_luir esta Ocorrência"
 
-#: ../calendar/gui/e-calendar-view.c:1631
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Excl_uir Todas as Ocorrências"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2045
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2049
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2064 ../calendar/gui/print.c:2341
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Local: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2095
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Data: %s %s de "
@@ -7224,7 +7239,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:557
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i frações de minuto"
@@ -7235,111 +7250,111 @@ msgstr "%02i frações de minuto"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:313 ../calendar/gui/print.c:1528
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:845
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:762
+#: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Recorrência Complexa)"
 
-#: ../calendar/gui/e-itip-control.c:773
+#: ../calendar/gui/e-itip-control.c:770
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Todo dia"
 msgstr[1] "A cada %d dias"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Toda semana"
 msgstr[1] "A cada %d semanas"
 
-#: ../calendar/gui/e-itip-control.c:780
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Toda semana em "
 msgstr[1] "A cada %d semanas em "
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:785
 msgid " and "
 msgstr " e "
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:792
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:812
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "todo mês"
 msgstr[1] "a cada %d meses"
 
-#: ../calendar/gui/e-itip-control.c:819
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Todo ano"
 msgstr[1] "A cada %d anos"
 
-#: ../calendar/gui/e-itip-control.c:830
+#: ../calendar/gui/e-itip-control.c:827
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " um total de %d vez"
 msgstr[1] " um total de %d vezes"
 
-#: ../calendar/gui/e-itip-control.c:839
+#: ../calendar/gui/e-itip-control.c:836
 msgid ", ending on "
 msgstr ", terminando em "
 
-#: ../calendar/gui/e-itip-control.c:863
+#: ../calendar/gui/e-itip-control.c:857
 msgid "Starts"
 msgstr "Começa"
 
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:870
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:910
+#: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Prazo"
 
-#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
+#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:967
+#: ../calendar/gui/e-itip-control.c:961
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
-#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
+#: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7348,7 +7363,7 @@ msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1090
+#: ../calendar/gui/e-itip-control.c:1084
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7356,28 +7371,28 @@ msgstr ""
 "<br> Por favor, reveja a seguinte informação e então selecione uma ação a "
 "partir do menu abaixo."
 
-#: ../calendar/gui/e-itip-control.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Aceito"
 
-#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Aceito Preliminarmente"
 
-#: ../calendar/gui/e-itip-control.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Recusado"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1224
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7385,269 +7400,265 @@ msgstr ""
 "A reunião foi cancelada, no entando ela não pôde ser encontrada nas suas "
 "agendas"
 
-#: ../calendar/gui/e-itip-control.c:1232
+#: ../calendar/gui/e-itip-control.c:1226
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa foi cancelada, no entando ela não pôde ser encontrada nas suas "
 "listas de tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1305
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informação de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1306
 msgid "Meeting Information"
 msgstr "Informação de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requisita a presença de %s em uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1314
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requisita a sua presença em uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1315
 msgid "Meeting Proposal"
 msgstr "Proposta de Reunião"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> deseja adicioná-lo a uma reunião existente."
 
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Update"
 msgstr "Atualização de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> deseja receber a informação de reunião mais recente."
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update Request"
 msgstr "_Pedido de Atualização de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a um pedido de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1335
 msgid "Meeting Reply"
 msgstr "Resposta à Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1342
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> cancelou uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1343
 msgid "Meeting Cancelation"
 msgstr "Cancelamento de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou uma mensagem incompreensível."
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Bad Meeting Message"
 msgstr "Mensagem de Reunião Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1381
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informação de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1382
 msgid "Task Information"
 msgstr "Informação de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requisita que %s execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requisita que você execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Task Proposal"
 msgstr "Proposta de Tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> deseja acrescentá-lo a uma tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Update"
 msgstr "Atualização de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> deseja receber a informação de tarefa mais recente."
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update Request"
 msgstr "Pedido de Atualização de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1411
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a uma atribuição de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Task Reply"
 msgstr "Resposta à Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1419
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1420
 msgid "Task Cancelation"
 msgstr "Cancelamento de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Bad Task Message"
 msgstr "Mensagem de Tarefa Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informação de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requisita sua informação de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Request"
 msgstr "Pedido de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
 msgstr "Resposta de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de Livre/Ocupado Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1552
+#: ../calendar/gui/e-itip-control.c:1546
 msgid "The message does not appear to be properly formed"
 msgstr "A mensagem não aparenta estar formada corretamente"
 
-#: ../calendar/gui/e-itip-control.c:1611
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: ../calendar/gui/e-itip-control.c:1644
+#: ../calendar/gui/e-itip-control.c:1638
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo não contém uma mensagem de agenda válida"
 
-#: ../calendar/gui/e-itip-control.c:1676
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens de agenda visualizáveis"
 
-#: ../calendar/gui/e-itip-control.c:1910
+#: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: ../calendar/gui/e-itip-control.c:1938
+#: ../calendar/gui/e-itip-control.c:1932
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objeto é inválido e não pode ser atualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1948
+#: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta não é de um participante atual. Adicioná-lo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:1960
+#: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado do participante não pôde ser atualizado devido a um estado inválido!\n"
 
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1980
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado do participante não pôde ser atualizado pois o item não existe mais"
 
-#: ../calendar/gui/e-itip-control.c:2010
-msgid "Removal Complete"
-msgstr "Remoção Concluída"
-
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
+#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
 msgid "The item could not be sent!\n"
 msgstr "O item não pôde ser enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2165
+#: ../calendar/gui/e-itip-control.c:2130
 msgid "Choose an action:"
 msgstr "Escolher uma ação:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2202
 msgid "Update"
 msgstr "Atualizar"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2230
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2231
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2232
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Send Free/Busy Information"
 msgstr "Enviar Informação de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2289
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2317
 msgid "Send Latest Information"
 msgstr "Enviar Informação Mais Recente"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:692
+#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
 #: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7690,99 +7701,99 @@ msgstr "data-fim"
 msgid "date-start"
 msgstr "data-inicio"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
 msgstr "Participantes Necessários"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:803
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "Indivíduo"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Moderador"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:806
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "Participante Necessário"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Não Participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:816
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "Necessita Ação"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegado"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:463
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Participante                      "
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 msgid "In Process"
 msgstr "Em Andamento"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -7790,93 +7801,86 @@ msgstr "%A, %d de %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452
-#: ../widgets/misc/e-dateedit.c:1737
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora do Escritório"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Sem Informação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "Con_tatos..."
+#: ../calendar/gui/e-meeting-time-sel.c:427
+msgid "A_ttendees..."
+msgstr "Participa_ntes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pções"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Exibir apenas _horas de expediente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Exibir com _menos ampliação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Atualizar livre/ocupado"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "Auto_seleção"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "Todas as _pessoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Todas as pessoas e um _recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Pessoas _necessárias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Pessoas necessárias e _um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:618
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Hora de início:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Hora de tér_mino:"
 
-#: ../calendar/gui/e-memo-table.c:276
-msgid "Memo Table"
-msgstr "Tabela de Memorandos"
-
-#: ../calendar/gui/e-memo-table.c:872
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Excluir Memorandos Selecionadas"
 
-#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Clique para adicionar um memorando"
 
@@ -7884,8 +7888,8 @@ msgstr "Clique para adicionar um memorando"
 msgid "Memo sort"
 msgstr "Ordenar memorandos"
 
-#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
-#: ../calendar/gui/gnome-cal.c:2571
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7894,16 +7898,16 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:776
+#: ../calendar/gui/e-memos.c:772
 msgid "Loading memos"
 msgstr "Carregando memorandos"
 
-#: ../calendar/gui/e-memos.c:861
+#: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo memorandos em %s"
 
-#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
@@ -7912,66 +7916,66 @@ msgstr "Excluindo objetos selecionados..."
 msgid "Enter the password for %s"
 msgstr "Digite a senha para %s"
 
-#: ../calendar/gui/e-tasks.c:871
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Carregando tarefas"
 
-#: ../calendar/gui/e-tasks.c:958
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: ../calendar/gui/e-tasks.c:1203
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1253
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
 #: ../calendar/gui/e-timezone-entry.c:133
-msgid "Timezone Button"
-msgstr "Botão de Fuso Horário "
+msgid "Select Timezone"
+msgstr "Selecionar um Fuso Horário"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1512
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:792
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Atualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2246
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "_Visão Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2247
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_Salvar Visão Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2252
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Definir Visões..."
 
-#: ../calendar/gui/gnome-cal.c:2414
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Carregando compromissos em %s"
 
-#: ../calendar/gui/gnome-cal.c:2433
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Carregando tarefas em %s"
 
-#: ../calendar/gui/gnome-cal.c:2537
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3458
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Excluindo permanentemente"
 
@@ -8040,19 +8044,19 @@ msgstr "É necessário configurar um organizador."
 msgid "At least one attendee is necessary"
 msgstr "É necessário pelo menos um participante"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
 msgid "Event information"
 msgstr "Informação de evento"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
 msgid "Task information"
 msgstr "Informação de tarefa"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
 msgid "Journal information"
 msgstr "Informação de diário"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
 msgid "Free/Busy information"
 msgstr "Informação de Livre/Ocupado"
 
@@ -8072,16 +8076,16 @@ msgstr "Atualizar"
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: ../calendar/gui/itip-utils.c:775
+#: ../calendar/gui/itip-utils.c:772
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:782
 msgid "iCalendar information"
 msgstr "Informação iCalendar"
 
-#: ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:937
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
@@ -8131,31 +8135,31 @@ msgstr ""
 msgid "There is no calendar available for creating memos"
 msgstr "Não existe agenda disponível para a criação de memorandos"
 
-#: ../calendar/gui/memos-component.c:975
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Seletor de Fonte de Memorando"
 
-#: ../calendar/gui/memos-component.c:1158
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Novo memorando"
 
-#: ../calendar/gui/memos-component.c:1159
+#: ../calendar/gui/memos-component.c:1156
 msgid "_Memo"
 msgstr "_Memorando"
 
-#: ../calendar/gui/memos-component.c:1160
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Criar um novo memorando"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Nova lista de memorandos"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1164
 msgid "Memo l_ist"
 msgstr "L_ista de memorandos"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Criar uma nova lista de memorandos"
 
@@ -8330,115 +8334,115 @@ msgid "31st"
 msgstr "31 de"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "D"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "S"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "T"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "S"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "S"
 
 #. Day
-#: ../calendar/gui/print.c:1928
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia selecionado (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1957
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1958 ../calendar/gui/print.c:1960
-#: ../calendar/gui/print.c:1961
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana selecionada (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Mês selecionado (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1980
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
-#: ../calendar/gui/print.c:2309
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: ../calendar/gui/print.c:2311
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2333
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2384
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2401
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2413
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentagem Concluída: %i"
 
-#: ../calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2439
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Contatos: "
 
-#: ../calendar/gui/print.c:2590 ../calendar/gui/print.c:2678
-#: ../calendar/gui/print.c:2804 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Visualizar Impressão"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Imprimir Item"
 
@@ -8467,43 +8471,43 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe agenda disponível para a criação de tarefas"
 
-#: ../calendar/gui/tasks-component.c:990
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "Seletor de Fonte de Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1175
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "Nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "Tarefa _Atribuída"
 
-#: ../calendar/gui/tasks-component.c:1183
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "Criar uma nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1190
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "_Lista de Tarefas"
 
-#: ../calendar/gui/tasks-component.c:1191
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Criar uma nova lista de tarefas"
 
-#: ../calendar/gui/tasks-control.c:435
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8516,11 +8520,11 @@ msgstr ""
 "\n"
 "Apagar estas tarefas mesmo assim?"
 
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Não me pergunte novamente."
 
-#: ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Imprimir Tarefas"
 
@@ -10115,7 +10119,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:995
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Barra de Anexos"
 
@@ -10124,27 +10128,27 @@ msgstr "Barra de Anexos"
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
 #: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Não é possível anexar o arquivo %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Não é possível anexar o arquivo %s: não é um arquivo comum"
 
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Publicando destino"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Escolha as pastas onde publicar a mensagem."
 
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Clique aqui para abrir o catálogo de endereços"
 
@@ -10155,45 +10159,45 @@ msgstr "Clique aqui para abrir o catálogo de endereços"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_De:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Digite os destinatários da mensagem"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Digite os endereços que receberão uma cópia da mensagem"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10204,15 +10208,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Publicar Em:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para selecionar as pastas onde publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Publicar Em:"
 
@@ -10224,14 +10228,14 @@ msgstr "Ane_xar"
 msgid "Insert Attachment"
 msgstr "Inserir Anexo"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossível assinar a mensagem a ser enviada: Não existe certificado de "
 "assinatura configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10239,52 +10243,52 @@ msgstr ""
 "Impossível criptografar a mensagem a ser enviada: Não existe certificado de "
 "criptografia configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2512
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Esconder Barra de _Anexos"
 
-#: ../composer/e-msg-composer.c:1303 ../composer/e-msg-composer.c:2515
-#: ../composer/e-msg-composer.c:3847
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Exibir Barra de _Anexos"
 
-#: ../composer/e-msg-composer.c:1335 ../composer/e-msg-composer.c:1369
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Razão desconhecida"
 
-#: ../composer/e-msg-composer.c:1407
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Não foi possível abrir o arquivo"
 
-#: ../composer/e-msg-composer.c:1415
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível obter mensagem do editor"
 
-#: ../composer/e-msg-composer.c:1693
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Mensagem sem Título"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1728
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Abrir Arquivo"
 
-#: ../composer/e-msg-composer.c:2155 ../mail/em-account-editor.c:596
-#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Auto-gerado"
 
-#: ../composer/e-msg-composer.c:2258
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Assi_natura:"
 
-#: ../composer/e-msg-composer.c:2526 ../composer/e-msg-composer.c:3729
-#: ../composer/e-msg-composer.c:3732
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Redigir Mensagem"
 
-#: ../composer/e-msg-composer.c:4956
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10425,7 +10429,7 @@ msgid "You need to configure an account before you can compose mail."
 msgstr "Você deve configurar uma conta antes de poder redigir uma mensagem."
 
 #: ../composer/mail-composer.error.xml.h:28
-msgid "_Don't Recover"
+msgid "_Do not Recover"
 msgstr "_Não Recuperar"
 
 #: ../composer/mail-composer.error.xml.h:29
@@ -10442,9 +10446,13 @@ msgstr "_Salvar Mensagem"
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "The Evolution Groupware Suite"
-msgstr "O Conjunto de Aplicações para Grupos de Trabalho Evolution"
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+msgid "Groupware Suite"
+msgstr "Conjunto de Aplicativos de Groupware"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "The Evolution PIM and Email Client"
+msgstr "Evolution: Cliente de Email e Gerenciador de Informações Pessoais"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10589,12 +10597,10 @@ msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:442
+#: ../e-util/e-error.c:443
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr ""
-"<span weight=\"bold\">Erro interno, foi pedido erro desconhecido '%s'</span>"
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Erro interno, foi pedido erro desconhecido '%s'"
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10612,7 +10618,7 @@ msgstr "Você deseja sobrescrevê-lo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Arquivo existe &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "S_obrescrever"
 
@@ -10691,20 +10697,19 @@ msgid "Choose a file"
 msgstr "Escolher um arquivo"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
 #: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "A Fazer"
 
 #. blue
 #: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Mais tarde"
 
@@ -10753,11 +10758,11 @@ msgid "Include threads"
 msgstr "Incluir encadeamentos"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:349
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Recebidas"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:350
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Enviadas"
 
@@ -10781,7 +10786,7 @@ msgstr "Data faltando."
 msgid "Missing file name."
 msgstr "Nome do arquivo faltando."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Nome faltando."
 
@@ -10853,6 +10858,10 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "segundos"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "o instante atual"
@@ -10865,15 +10874,15 @@ msgstr "um instante especificado por você"
 msgid "years"
 msgstr "anos"
 
-#: ../filter/rule-editor.c:292
+#: ../filter/rule-editor.c:378
 msgid "Add Rule"
 msgstr "Adicionar Regra"
 
-#: ../filter/rule-editor.c:368
+#: ../filter/rule-editor.c:454
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
-#: ../filter/rule-editor.c:735
+#: ../filter/rule-editor.c:732
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -10932,11 +10941,12 @@ msgid "Mail"
 msgstr "Correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Contas de Correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Preferências de Correio"
 
@@ -10944,12 +10954,12 @@ msgstr "Preferências de Correio"
 msgid "_Mail"
 msgstr "_Correio"
 
-#: ../mail/em-account-editor.c:395
+#: ../mail/em-account-editor.c:403
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de Licença %s"
 
-#: ../mail/em-account-editor.c:402
+#: ../mail/em-account-editor.c:410
 #, c-format
 msgid ""
 "\n"
@@ -10962,92 +10972,88 @@ msgstr ""
 "licença para %s exibido\n"
 "abaixo e marque a caixa para aceitá-lo\n"
 
-#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Selecionar Pasta"
 
-#: ../mail/em-account-editor.c:768
+#: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "Perguntar para cada mensagem"
 
-#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Recebendo Mensagem"
 
-#: ../mail/em-account-editor.c:1979
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "_Verificar automaticamente novas mensagens a cada"
 
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Enviando Mensagem"
 
-#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Padrões"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Segurança"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Opções de Recepção"
 
-#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Verificando Novas Mensagens"
 
-#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de Contas"
 
-#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Assistente de Contas do Evolution"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:407
+#: ../mail/em-account-prefs.c:409
 msgid "Disable"
 msgstr "Desativar"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
+#: ../mail/em-account-prefs.c:411
 msgid "Enable"
 msgstr "Ativar"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:459
+#: ../mail/em-account-prefs.c:466
 msgid "[Default]"
 msgstr "[Padrão]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:213
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../mail/em-account-prefs.c:518
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: ../mail/em-account-prefs.c:520
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../mail/em-account-prefs.c:525
-msgid "Mail Accounts Table"
-msgstr "Tabela de Contas de Correio"
-
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
 #: ../mail/mail-config.c:967
 msgid "Unnamed"
@@ -11065,18 +11071,18 @@ msgstr "Adicionar script de assinatura"
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#: ../mail/em-composer-utils.c:863 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
-#: ../mail/em-composer-utils.c:1658
+#: ../mail/em-composer-utils.c:1666
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1705
+#: ../mail/em-composer-utils.c:1713
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11213,7 +11219,7 @@ msgstr "não é"
 msgid "is not Flagged"
 msgstr "não está Marcada"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Indesejada"
@@ -11222,8 +11228,7 @@ msgstr "Indesejada"
 msgid "Junk Test"
 msgstr "Teste de Indesejada"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Rótulo"
 
@@ -11331,7 +11336,7 @@ msgstr "começa com"
 msgid "Stop Processing"
 msgstr "Parar o Processamento"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
@@ -11349,26 +11354,26 @@ msgstr "Desconfigurar Estado"
 msgid "<b>Then</b>"
 msgstr "<b>Então</b>"
 
-#: ../mail/em-folder-browser.c:143
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "C_riar Pasta de Pesquisa a Partir da Pesquisa..."
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:145
+#: ../mail/em-folder-properties.c:150
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total de mensagem:"
 msgstr[1] "Total de mensagens:"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:158
+#: ../mail/em-folder-properties.c:163
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensagem não lida:"
 msgstr[1] "Mensagens não lidas:"
 
-#: ../mail/em-folder-properties.c:289
+#: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Propriedades da Pasta"
@@ -11401,7 +11406,7 @@ msgstr "Rascunhos"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:641
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
@@ -11431,12 +11436,12 @@ msgstr "Movendo pasta %s"
 msgid "Copying folder %s"
 msgstr "Copiando pasta %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1634
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensagens para pasta %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1636
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensagens para pasta %s"
@@ -11462,7 +11467,7 @@ msgstr "Varrendo pastas em \"%s\""
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Ver"
 
@@ -11487,7 +11492,7 @@ msgstr "_Nova Pasta..."
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
 msgid "_Empty Trash"
 msgstr "Es_vaziar Lixeira"
 
@@ -11507,20 +11512,20 @@ msgid "C_opy"
 msgstr "C_opiar"
 
 #: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Criando pasta `%s'"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Create folder"
 msgstr "Criar pasta"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
@@ -11577,6 +11582,14 @@ msgstr "Marcar Como _Não Indesejada"
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar Como _Lembrete..."
 
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr "_Rótulo"
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "_Nenhum"
+
 #: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Marcar Como Concl_uída"
@@ -11658,16 +11671,16 @@ msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:493
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Ocorrências: %d"
 
-#: ../mail/em-format-html-display.c:753 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Não assinada"
 
-#: ../mail/em-format-html-display.c:753
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11675,11 +11688,11 @@ msgstr ""
 "Esta mensagem não está assinada. Não há garantias de que esta mensagem seja "
 "autêntica."
 
-#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
-#: ../mail/em-format-html-display.c:754
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11687,11 +11700,11 @@ msgstr ""
 "Esta mensagem está assinada e é válida. É muito provável que esta mensagem "
 "seja autêntica."
 
-#: ../mail/em-format-html-display.c:755 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
-#: ../mail/em-format-html-display.c:755
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11699,11 +11712,11 @@ msgstr ""
 "Não é possível verificar a assinatura desta mensagem. Ela pode ter sido "
 "alterada em trânsito."
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Assinatura válida, não é possível verificar remetente"
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11711,11 +11724,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida, mas o remetente não "
 "pode ser verificado."
 
-#: ../mail/em-format-html-display.c:762 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Não Criptografada"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11723,11 +11736,11 @@ msgstr ""
 "Esta mensagem não está criptografada. O seu conteúdo pode ser visto em "
 "trânsito através da Internet."
 
-#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Criptografada, fraca"
 
-#: ../mail/em-format-html-display.c:763
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11737,11 +11750,11 @@ msgstr ""
 "fraco. Seria difícil, mas não impossível, que um estranho conseguisse ver o "
 "conteúdo desta mensagem em uma quantidade de tempo razoável."
 
-#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Criptografada"
 
-#: ../mail/em-format-html-display.c:764
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11749,11 +11762,11 @@ msgstr ""
 "Esta mensagem está criptografada. Seria difícil que um estranho conseguisse "
 "ver o conteúdo desta mensagem."
 
-#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Criptografada, forte"
 
-#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11763,75 +11776,72 @@ msgstr ""
 "Seria muito difícil para um estranho conseguir ver o conteúdo desta mensagem "
 "em uma quantidade de tempo razoável."
 
-#: ../mail/em-format-html-display.c:866 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver Certificado"
 
-#: ../mail/em-format-html-display.c:881
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é observável"
 
-#: ../mail/em-format-html-display.c:1169
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Concluída em %d de %B, %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "até %d de %B, %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1240
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ver Embutido"
 
-#: ../mail/em-format-html-display.c:1241
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1242
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "A_justar para Largura"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Mostrar o Tamanho _Original"
 
-#: ../mail/em-format-html-display.c:1620
-msgid "Attachment Button"
-msgstr "Botão de Anexo"
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anexo"
 
-#: ../mail/em-format-html-display.c:1827
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Selecionar a pasta para salvar todos os anexos..."
 
-#: ../mail/em-format-html-display.c:1874
-msgid "Save Selected..."
-msgstr "Salvar Selecionado..."
+#: ../mail/em-format-html-display.c:1921
+msgid "_Save Selected..."
+msgstr "_Salvar Selecionado..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1941
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d a_nexo"
 msgstr[1] "%d a_nexos"
 
-#: ../mail/em-format-html-display.c:1948 ../mail/em-format-html-display.c:2024
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Salvar"
 
-#: ../mail/em-format-html-display.c:1959
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Salvar _Tudo"
 
-#: ../mail/em-format-html-display.c:2018
-msgid "Toggle Attachment Bar"
-msgstr "Alternar Barra de Anexos"
-
-#: ../mail/em-format-html-display.c:2020
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Sem Anexo"
 
@@ -11849,89 +11859,90 @@ msgstr "Buscando `%s'"
 msgid "Valid signature but cannot verify sender"
 msgstr "Assinatura válida, mas não é possível verificar o remetente"
 
-#: ../mail/em-format-html.c:880
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para site FTP (%s)"
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ponteiro para arquivo local (%s) válido no site \"%s\""
 
-#: ../mail/em-format-html.c:923
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para arquivo local (%s)"
 
-#: ../mail/em-format-html.c:944
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1181
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formatando mensagem"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1000
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Programa de correio"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1613
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1616
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Grupos de Notícias"
@@ -11941,27 +11952,27 @@ msgstr "Grupos de Notícias"
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Não foi possível analisar a mensagem S/MIME: Erro desconhecido"
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Não foi possível analisar a mensagem MIME. Exibindo como fonte."
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de criptografia não suportada para multiparte/criptografado"
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1446
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura não suportado"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "Erro ao verificar assinatura"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar assinatura"
 
@@ -12060,7 +12071,7 @@ msgid "_Send New Message To..."
 msgstr "En_viar Nova Mensagem Para..."
 
 #: ../mail/em-popup.c:622
-msgid "_Add to Addressbook"
+msgid "_Add to Address Book"
 msgstr "_Adicionar ao Catálogo de Endereços"
 
 #: ../mail/em-subscribe-editor.c:615
@@ -12088,24 +12099,24 @@ msgstr "Não foi selecionado um servidor"
 msgid "Do not show this message again."
 msgstr "Não exibir esta mensagem novamente."
 
-#: ../mail/em-utils.c:357
-msgid "Filters"
-msgstr "Filtros"
+#: ../mail/em-utils.c:319
+msgid "Message Filters"
+msgstr "F_iltros de Mensagens"
 
-#: ../mail/em-utils.c:500 ../mail/em-utils.c:537
+#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr "mensagem"
 
-#: ../mail/em-utils.c:672
+#: ../mail/em-utils.c:634
 msgid "Save Message..."
 msgstr "Salvar Mensagem..."
 
-#: ../mail/em-utils.c:721
+#: ../mail/em-utils.c:683
 msgid "Add address"
 msgstr "Adicionar endereço"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1205
+#: ../mail/em-utils.c:1167
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
@@ -12625,14 +12636,14 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de pastas no formato Berkeley Mailbox"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
 
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:236
+#: ../plugins/startup-wizard/startup-wizard.c:237
 #: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Por favor, aguarde"
@@ -12642,7 +12653,7 @@ msgstr "Por favor, aguarde"
 msgid "Importing mailbox"
 msgstr "Importando caixa de correio"
 
-#: ../mail/importers/mail-importer.c:377
+#: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "Varrendo %s"
@@ -12843,6 +12854,30 @@ msgstr "Criar uma nova pasta de correio"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao atualizar configurações ou pastas de correio."
 
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "Importante"
+
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "_Trabalho"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "_Pessoal"
+
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr "A _Fazer"
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr "_Mais tarde"
+
 #: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
@@ -13006,10 +13041,6 @@ msgstr "_Criptografar sempre para mim, mesmo ao enviar correio criptografado"
 msgid "Attach original message"
 msgstr "Anexar a mensagem original"
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Anexo"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Inserir automaticamente imagens de _carinhas"
@@ -13132,62 +13163,66 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "Criptografar _mensagens enviadas (por padrão)"
 
 #: ../mail/mail-config.glade.h:81
+msgid "Fi_xed width Font:"
+msgstr "Fonte de Largura Fi_xa:"
+
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Largura Fi_xa:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Propriedades da Fonte"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "Nome _Completo:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correio HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "I_ncluir testes remotos"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Embutido"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Tabela de Idiomas"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Configuração de Correio"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Tabela de Cabeçalhos de Correio"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Localização da caixa de correio"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Redator de Mensagens"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13195,19 +13230,19 @@ msgstr ""
 "Nota: não será pedido que você forneça uma senha até que você faça a "
 "primeira conexão"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "_Empresa:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da C_have PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Toque um arqui_vo de som quando uma nova mensagem chegar"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13215,7 +13250,7 @@ msgstr ""
 "Por favor, digite um nome descritivo para esta conta no espaço abaixo.\n"
 "Este nome será usado apenas com o propósito de exibição."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13224,7 +13259,7 @@ msgstr ""
 "tiver certeza, consulte o seu administrador de sistema ou o seu provedor de "
 "Internet."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13235,114 +13270,110 @@ msgstr ""
 "menos que você queira estas informações incluídas em toda mensagem de "
 "correio enviada."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Por favor, selecione entre as seguintes opções"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinatários _Bcc"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citar a mensagem original"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Responder a:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "S_elecionar..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "Fonte _Padrão:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "Se_lecionar..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecionar fonte HTML de largura fixa para impressão"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "Selecionar fonte HTML de largura variável"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "Selecionar fonte HTML de largura variável para impressão"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "Selecionar um arquivo de som"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "Enviar destinatários da mensagem:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Enviando Correio"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _Mensagens Enviadas:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticação"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "_Tipo do Servidor: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Certificado de assi_natura:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_Assinatura:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Tabelas de Assinaturas"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Nome do _arquivo:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Verificação Ortográfica"
 
-#: ../mail/mail-config.glade.h:140
-msgid "T_erminal Font:"
-msgstr "Fonte de _Terminal:"
-
 #: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "Ti_po: "
@@ -13447,23 +13478,24 @@ msgstr "Estilo de _resposta:"
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "_Exibir imagens animadas"
-
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:173
+msgid "_Show image animations"
+msgstr "Exibir Animações"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Usar Conexão Segura:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que outros aplicativos usam"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "descrição"
 
@@ -13569,7 +13601,7 @@ msgstr "com todas as pastas locais e remotas ativas"
 msgid "with all local folders"
 msgstr "com todas as pastas locais"
 
-#: ../mail/mail-folder-cache.c:861
+#: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -13722,11 +13754,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2090
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: ../mail/mail-ops.c:2102
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13735,22 +13767,22 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2112
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Não foi possível escrever os dados: %s"
 
-#: ../mail/mail-ops.c:2262
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2262
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: ../mail/mail-ops.c:2378
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Verificando Serviço"
 
@@ -13758,26 +13790,6 @@ msgstr "Verificando Serviço"
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:266 ../mail/mail-send-recv.c:268
-#, c-format
-msgid "<b>%s (%s)</b> : %s"
-msgstr "<b>%s (%s)</b> : %s"
-
-#: ../mail/mail-send-recv.c:270
-#, c-format
-msgid "<b>%s (%s)</b>"
-msgstr "<b>%s (%s)</b>"
-
-#: ../mail/mail-send-recv.c:274 ../mail/mail-send-recv.c:276
-#, c-format
-msgid "<b>%s</b> : %s"
-msgstr "<b>%s</b> : %s"
-
-#: ../mail/mail-send-recv.c:278
-#, c-format
-msgid "<b>%s</b>"
-msgstr "<b>%s</b>"
-
 #: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Enviar e Receber Correio"
@@ -13799,7 +13811,7 @@ msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:678
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Digite a Senha para %s"
@@ -14096,38 +14108,42 @@ msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Você deseja que a operação seja executada nas sub-pastas?"
 
 #: ../mail/mail.error.xml.h:49
+msgid "Do you want to mark all messages as read?"
+msgstr "Deseja marcar como lidas todas as mensagens?"
+
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Você deseja salvar suas alterações?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Digite a senha."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Erro ao carregar definições de filtro."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Erro ao executar operação."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "Erro {0}."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "O arquivo existe, mas não é possível sobrescrevê-lo."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "O arquivo existe, mas não é um arquivo comum."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se você continuar, você não será capaz de recuperar estas mensagens."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14135,12 +14151,12 @@ msgstr ""
 "Se você excluir a pasta, todo o seu conteúdo e o conteúdo das suas sub-"
 "pastas serão excluído permanentemente."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Se você continuar as informações da conta serão excluídas permanentemente."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14149,12 +14165,12 @@ msgstr ""
 "todas as informações do proxy serão excluídas\n"
 "permanentemente."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Se você continuar as informações da conta serão excluídas permanentemente."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14162,19 +14178,19 @@ msgstr ""
 "Se você sair, estas mensagens não serão enviadas até que o Evolution seja "
 "reiniciado."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "Autenticação inválida"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correio atualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14186,35 +14202,35 @@ msgstr ""
 "adicionado, listará todos os destinatários de sua mensagem. Para evitar "
 "isto, você deve adicionar pelo menos um destinatário Para: ou Cc:."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read"
 msgstr "Marcar todas as mensagens como lidas"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Mark all messages as read in the selected folder"
 msgstr "Marcar todas as mensagens como lidas na pasta selecionada"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Pasta faltando."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Não foram selecionadas fontes."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir muitas mensagens ao mesmo tempo pode levar um longo tempo."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Por favor, verifique suas configurações de conta e tente novamente."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "Por favor, ative a conta ou envie usando outra conta."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14223,7 +14239,7 @@ msgstr ""
 "pesquisar endereços de email clicando no botão Para: ao lado da caixa de "
 "entrada."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14235,49 +14251,49 @@ msgstr ""
 "{0}\n"
 "Enviar mesmo assim?"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Por favor, digite um nome único para identificar esta assinatura."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Por favor, aguarde."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problemas ao migrar a pasta de correio antiga &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Consultando servidor"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Consultando servidor para obter a lista de mecanismos de autenticação "
 "suportados."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Ler o recibo de leitura."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Realmente excluir a pasta &quot;{0}&quot;. e todas as suas sub-pastas?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Pastas de Pesquisa atualizadas automaticamente."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Enviar Recibos de Leitura"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "A assinatura já existe"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14285,7 +14301,7 @@ msgstr ""
 "Pastas do sistema são necessárias para que o Ximian Evolution funcione "
 "corretamente e não podem ser renomeadas, movidas ou excluídas."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14302,7 +14318,7 @@ msgstr ""
 "adicionado, listará todos os destinatários de sua mensagem. Para evitar "
 "isto, você deve adicionar pelo menos um destinatário Para: ou Cc:. "
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14316,7 +14332,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "E foram atualizadas."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14330,7 +14346,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "E foram atualizadas."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14342,11 +14358,11 @@ msgstr ""
 "A mensagem está armazenada na Caixa de saída. Verifique erros na mensagem e "
 "envie novamente."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "A arquivo de script deve existir e ser executável."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14355,7 +14371,7 @@ msgstr ""
 "vá para o editor de Pasta de Pesquisa para adicioná-la explicitamente, caso "
 "seja requerido."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14363,14 +14379,14 @@ msgstr ""
 "Esta mensagem não pode ser enviada pois a conta que você escolheu para mandá-"
 "la não está ativada"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Esta mensagem não pode ser enviada pois você não especificou nenhum "
 "destinatário"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14378,15 +14394,23 @@ msgstr ""
 "Este servidor não suporta este tipo de autenticação e pode não suportar a "
 "autenticação de forma alguma."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta assinatura foi alterada, mas não foi salva."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Isto marcará como lidas todas as mensagens na pasta selecionada (e em suas "
+"subordinadas)."
+
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "Impossível conectar ao servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14394,40 +14418,40 @@ msgstr ""
 "Impossível abrir a pasta de rascunhos para esta conta. Usar a pasta de "
 "rascunhos do sistema?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "Impossível ler o arquivo de licença."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "Usar _Padrão"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "Usar pasta de rascunhos padrão?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr "Você não preencheu todas as informações necessárias."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Você possui mensagens ainda não enviadas. Você deseja sair mesmo assim?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "Você não pode criar duas contas com o mesmo nome."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Você deve nomear esta Pasta de Pesquisa."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Você deve especificar uma pasta."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14437,99 +14461,99 @@ msgstr ""
 "Faça isso selecionando as pastas individualmente e/ou selecionando\n"
 "todas as pastas locais, todas as pastas remotas ou ambas."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "O seu login no seu servidor &quot;{0}&quot; como &quot;{0}&quot; falhou."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Sua mensagem com o assunto &quot;{0}&quot; não foi entregue."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "_Adicionar"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "_Descartar alterações"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "_Excluir Permanentemente"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "A_brir Mensagens"
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Não Lida"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Várias Mensagens Não Lidas"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Várias Mensagens"
 
-#: ../mail/message-list.c:1012
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Mínima"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Mais Baixa"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Mais Alta"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Máxima"
 
-#: ../mail/message-list.c:1346 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2068
-msgid "Message List"
-msgstr "Lista de Mensagens"
+#: ../mail/message-list.c:2063
+msgid "Messages"
+msgstr "_Mensagens"
 
-#: ../mail/message-list.c:3446
+#: ../mail/message-list.c:3441
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -14696,29 +14720,25 @@ msgstr "Fazer backup e restaurar configurações e dados do Evolution"
 msgid "Restore Settings..."
 msgstr "Restaurar Configurações..."
 
-#: ../plugins/bbdb/bbdb.c:429
+#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contatos Automáticos"
 
-#: ../plugins/bbdb/bbdb.c:438
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Contatos Automáticos</span>"
-
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:451
+#: ../plugins/bbdb/bbdb.c:454
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Cri_ar entradas no catálogo de endereços automaticamente quando responder "
 "mensagens"
 
-#: ../plugins/bbdb/bbdb.c:472
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Contatos de Mensageiros Instantâneos</span>"
+#: ../plugins/bbdb/bbdb.c:475
+msgid "Instant Messaging Contacts"
+msgstr "Contatos de Mensagens Instantâneas"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:485
+#: ../plugins/bbdb/bbdb.c:490
 msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
@@ -14726,7 +14746,7 @@ msgstr ""
 "mensageiro instantâneo"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:502
+#: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar com minha lista de ami_gos agora"
 
@@ -14867,8 +14887,8 @@ msgstr "Você deseja tornar o Evolution seu cliente padrão de e-mail?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
-msgid "Mark as default folder"
-msgstr "Marcar como pasta padrão"
+msgid "Mark as _default folder"
+msgstr "Marcar como pasta _padrão"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -14924,11 +14944,11 @@ msgstr ""
 "Esta opção conectará ao servidor Exchange usando a autenticação padrão de "
 "senha em texto aberto."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "Fora do Escritório"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14937,72 +14957,72 @@ msgstr ""
 "para cada pessoa que enviar correio para você enquanto você\n"
 "estiver fora do escritório."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "Eu estou fora do escritório"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "Eu estou no escritório"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
 msgstr "Alterar a senha para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Mudar a Senha"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gerencia as definições do representate para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
 msgstr "Assistente de Delegação"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Miscelleneous"
 msgstr "Diversos"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "View the size of all Exchange folders"
 msgstr "Visualizar o tamanho de todas as pastas de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "Tamanho das Pastas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configurações do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:619
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "Url _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:645
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "Tipo de Autenticação"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "V_erificar por Tipos Suportados"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:164
+#: ../plugins/exchange-operations/exchange-calendar.c:193
+#: ../plugins/exchange-operations/exchange-contacts.c:167
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15042,13 +15062,13 @@ msgstr "Nova Senha:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "A sua senha atual expirou. Por favor, altere sua senha agora."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Sua senha vai vencer nos próximos %d dias"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
 msgid "Custom"
 msgstr "Personalizar"
 
@@ -15072,34 +15092,34 @@ msgstr "Delegar Para"
 msgid "Remove the delegate %s?"
 msgstr "Remover o representante %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
 msgid "Could not access Active Directory"
 msgstr "Não foi possível acessar o Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
 msgid "Could not find self in Active Directory"
 msgstr "Não foi possível encontrar no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Não foi possível delegar %s no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Não foi possível remover o representante %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
 msgstr "Não foi possível atualizar a lista de representantes."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Não foi possível adicionar o representante %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
 msgid "Error reading delegates list."
 msgstr "Erro ao abrir lista de representantes."
 
@@ -15161,15 +15181,15 @@ msgstr "_Tarefas:"
 msgid "Permissions..."
 msgstr "Permissões..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
 msgid "Folder Name"
 msgstr "Nome da Pasta"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "Tamanho da Pasta"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:192
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Subescrever a Pastas de Outros Usuários"
@@ -15184,14 +15204,14 @@ msgstr "Árvore de Pastas do Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Cancelar a Inscrição na Pasta..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Realmente cancelar a inscrição da pasta \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:538
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Cancelar a inscrição de \"%s\""
@@ -15212,15 +15232,15 @@ msgstr "_Mudar a Senha"
 msgid "ok_button"
 msgstr "botão_ok"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Permissão negada.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User:"
 msgstr "Adicionar Usuário:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User"
 msgstr "Adicionar Usuário"
 
@@ -15285,7 +15305,7 @@ msgid "Select User"
 msgstr "Selecionar Usuário"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
+msgid "Address Book..."
 msgstr "Catálogo de Endereços..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -15436,7 +15456,7 @@ msgid "Folder offline"
 msgstr "Pasta desconectada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -15712,7 +15732,7 @@ msgid "<b>Users:</b>"
 msgstr "<b>Usuários:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Mensagem"
 
@@ -15793,14 +15813,6 @@ msgstr "_Escrever"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "dialog1"
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Nome da Conta</b>"
@@ -15811,7 +15823,7 @@ msgstr "Login do Proxy"
 
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:502
+#: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15821,29 +15833,29 @@ msgstr "%sForneça a senha para %s (usuário %s)"
 msgid "_Proxy Login..."
 msgstr "Login do _Proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "A aba do Proxy estará disponível somente quando a conta estiver conectada."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "A aba do Proxy estará disponível somente quando a conta estiver habilitada."
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
 msgstr "Usuários"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
 msgid "Enter the users and set permissions"
 msgstr "Digite os usuários e defina as permissões"
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "New _Shared Folder..."
 msgstr "_Nova Pasta Compartilhada..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:446
+#: ../plugins/groupwise-features/share-folder-common.c:450
 msgid "Sharing"
 msgstr "Compartilhamento"
 
@@ -15867,19 +15879,19 @@ msgstr "_Importar para Agenda"
 msgid "_Import to Tasks"
 msgstr "Importar para Tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:197
+#: ../plugins/import-ics-attachments/icsimporter.c:198
 msgid "Import ICS"
 msgstr "Importar ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:225
+#: ../plugins/import-ics-attachments/icsimporter.c:226
 msgid "Select Task List"
 msgstr "Selecionar Lista de Tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:229
+#: ../plugins/import-ics-attachments/icsimporter.c:230
 msgid "Select Calendar"
 msgstr "Selecionar Agenda"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../plugins/import-ics-attachments/icsimporter.c:261
 #: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importar"
@@ -15957,103 +15969,103 @@ msgstr "Um compromisso na agenda '%s' está em conflito com esta reunião"
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Encontrado o compromisso na agenda '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:487
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Não é possível encontrar nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Não é possível encontrar esta reunião em nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:498
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Não é possível encontrar esta tarefa em nenhuma lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:502
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Não é possível encontrar este item em nenhum diário"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Procurando por uma versão existente deste compromisso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Não foi possível analisar item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Não foi possível enviar item para a agenda '%s'. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado para agenda '%s' como aceito"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado para a agenda '%s' como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado para a agenda '%s' como recusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado para a agenda '%s' como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador removeu o representante %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Notificação de cacelamento enviado para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:907
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 "Não foi possível enviar a notificação de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Estado do participante não pôde ser atualizado devido a um estado inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Não é possível atualizar participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Estado do participante atualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "A agenda anexada não é válida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 "A mensagem diz conter uma agenda, mas a agenda não é um iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "O item na agenda não é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16061,11 +16073,11 @@ msgstr ""
 "A mensagem contém uma agenda, mas a agenda não contém eventos, tarefas ou "
 "informação de livre/ocupado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "A agenda anexa contém múltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16075,25 +16087,22 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Remover mensagem depois da ação"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Procura de Conflitos</span>"
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+msgid "Conflict Search"
+msgstr "Procura de Conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Selecione a agenda para procurar por conflitos de reunião"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr "Tabela de Procura de Conflitos"
-
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:32
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Hoje"
@@ -16435,26 +16444,26 @@ msgid "_Update"
 msgstr "_Atualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Hora de início:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Hora de término:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Enviar atuali_zações aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "A_plicar a todas as instâncias"
 
@@ -16770,7 +16779,7 @@ msgstr "Um plugin para gerenciar quais plugins estão habilitados ou não."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:188
+#: ../plugins/plugin-manager/plugin-manager.c:180
 msgid "Plugin Manager"
 msgstr "Gerenciador de Módulos"
 
@@ -16782,30 +16791,22 @@ msgstr "Habilitar e desabilitar módulos"
 msgid "_Plugins"
 msgstr "_Módulos"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
 msgstr "Autore(s)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "Caminho"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Descrição"
 
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: Algumas mudanças somente terão efeito após o próximo reinício"
 
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
 msgstr "Módulo"
 
@@ -16851,7 +16852,7 @@ msgid "Gives an option to print mail from composer"
 msgstr "Fornecer uma opção para imprimir a mensagem a partir do redator"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
@@ -16885,7 +16886,7 @@ msgstr "Locais"
 msgid "_Publish Calendar Information"
 msgstr "_Publicar Informação de Agenda"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Você tem certeza que deseja excluir esta URL?"
 
@@ -16908,14 +16909,18 @@ msgstr ""
 "Manualmente (pelo menu de Ações)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "_Porta:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
 msgid "Publishing Location"
 msgstr "Local de Publicação"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
 msgid "Publishing _Frequency:"
 msgstr "_Freqüência de Publicação:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
 "SSH\n"
 "Public FTP\n"
@@ -16933,11 +16938,11 @@ msgstr ""
 "WebDAV seguro (HTTPS)\n"
 "Local especificado"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
 msgstr "_Tipo do Serviço:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
 msgstr "_Arquivo:"
 
@@ -16945,7 +16950,7 @@ msgstr "_Arquivo:"
 msgid "_Publish as:"
 msgstr "_Publicar como:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -17085,13 +17090,13 @@ msgid "Save Selected"
 msgstr "Salvar Selecionado"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Save to _Disk"
-msgstr "Salvar no _Disco"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "Salvar agendas ou lista de tarefas no disco."
 
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "Salvar no _Disco"
+
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
@@ -17105,8 +17110,8 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:170
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Selecionar arquivo de destino"
 
@@ -17119,11 +17124,11 @@ msgid "Selects a single calendar or task source for viewing."
 msgstr "Selecionar uma agenda ou fonte de tarefas para visualização."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "_Show only this Calendar"
+msgid "Show _only this Calendar"
 msgstr "Mo_strar somente esta Agenda"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "_Show only this Task List"
+msgid "Show _only this Task List"
 msgstr "Mo_strar somente esta Lista de Tarefas"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
@@ -17160,13 +17165,13 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor, selecione a informação que você deseja importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
+#: ../plugins/startup-wizard/startup-wizard.c:155
 #: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../plugins/startup-wizard/startup-wizard.c:235
 #: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importando dados."
@@ -17245,40 +17250,46 @@ msgid "Printer settings"
 msgstr "Configurações da impressora"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Sidebar is visible"
+msgstr "A barra lateral está visível"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Pular diálogo de alerta de desenvolvimento"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr ""
-"A versão de configuração do Evolution, com maior/menor/nível de configuração"
+"A versão de configuração do Evolution, com maior/menor/nível de configuração "
+"(por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "A altura padrão para a janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "A largura padrão para a janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura padrão para a barra lateral, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
 msgstr ""
 "A última versão de configuração do Evolution atualizada, com maior/menor/"
-"nível de configuração"
+"nível de configuração (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17289,33 +17300,37 @@ msgstr ""
 "estilo dos botões é determinado pela configuração da barra de ferramentas do "
 "GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas está visível"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Se o Evolution deve iniciar em modo desconectado em vez de modo conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether the sidebar should be visible."
+msgstr "Se a barra lateral deve estar visível."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas deve estar visível."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Se o diálogo de alerta em versões de desenvolvimento deve ser pulado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botões de janela devem estar visíveis."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "Estilo dos botões de janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "Botões de janela são visíveis"
 
@@ -17331,8 +17346,8 @@ msgstr "Conexões Ativas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Clique em OK para fechar estas conexões e desconectar"
 
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
@@ -17441,15 +17456,11 @@ msgstr ""
 "Gustavo Maciel Dias Vieira <gustavo@sagui.org>\n"
 "Afonso Celso Medina <afmedina@uol.com.br>"
 
-#: ../shell/e-shell-window-commands.c:544
-msgid "Groupware Suite"
-msgstr "Conjunto de Aplicativos de Groupware"
-
 #: ../shell/e-shell-window-commands.c:775
 msgid "_Work Online"
 msgstr "_Trabalhar Conectado"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Trabalhar Desconectado"
 
@@ -17457,23 +17468,23 @@ msgstr "_Trabalhar Desconectado"
 msgid "Work Offline"
 msgstr "Trabalhar Desconectado"
 
-#: ../shell/e-shell-window.c:370
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "O Evolution está atualmente conectado. Clique neste botão para trabalhar "
 "desconectado."
 
-#: ../shell/e-shell-window.c:378
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution está em processo de desconecção"
 
-#: ../shell/e-shell-window.c:385
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "O Evolution está atualmente desconectado. Clique neste botão para trabalhar "
 "conectado."
 
-#: ../shell/e-shell-window.c:775
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "Mudar para %s"
@@ -17482,24 +17493,24 @@ msgstr "Mudar para %s"
 msgid "Uknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: ../shell/e-shell.c:1273
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: ../shell/e-shell.c:1275
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o Banco de Dados de configuração"
 
@@ -17605,7 +17616,7 @@ msgstr ""
 "A Equipe do Evolution\n"
 
 #: ../shell/main.c:261
-msgid "Don't tell me again"
+msgid "Do not tell me again"
 msgstr "Não me diga novamente"
 
 #: ../shell/main.c:471
@@ -17718,7 +17729,7 @@ msgstr "A atualização de versões anteriores falhou: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
@@ -17789,7 +17800,7 @@ msgstr ""
 "\n"
 "Editar configurações de confiança:"
 
-#: ../smime/gui/cert-trust-dialog.c:153
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -17799,7 +17810,7 @@ msgstr ""
 "então você confia na autenticidade deste certificado a não ser que aqui "
 "esteja indicado o contrário"
 
-#: ../smime/gui/cert-trust-dialog.c:157
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -17842,22 +17853,22 @@ msgstr "Válido até"
 msgid "E-Mail Address"
 msgstr "Endereço de Email"
 
-#: ../smime/gui/certificate-viewer.c:342
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de Certificado: %s"
 
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Digite a senha para '%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
 msgstr "Digite a nova senha para o banco de dados de certificados"
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "Digite a nova senha"
 
@@ -18068,7 +18079,7 @@ msgid "_Edit CA Trust"
 msgstr "_Editar Confiança do CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:657
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "O certificado já existe"
 
@@ -18247,27 +18258,27 @@ msgstr "Digite a senha para o arquivo PKCS12:"
 msgid "Imported Certificate"
 msgstr "Certificado Importado"
 
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "Um anexo a adicionar."
 
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
 msgid "Content type of the attachment."
 msgstr "Tipo de conteúdo do anexo."
 
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
 msgstr "O nome de arquivo a exibir na mensagem."
 
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "Descrição do anexo."
 
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
 msgstr "Marcar anexo para exibição embutida por padrão."
 
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
 msgstr "Assunto padrão para a mensagem."
 
@@ -18368,7 +18379,7 @@ msgstr "Mover para Pasta..."
 msgid "Paste"
 msgstr "Colar"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Colar a área de transferência"
 
@@ -18396,7 +18407,7 @@ msgstr "Salvar contatos selecionados como um VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Salvar contatos da pasta selecionada como VCard."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2712
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
@@ -18442,7 +18453,7 @@ msgstr "Parar o Carregamento"
 msgid "View the current contact"
 msgstr "Ver o contato atual"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "Açõe_s"
@@ -18471,7 +18482,7 @@ msgstr "_Mover Contato para..."
 msgid "_Move Folder Contacts To"
 msgstr "_Mover a Pasta de Contatos Para"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Novo"
 
@@ -18496,110 +18507,115 @@ msgid "Day"
 msgstr "Dia"
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr "Excluir Todas as Ocorrências"
+msgid "Delete _all Occurrences"
+msgstr "Excl_uir Todas as Ocorrências"
 
 #: ../ui/evolution-calendar.xml.h:7
+msgid "Delete all occurrences"
+msgstr "Excluir Todas as Ocorrências"
+
+#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
 msgstr "Excluir o compromisso"
 
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
-msgstr "Excluir esta Ocorrência"
+#: ../ui/evolution-calendar.xml.h:10
+msgid "Delete this occurrence"
+msgstr "Excluir esta ocorrência"
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "Voltar"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "Avançar"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "Lista"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mês"
 
-#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Próxima"
 
-#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Visualiza a impressão da agenda a ser impressa"
 
-#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
 msgstr "Imprimir esta agenda"
 
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Excluir _Permanentemente"
 
-#: ../ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Excluir permanentemente compromissos e reuniões antigas"
 
-#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Selecionar _Data"
 
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selecionar _Hoje"
 
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Selecionar uma data específica"
 
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Selecionar hoje"
 
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Exibir como uma lista"
 
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Exibir um dia"
 
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Exibir um mês"
 
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Exibir uma semana"
 
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Exibir a semana útil"
 
-#: ../ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Ver o compromisso atual"
 
-#: ../ui/evolution-calendar.xml.h:34
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Semana"
 
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Semana Útil"
 
-#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Abrir Compromisso"
 
@@ -18674,11 +18690,11 @@ msgstr "_Fechar"
 #: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:40
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "Aj_uda"
 
@@ -18690,23 +18706,26 @@ msgstr "_Inserir"
 msgid "_Options"
 msgstr "_Opções"
 
-#: ../ui/evolution-event-editor.xml.h:1
-msgid "Alar_ms"
-msgstr "Alar_mes"
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All Day Event"
+msgstr "Evento de dia inteiro"
 
 #: ../ui/evolution-event-editor.xml.h:3
-msgid "All day Event"
+msgid "All _Day Event"
 msgstr "Evento de _dia inteiro"
 
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
 msgstr "Classificar como Confidencial"
 
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
 msgid "Classify as Private"
 msgstr "Classificar como Privado"
 
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-task-editor.xml.h:3
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
 msgid "Classify as public"
 msgstr "Classificar como Público"
 
@@ -18722,7 +18741,8 @@ msgstr "Opções a_vançadas de envio"
 msgid "Make this a recurring event"
 msgstr "Tornar este evento recorrente"
 
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "Público"
 
@@ -18735,7 +18755,7 @@ msgid "R_ole Field"
 msgstr "Campo _Papel"
 
 #: ../ui/evolution-event-editor.xml.h:16
-msgid "Show time as b_usy"
+msgid "Show time as _busy"
 msgstr "E_xibir hora como ocupado"
 
 #: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
@@ -18762,12 +18782,13 @@ msgstr "Alternar a exibição do campo de estado"
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alternar a exibição do campo de fuso horário"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "Alternar a exibição do campo de categorias"
 
 #: ../ui/evolution-event-editor.xml.h:24
-msgid "Toggles whether to have All day Event"
+msgid "Toggles whether to have All Day Event"
 msgstr "Alternar a exibição do campo evento de dia inteiro"
 
 #: ../ui/evolution-event-editor.xml.h:25
@@ -18775,14 +18796,16 @@ msgid "Toggles whether to show time as busy"
 msgstr "Alternar a exibição do tempo como ocupado"
 
 #: ../ui/evolution-event-editor.xml.h:26
-msgid "_All day Event"
-msgstr "Evento de _dia inteiro"
+msgid "_Alarms"
+msgstr "Alarmes"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "C_lassificação"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "_Confidencial"
 
@@ -18790,7 +18813,8 @@ msgstr "_Confidencial"
 msgid "_Free/Busy"
 msgstr "_Livre/Ocupado"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "_Particular"
 
@@ -18904,12 +18928,12 @@ msgstr "Agrupar Todos os En_cadeamentos"
 msgid "Collapse all message threads"
 msgstr "Agrupar todas as cadeias de mensagem"
 
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copiar a(s) mensagem(ns) selecionada(s) para a área de transferência"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7 ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Cortar mensagem(ns) selecionada(s) para a área de transferência"
 
@@ -18942,11 +18966,11 @@ msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Ocultar mensagens excluídas ao invés de exibi-las cortadas"
 
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Mar_k Messages as Read"
-msgstr "Marcar Men_sagens como Lidas"
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "Marcar Todas Men_sagens como Lidas"
 
-#: ../ui/evolution-mail-list.xml.h:17 ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr "Colar mensagem(ns) da área de transferência"
 
@@ -19051,10 +19075,14 @@ msgstr "Redigir uma resposta à lista de discussão da mensagem selecionada"
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redigir uma resposta ao remetente da mensagem selecionada"
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "Copiar mensagens selecionadas para outra pasta"
 
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Copia as mensagens selecionadas para a área de transferência"
+
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Criar Re_gra"
@@ -19091,6 +19119,10 @@ msgstr "Criar uma regra para filtrar mensagens para esta lista de discussão"
 msgid "Create a rule to filter messages with this subject"
 msgstr "Criar uma regra para filtrar mensagens com este assunto"
 
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Recorta as mensagens selecionadas para a área de transferência"
+
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Diminuir o tamanho do texto"
@@ -19104,12 +19136,12 @@ msgid "Display the next message"
 msgstr "Exibir a próxima mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next unread message"
-msgstr "Exibir a próxima mensagem não lida"
+msgid "Display the next thread"
+msgstr "Exibir o próximo tópico"
 
 #: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread thread"
-msgstr "Exibir o próximo encadeamento não lido"
+msgid "Display the next unread message"
+msgstr "Exibir a próxima mensagem não lida"
 
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
@@ -19148,8 +19180,8 @@ msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensagens selecionadas pelo estado de indesejada"
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como lembrete"
+msgid "Flag selected messages for follow-up"
+msgstr "Marcar as mensagens selecionadas como lembrete"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -19184,36 +19216,36 @@ msgid "Mar_k as"
 msgstr "Mar_car como"
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como lida(s)"
+msgid "Mark the selected messages as having been read"
+msgstr "Marcar as mensagens selecionadas como lidas"
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como importante(s)"
+msgid "Mark the selected messages as important"
+msgstr "Marcar as mensagens selecionadas como importante"
 
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como indesejada(s)"
+msgid "Mark the selected messages as junk"
+msgstr "Marcar as mensagens selecionadas como indesejadas"
 
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como não sendo indesejada(s)"
+msgid "Mark the selected messages as not being junk"
+msgstr "Marcar as mensagens selecionadas como não indesejadas"
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como não lida(s)"
+msgid "Mark the selected messages as not having been read"
+msgstr "Marcar as mensagens selecionadas como não lidas"
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como sem importância"
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar as mensagens selecionadas como não importantes"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensagens selecionadas para exclusão"
 
 #: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected message(s) to another folder"
-msgstr "Mover a(s) mensagem(ns) selecionada(s) para outra pasta"
+msgid "Move selected messages to another folder"
+msgstr "Mover as mensagens selecionadas para outra pasta"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
@@ -19236,17 +19268,21 @@ msgid "Open a window for composing a mail message"
 msgstr "Abrir uma janela para redigir uma mensagem de correio"
 
 #: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected message in a new window"
+msgid "Open the selected messages in a new window"
 msgstr "Abrir a mensagem selecionada em uma nova janela"
 
 #: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected message in the composer for editing"
+msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir a mensagem selecionada no redator para editá-la"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "Mensagem Não Lida An_terior"
 
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Colar mensagens da área de transferência"
+
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
 msgstr "P_ublicar uma Nova Nensagem na Pasta"
@@ -19288,7 +19324,7 @@ msgid "Reset the text to its original size"
 msgstr "Restaurar o texto ao seu tamanho original"
 
 #: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the message as a text file"
+msgid "Save the selected messages as a text file"
 msgstr "Salvar a mensagem como um arquivo texto"
 
 #: ../ui/evolution-mail-message.xml.h:86
@@ -19328,11 +19364,11 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Exibir um cursor intermitente no corpo das mensagens exibidas"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show message in the normal style"
+msgid "Show messages in the normal style"
 msgstr "Exibir a mensagem no estilo normal"
 
 #: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message with all email headers"
+msgid "Show messages with all email headers"
 msgstr "Exibir a mensagem com todos os cabeçalhos de e-mail"
 
 #: ../ui/evolution-mail-message.xml.h:97
@@ -19340,7 +19376,7 @@ msgid "Show the raw email source of the message"
 msgstr "Exibir o código-fonte bruto da mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:98
-msgid "Un-delete the selected messages"
+msgid "Undelete the selected messages"
 msgstr "Desfazer a exclusão das mensagens selecionadas"
 
 #: ../ui/evolution-mail-message.xml.h:99
@@ -19584,6 +19620,10 @@ msgstr "Salvar o arquivo atual com um nome diferente"
 msgid "Save the message in a specified folder"
 msgstr "Salvar a mensagem em uma pasta especificada"
 
+#: ../ui/evolution-message-composer.xml.h:29
+msgid "Send"
+msgstr "Enviar"
+
 #: ../ui/evolution-message-composer.xml.h:30
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
@@ -19741,11 +19781,11 @@ msgid "_Status Details"
 msgstr "Detalhes de _Estado"
 
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
+msgid "Copy selected tasks"
 msgstr "Copiar tarefa selecionada"
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+msgid "Cut selected tasks"
 msgstr "Cortar tarefa selecionada"
 
 #: ../ui/evolution-tasks.xml.h:7
@@ -19765,7 +19805,7 @@ msgid "Mark selected tasks as complete"
 msgstr "Marcar tarefas selecionadas como concluídas"
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
+msgid "Paste tasks from the clipboard"
 msgstr "Colar tarefa da área de transferência"
 
 #: ../ui/evolution-tasks.xml.h:13
@@ -19881,6 +19921,14 @@ msgid "Show information about Evolution"
 msgstr "Exibir informação sobre o Evolution"
 
 #: ../ui/evolution.xml.h:24
+msgid "Side _Bar"
+msgstr "_Barra Lateral"
+
+#: ../ui/evolution.xml.h:25
+msgid "Status _Bar"
+msgstr "_Ver Barra de Estado"
+
+#: ../ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Enviar Relatório de Erro"
 
@@ -19888,75 +19936,75 @@ msgstr "Enviar Relatório de Erro"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Enviar Relatório de _Erro"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relatório de erro usando o Bug Buddy"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:34
 msgid "Tool_bar"
 msgstr "_Barra de Ferramentas"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:36
+msgid "View/Hide the Side Bar"
+msgstr "Exibir/Esconder a Barra Lateral"
+
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Exibir/Esconder a Barra de Estado"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "Fe_char esta Janela"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Esquecer _Senhas"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Ocultar botões"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Í_cones somente"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Referência Rápida"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "Sai_r"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Al_ternador de Aparência"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Opções de _Sincronização..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Somente _texto"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "_Ver Barra de Estado"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Janela"
 
@@ -20029,7 +20077,7 @@ msgid "With _Status"
 msgstr "Com _Estado"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20085,9 +20133,9 @@ msgid "_Edit..."
 msgstr "_Editar..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
 msgstr "Tabela"
 
@@ -20157,74 +20205,70 @@ msgid "MTWTFSS"
 msgstr "STQQSSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1098
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "Botão Anterior"
-
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Agenda Mensal"
 
-#: ../widgets/misc/e-canvas-background.c:459
-#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3568
-#: ../widgets/text/e-text.c:3569
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Cor de preenchimento"
 
-#: ../widgets/misc/e-canvas-background.c:466
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:473
-#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:464
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3575
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3583
-#: ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "Cor de preenchimento GDK"
 
-#: ../widgets/misc/e-canvas-background.c:480
-#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3590
-#: ../widgets/text/e-text.c:3591
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Preencher pontilhado"
 
-#: ../widgets/misc/e-canvas-background.c:487
-#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:494
-#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:501
-#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:508
-#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Largura mínima"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Largura Mínima"
 
@@ -20237,7 +20281,7 @@ msgstr "Espaçamento"
 msgid "Now"
 msgstr "Agora"
 
-#: ../widgets/misc/e-cell-date-edit.c:802
+#: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A hora deve estar no formato: %s"
@@ -20246,90 +20290,94 @@ msgstr "A hora deve estar no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor percentual deve estar entre 0 e 100, inclusive"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Central European"
 msgstr "Centro europeu"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Chinese"
 msgstr "Chinês"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Greek"
 msgstr "Grego"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:72
+msgid "Thai"
+msgstr "Tailandês"
+
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Western European"
 msgstr "Oeste Europeu"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Western European, New"
 msgstr "Oeste Europeu, Novo"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 #: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:102
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:105
 msgid "Visual"
 msgstr "Visual"
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:174
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Conjunto de caracteres desconhecido: %s"
 
-#: ../widgets/misc/e-charset-picker.c:216
+#: ../widgets/misc/e-charset-picker.c:219
 msgid "Character Encoding"
 msgstr "Codificação de Caracteres"
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:234
 msgid "Enter the character set to use"
 msgstr "Escolha o conjunto de caracteres a ser usado"
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:482
 msgid "Ch_aracter Encoding"
 msgstr "Codificação de C_aracteres"
 
@@ -20338,40 +20386,32 @@ msgid "..."
 msgstr "..."
 
 #: ../widgets/misc/e-dateedit.c:321
-msgid "Date and Time Entry"
-msgstr "Entrada de Data e Hora"
+msgid "Date and Time"
+msgstr "Data e Hora"
 
 #: ../widgets/misc/e-dateedit.c:340
 msgid "Text entry to input date"
 msgstr "Entrada de texto para digitar data"
 
-#: ../widgets/misc/e-dateedit.c:341
-msgid "Text Date Entry"
-msgstr "Entrada de Data em Texto"
-
 #: ../widgets/misc/e-dateedit.c:362
 msgid "Click this button to show a calendar"
 msgstr "Clique neste botão para mostrar uma agenda"
 
-#: ../widgets/misc/e-dateedit.c:363
-msgid "Date Button"
-msgstr "Botão de Data"
-
 #: ../widgets/misc/e-dateedit.c:384
 msgid "Combo box to select time"
 msgstr "Combo box para seleção de hora"
 
 #: ../widgets/misc/e-dateedit.c:385
-msgid "Time Combo Box"
-msgstr "Seletor de Hora"
+msgid "Time"
+msgstr "_Hora"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1445 ../widgets/misc/e-dateedit.c:1772
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1448 ../widgets/misc/e-dateedit.c:1775
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -20411,11 +20451,11 @@ msgstr "Rótulo do componente"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Um widget para exibir no lugar do usual rótulo do expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3324
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Tamanho do expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3325
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Tamanho da seta do expansor"
 
@@ -20427,16 +20467,21 @@ msgstr "Espaçamento do Indicador"
 msgid "Spacing around expander arrow"
 msgstr "Espaçamento ao redor da seta do expansor"
 
-#: ../widgets/misc/e-filter-bar.c:201
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "Pesquisa Avançada"
+
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Pesquisas"
 
-#: ../widgets/misc/e-filter-bar.c:203
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Pesquisas"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:226
+#: ../widgets/misc/e-filter-bar.c:227
 msgid "Save Search"
 msgstr "Salvar Pesquisa"
 
@@ -20456,11 +20501,11 @@ msgstr "Pesquisa _Avançada..."
 msgid "Choose Image"
 msgstr "Escolher Imagem"
 
-#: ../widgets/misc/e-map.c:651
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Mapa Mundi"
 
-#: ../widgets/misc/e-map.c:653
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -20480,55 +20525,55 @@ msgstr "Sincronizar Registros Particulares:"
 msgid "Sync Categories:"
 msgstr "Categorias de Sincronização:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "Mensagem vazia"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr "Modelo de refluxo"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "Largura da coluna"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:372
-msgid "Search Text Entry"
-msgstr "Entrada de Texto para Pesquisa"
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "_Pesquisar"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Pesquisar Agora"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Tipo de Pesquisa"
 
-#: ../widgets/misc/e-search-bar.c:893
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID do item"
 
-#: ../widgets/misc/e-search-bar.c:900
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ID do Sub-item"
 
-#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3490
-#: ../widgets/text/e-text.c:3491
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Texto"
 
-#: ../widgets/misc/e-search-bar.c:987
+#: ../widgets/misc/e-search-bar.c:984
 msgid "Find _Now"
 msgstr "Pesquisar A_gora"
 
@@ -20554,7 +20599,7 @@ msgstr "Modo de Seleção"
 msgid "Cursor Mode"
 msgstr "Modo do Cursor"
 
-#: ../widgets/misc/e-send-options.c:524
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Quando exc_luída:"
 
@@ -20730,23 +20775,23 @@ msgstr "Coluna Com Foco"
 msgid "Unselected Column"
 msgstr "Coluna Não Selecionada"
 
-#: ../widgets/table/e-cell-text.c:1742
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Coluna Riscada"
 
-#: ../widgets/table/e-cell-text.c:1749
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Coluna Sublinhada"
 
-#: ../widgets/table/e-cell-text.c:1756
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Coluna em Negrito"
 
-#: ../widgets/table/e-cell-text.c:1763
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Coluna Colorida"
 
-#: ../widgets/table/e-cell-text.c:1777
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Coluna da Cor de Fundo"
 
@@ -20866,16 +20911,16 @@ msgid "_Show these fields in order:"
 msgstr "_Mostrar estes campos na ordem:"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1804
 msgid "DnD code"
 msgstr "Código DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1818
 msgid "Full Header"
 msgstr "Cabeçalho Completo"
 
@@ -20896,198 +20941,198 @@ msgstr ""
 "arraste-a para o local que você deseja que\n"
 "ela apareça."
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
 msgstr "%s : %s (%d item)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s : %s (%d items)"
 msgstr "%s : %s (%d itens)"
 
-#: ../widgets/table/e-table-group-container.c:356
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
 msgstr "%s (%d item)"
 
-#: ../widgets/table/e-table-group-container.c:357
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s (%d items)"
 msgstr "%s (%d itens)"
 
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Cores de Linha Alternantes"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "Grade Desenhada Horizontalmente"
 
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "Grade Desenhada Verticalmente"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3289 ../widgets/table/e-tree.c:3290
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "Foco de desenho"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Modelo de seleção"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3271
-#: ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
 msgstr "Comprimento do Limiar"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
 msgstr "Altura de linha uniforme"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "Congelado"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Personalizar Visão Atual"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Ordenar em Ordem Crescente"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Ordenar em Ordem Decrescente"
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Não Ordenar"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Agrupar Por Este Campo"
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Agrupar Por Caixa"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Remover Esta Coluna"
 
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Adicionar uma Coluna..."
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Alinhamento"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Melhor Ajuste"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Formatar Colunas..."
 
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Personalizar Visão Atual..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Conjunto de Fontes"
 
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Ordenar Informação"
 
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Árvore"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Cabeçalho da tabela"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Modelo de tabela"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Linha do cursor"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3310
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
 msgid "Always search"
 msgstr "Buscar sempre"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "Usar clique para adicionar"
 
-#: ../widgets/table/e-tree.c:3296 ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr "Adaptador de tabela ETree"
 
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-tree.c:3305
 msgid "Retro Look"
 msgstr "Visual Retrô"
 
-#: ../widgets/table/e-tree.c:3318
+#: ../widgets/table/e-tree.c:3306
 msgid "Draw lines and +/- expanders."
 msgstr "Desenhar linhas e expansores +/-."
 
@@ -21104,7 +21149,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Isto deveria testar o item canvas do mini-cartão"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Processador de Eventos"
 
@@ -21117,57 +21162,57 @@ msgid "GDKFont"
 msgstr "GDKFont"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Alinhamento"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Usar omissão de palavra óbvia"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Omissão de Palavras"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3633 ../widgets/text/e-text.c:3634
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Quebra de linha"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Caracteres de quebra"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3647 ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Máximo de linhas"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Permitir quebras de linha"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Desenhar bordas"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Desenhar fundo"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3690 ../widgets/text/e-text.c:3691
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Desenhar base"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3697 ../widgets/text/e-text.c:3698
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Posição do cursor"
 
@@ -21175,365 +21220,514 @@ msgstr "Posição do cursor"
 msgid "Emulate label resize"
 msgstr "Emular a alteração de tamanho do rótulo"
 
-#: ../widgets/text/e-text.c:2724
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Métodos de Entrada"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Riscado"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Âncora"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Largura do Clip"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Altura do Clip"
 
-#: ../widgets/text/e-text.c:3540 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3547 ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Preencher retângulo do clip"
 
-#: ../widgets/text/e-text.c:3554 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "Deslocamento X"
 
-#: ../widgets/text/e-text.c:3561 ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Deslocamento Y"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Largura do texto"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Altura do texto"
 
-#: ../widgets/text/e-text.c:3704 ../widgets/text/e-text.c:3705
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "Contexto do MI"
 
-#: ../widgets/text/e-text.c:3711 ../widgets/text/e-text.c:3712
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Alça do Popup"
 
-msgid "Select target addressbook."
-msgstr "Selecionar catálogo de endereços alvo."
+#~ msgid "Addressbook"
+#~ msgstr "Catálogo de Endereços"
 
-msgid "(none)"
-msgstr "(nenhum)"
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
+#~ "if you are in a insecure environment. For example, if you and your LDAP "
+#~ "server are behind a firewall at work, then Evolution doesn't need to use "
+#~ "SSL/TLS because your connection is already secure."
+#~ msgstr ""
+#~ "A seleção desta opção significa que o Evolution apenas tentará usar SSL/"
+#~ "TLS se você estiver em um ambiente inseguro. Por exemplo, se você e seu "
+#~ "servidor LDAP estiverem atrás de uma firewall no trabalho, então o "
+#~ "Evolution não precisa usar SSL/TLS, pois a sua conexão já é segura."
 
-msgid "Primary Email"
-msgstr "Email Principal"
+#~ msgid "Advanced..."
+#~ msgstr "Avançado..."
 
-msgid "Select an Action"
-msgstr "Selecionar uma Ação"
+#~ msgid "_Advanced..."
+#~ msgstr "_Avançado..."
 
-msgid "Create a new contact \"%s\""
-msgstr "Criar um novo contato \"%s\""
+#~ msgid "(%d seconds)"
+#~ msgstr "(%d segundos)"
 
-msgid "Add address to existing contact \"%s\""
-msgstr "Adicionar endereço a um contato existente \"%s\""
+#~ msgid "(%d %s %d %s)"
+#~ msgstr "(%d %s %d %s)"
 
-msgid "Merge E-Mail Address"
-msgstr "Mesclar Endereço de E-Mail"
+#~ msgid "(%d %s)"
+#~ msgstr "(%d %s)"
 
-msgid "Discard Changes"
-msgstr "Descartar Alterações"
+#~ msgid " %u second"
+#~ msgstr " %u segundo"
 
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s até %s"
+#~ msgid " %u seconds"
+#~ msgstr " %u segundos"
 
-msgid "description of appointment"
-msgstr "descrição do compromisso"
+#~ msgid " %u minute"
+#~ msgstr " %u minuto"
 
-msgid "Dismiss"
-msgstr "Ignorar"
+#~ msgid " %u minutes"
+#~ msgstr " %u minutos"
 
-msgid "Dismiss All"
-msgstr "Ignorar Tudo"
+#~ msgid "%u hour"
+#~ msgstr "%u hora"
 
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"Alarme em %s\n"
-"%s\n"
-"Iniciando em %s\n"
-"Terminando em %s"
+#~ msgid "%u hours"
+#~ msgstr "%u horas"
 
-msgid "Remove"
-msgstr "Remover"
+#~ msgid "Or_ganizer"
+#~ msgstr "Or_ganizador"
 
-msgid "Don't Remove"
-msgstr "Não Remover"
+#~ msgid "_Description:"
+#~ msgstr "_Descrição:"
 
-msgid "05 minutes"
-msgstr "05 minutos"
+#~ msgid "_Set alarm\t"
+#~ msgstr "_Configurar alarme\t"
 
-msgid "10 minutes"
-msgstr "10 minutos"
+#~ msgid "<span weight=\"bold\">Basics</span>"
+#~ msgstr "<span weight=\"bold\">Fundamentos</span>"
 
-msgid "15 minutes"
-msgstr "15 minutos"
+#~ msgid "Classi_fication:"
+#~ msgstr "Classi_ficação:"
 
-msgid "30 minutes"
-msgstr "30 minutos"
+#~ msgid "_Group"
+#~ msgstr "_Grupo"
 
-msgid "60 minutes"
-msgstr "60 minutos"
+#~ msgid "Task Table"
+#~ msgstr "Tabela de Tarefas"
 
-msgid "<b>Alerts</b>"
-msgstr "<b>Alertas</b> "
+#~ msgid "Removal Complete"
+#~ msgstr "Remoção Concluída"
 
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Servidor de Livre/Ocupado Padrão</b>"
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tatos..."
 
-msgid "<b>General</b>"
-msgstr "<b>Geral</b>"
+#~ msgid "Memo Table"
+#~ msgstr "Tabela de Memorandos"
 
-msgid "<b>Publishing</b>"
-msgstr "<b>Publicação</b>"
+#~ msgid "Timezone Button"
+#~ msgstr "Botão de Fuso Horário "
 
-msgid "<b>Task List</b>"
-msgstr "<b>Lista de Tarefas</b>"
+#~ msgid "The Evolution Groupware Suite"
+#~ msgstr "O Conjunto de Aplicações para Grupos de Trabalho Evolution"
 
-msgid "<b>Time</b>"
-msgstr "<b>Hora</b>"
+#~ msgid "Mail Accounts Table"
+#~ msgstr "Tabela de Contas de Correio"
 
-msgid "<b>Work Week</b>"
-msgstr "<b>Semana Útil</b>"
+#~ msgid "Attachment Button"
+#~ msgstr "Botão de Anexo"
 
-msgid "Calendar and Tasks Settings"
-msgstr "Configurações de Agenda e Tarefas"
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Alternar Barra de Anexos"
 
-msgid "Color for overdue tasks"
-msgstr "Cor para tarefas atrasadas"
+#~ msgid "Filters"
+#~ msgstr "Filtros"
 
-msgid "Color for tasks due today"
-msgstr "Cor das tarefas com prazo para hoje"
+#~ msgid "T_erminal Font:"
+#~ msgstr "Fonte de _Terminal:"
 
-msgid "Days"
-msgstr "Dias"
+#~ msgid "_Show animated images"
+#~ msgstr "_Exibir imagens animadas"
 
-msgid "Hours"
-msgstr "Horas"
+#~ msgid "<b>%s (%s)</b> : %s"
+#~ msgstr "<b>%s (%s)</b> : %s"
 
-msgid "Minutes"
-msgstr "Minutos"
+#~ msgid "<b>%s (%s)</b>"
+#~ msgstr "<b>%s (%s)</b>"
 
-msgid "_Add URL"
-msgstr "Adicionar _URL"
+#~ msgid "<b>%s</b> : %s"
+#~ msgstr "<b>%s</b> : %s"
 
-msgid "option menu to choose reminder units"
-msgstr "menu de opções para escolher unidades do lembrete"
+#~ msgid "<b>%s</b>"
+#~ msgstr "<b>%s</b>"
 
-msgid "option menu to choose time units"
-msgstr "menu de opções para escolher unidades de tempo"
+#~ msgid "Message List"
+#~ msgstr "Lista de Mensagens"
 
-msgid "_Attachment Bar (drop attachments here)"
-msgstr "Barra de _Anexos (solte aqui os anexos)"
+#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Contatos Automáticos</span>"
 
-msgid "Scheduling"
-msgstr "Agendar"
+#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Contatos de Mensageiros Instantâneos</span>"
 
-msgid "Invitations"
-msgstr "Convites"
+#~ msgid "dialog1"
+#~ msgstr "dialog1"
 
-msgid "<b>Date and Time</b>"
-msgstr "<b>Data e Hora</b>"
+#~ msgid "<span weight=\"bold\">Conflict Search</span>"
+#~ msgstr "<span weight=\"bold\">Procura de Conflitos</span>"
 
-msgid "<b>Send Options</b>"
-msgstr "<b>Opções de Envio</b>"
+#~ msgid "Id"
+#~ msgstr "Id"
 
-msgid "This appointment has customized alarms"
-msgstr "Este compromisso possui alarmes personalizados"
+#~ msgid "Path"
+#~ msgstr "Caminho"
 
-msgid "_Alarm"
-msgstr "_Alarme"
+#~ msgid "Delete this Occurrence"
+#~ msgstr "Excluir esta Ocorrência"
 
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>Dele_gados</b>"
+#~ msgid "Alar_ms"
+#~ msgstr "Alar_mes"
 
-msgid "<b>From:</b>"
-msgstr "<b>De:</b>"
+#~ msgid "_All day Event"
+#~ msgstr "Evento de _dia inteiro"
 
-msgid "_Delegate To..."
-msgstr "_Delegar Para..."
+#~ msgid "Previous Button"
+#~ msgstr "Botão Anterior"
 
-msgid "Assignment"
-msgstr "Atribuição"
+#~ msgid "Text Date Entry"
+#~ msgstr "Entrada de Data em Texto"
 
-msgid "Task Description"
-msgstr "Descrição da Tarefa"
+#~ msgid "Date Button"
+#~ msgstr "Botão de Data"
 
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar Informação de Livre/Ocupado"
+#~ msgid "Time Combo Box"
+#~ msgstr "Seletor de Hora"
 
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+#~ msgid "Search Text Entry"
+#~ msgstr "Entrada de Texto para Pesquisa"
 
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
+#~ msgid "Select target addressbook."
+#~ msgstr "Selecionar catálogo de endereços alvo."
 
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I %p"
+#~ msgid "(none)"
+#~ msgstr "(nenhum)"
 
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %d/%m/%Y %H"
+#~ msgid "Primary Email"
+#~ msgstr "Email Principal"
 
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d/%m/%Y %I:%M:%S %p"
+#~ msgid "Select an Action"
+#~ msgstr "Selecionar uma Ação"
 
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %H:%M:%S"
+#~ msgid "Create a new contact \"%s\""
+#~ msgstr "Criar um novo contato \"%s\""
 
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d/%m/%Y %I:%M %p"
+#~ msgid "Add address to existing contact \"%s\""
+#~ msgstr "Adicionar endereço a um contato existente \"%s\""
 
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y %H:%M"
+#~ msgid "Merge E-Mail Address"
+#~ msgstr "Mesclar Endereço de E-Mail"
 
-msgid "%m/%d/%Y %I %p"
-msgstr "%d/%m/%Y %I %p"
+#~ msgid "Discard Changes"
+#~ msgstr "Descartar Alterações"
 
-msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y %H"
+#~ msgid ""
+#~ "<big><b>%s</b></big>\n"
+#~ "%s until %s"
+#~ msgstr ""
+#~ "<big><b>%s</b></big>\n"
+#~ "%s até %s"
 
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#~ msgid "description of appointment"
+#~ msgstr "descrição do compromisso"
 
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#~ msgid "Dismiss"
+#~ msgstr "Ignorar"
 
-msgid "%I %p"
-msgstr "%I %p"
+#~ msgid "Dismiss All"
+#~ msgstr "Ignorar Tudo"
 
-msgid "_Rule name:"
-msgstr "Nome da _regra:"
+#~ msgid ""
+#~ "Alarm on %s\n"
+#~ "%s\n"
+#~ "Starting at %s\n"
+#~ "Ending at %s"
+#~ msgstr ""
+#~ "Alarme em %s\n"
+#~ "%s\n"
+#~ "Iniciando em %s\n"
+#~ "Terminando em %s"
 
-msgid "If"
-msgstr "Se"
+#~ msgid "Remove"
+#~ msgstr "Remover"
 
-msgid "Execute actions"
-msgstr "Executar ações"
+#~ msgid "Don't Remove"
+#~ msgstr "Não Remover"
 
-msgid "Execute Command..."
-msgstr "Executar Comando..."
+#~ msgid "05 minutes"
+#~ msgstr "05 minutos"
 
-msgid "Server: %s, Type: %s"
-msgstr "Servidor: %s, Tipo: %s"
+#~ msgid "10 minutes"
+#~ msgstr "10 minutos"
 
-msgid "Path: %s, Type: %s"
-msgstr "Caminho: %s, Tipo: %s"
+#~ msgid "15 minutes"
+#~ msgstr "15 minutos"
 
-msgid "Type: %s"
-msgstr "Tipo: %s"
+#~ msgid "30 minutes"
+#~ msgstr "30 minutos"
 
-msgid "Automatic contacts"
-msgstr "Contatos automáticos"
+#~ msgid "60 minutes"
+#~ msgstr "60 minutos"
 
-msgid "Exchange Connector access error."
-msgstr "Erro de acesso da conta do Exchange."
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>Alertas</b> "
 
-msgid "Meetings and Tasks"
-msgstr "Reuniões e Tarefas"
+#~ msgid "<b>Default Free/Busy Server</b>"
+#~ msgstr "<b>Servidor de Livre/Ocupado Padrão</b>"
 
-msgid "Plugin manager"
-msgstr "Gerenciador de módulos"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Geral</b>"
 
-msgid "Sa junk-plugin"
-msgstr "Sa junk-plugin"
+#~ msgid "<b>Publishing</b>"
+#~ msgstr "<b>Publicação</b>"
 
-msgid "learns junk messages using spamd."
-msgstr "aprender mensagens indesejadas utilizando o spamd."
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Lista de Tarefas</b>"
 
-msgid "Uid"
-msgstr "Uid"
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Hora</b>"
 
-msgid "Url"
-msgstr "Url"
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Semana Útil</b>"
 
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-"A extensão de nome de arquivo sugerida para este tipo de arquivo (%s) não é "
-"usada no nome de arquivo escolhido. Você deseja continuar?"
+#~ msgid "Calendar and Tasks Settings"
+#~ msgstr "Configurações de Agenda e Tarefas"
 
-msgid "Evolution Settings"
-msgstr "Configurações do Evolution"
+#~ msgid "Color for overdue tasks"
+#~ msgstr "Cor para tarefas atrasadas"
 
-msgid "C"
-msgstr "C"
+#~ msgid "Color for tasks due today"
+#~ msgstr "Cor das tarefas com prazo para hoje"
 
-msgid "CN"
-msgstr "CN"
+#~ msgid "Days"
+#~ msgstr "Dias"
 
-msgid "OU"
-msgstr "OU"
+#~ msgid "Hours"
+#~ msgstr "Horas"
 
-msgid "O"
-msgstr "O"
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
 
-msgid "L"
-msgstr "L"
+#~ msgid "_Add URL"
+#~ msgstr "Adicionar _URL"
 
-msgid "DN"
-msgstr "DN"
+#~ msgid "option menu to choose reminder units"
+#~ msgstr "menu de opções para escolher unidades do lembrete"
 
-msgid "DC"
-msgstr "DC"
+#~ msgid "option menu to choose time units"
+#~ msgstr "menu de opções para escolher unidades de tempo"
 
-msgid "ST"
-msgstr "ST"
+#~ msgid "_Attachment Bar (drop attachments here)"
+#~ msgstr "Barra de _Anexos (solte aqui os anexos)"
 
-msgid "E"
-msgstr "L"
+#~ msgid "Scheduling"
+#~ msgstr "Agendar"
 
-msgid "_Preview Pane"
-msgstr "_Painel de Visualização"
+#~ msgid "Invitations"
+#~ msgstr "Convites"
 
-msgid "_Select All"
-msgstr "_Selecionar Tudo"
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Data e Hora</b>"
 
-msgid "Delete this occurrence"
-msgstr "Excluir esta ocorrência"
+#~ msgid "<b>Send Options</b>"
+#~ msgstr "<b>Opções de Envio</b>"
+
+#~ msgid "This appointment has customized alarms"
+#~ msgstr "Este compromisso possui alarmes personalizados"
+
+#~ msgid "<b>Dele_gatees</b>"
+#~ msgstr "<b>Dele_gados</b>"
+
+#~ msgid "<b>From:</b>"
+#~ msgstr "<b>De:</b>"
+
+#~ msgid "_Delegate To..."
+#~ msgstr "_Delegar Para..."
+
+#~ msgid "Assignment"
+#~ msgstr "Atribuição"
+
+#~ msgid "_Publish Free/Busy Information"
+#~ msgstr "_Publicar Informação de Livre/Ocupado"
+
+#~ msgid "%a %m/%d/%Y %I:%M %p"
+#~ msgstr "%a %d/%m/%Y %I:%M %p"
+
+#~ msgid "%a %m/%d/%Y %H:%M"
+#~ msgstr "%a %d/%m/%Y %H:%M"
+
+#~ msgid "%a %m/%d/%Y %I %p"
+#~ msgstr "%a %d/%m/%Y %I %p"
+
+#~ msgid "%a %m/%d/%Y %H"
+#~ msgstr "%a %d/%m/%Y %H"
+
+#~ msgid "%m/%d/%Y %I:%M:%S %p"
+#~ msgstr "%d/%m/%Y %I:%M:%S %p"
+
+#~ msgid "%m/%d/%Y %H:%M:%S"
+#~ msgstr "%d/%m/%Y %H:%M:%S"
+
+#~ msgid "%m/%d/%Y %I:%M %p"
+#~ msgstr "%d/%m/%Y %I:%M %p"
+
+#~ msgid "%m/%d/%Y %H:%M"
+#~ msgstr "%d/%m/%Y %H:%M"
+
+#~ msgid "%m/%d/%Y %I %p"
+#~ msgstr "%d/%m/%Y %I %p"
+
+#~ msgid "%m/%d/%Y %H"
+#~ msgstr "%d/%m/%Y %H"
+
+#~ msgid "%I:%M:%S %p"
+#~ msgstr "%I:%M:%S %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%I %p"
+#~ msgstr "%I %p"
+
+#~ msgid "_Rule name:"
+#~ msgstr "Nome da _regra:"
+
+#~ msgid "If"
+#~ msgstr "Se"
+
+#~ msgid "Execute actions"
+#~ msgstr "Executar ações"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Executar Comando..."
+
+#~ msgid "Server: %s, Type: %s"
+#~ msgstr "Servidor: %s, Tipo: %s"
+
+#~ msgid "Path: %s, Type: %s"
+#~ msgstr "Caminho: %s, Tipo: %s"
+
+#~ msgid "Type: %s"
+#~ msgstr "Tipo: %s"
+
+#~ msgid "Automatic contacts"
+#~ msgstr "Contatos automáticos"
+
+#~ msgid "Exchange Connector access error."
+#~ msgstr "Erro de acesso da conta do Exchange."
+
+#~ msgid "Meetings and Tasks"
+#~ msgstr "Reuniões e Tarefas"
+
+#~ msgid "Plugin manager"
+#~ msgstr "Gerenciador de módulos"
+
+#~ msgid "Sa junk-plugin"
+#~ msgstr "Sa junk-plugin"
+
+#~ msgid "learns junk messages using spamd."
+#~ msgstr "aprender mensagens indesejadas utilizando o spamd."
+
+#~ msgid "Uid"
+#~ msgstr "Uid"
+
+#~ msgid "Url"
+#~ msgstr "Url"
+
+#~ msgid ""
+#~ "The suggested filename extension of this filetype (%s) is unused in the "
+#~ "chosen filename. Do you want to continue?"
+#~ msgstr ""
+#~ "A extensão de nome de arquivo sugerida para este tipo de arquivo (%s) não "
+#~ "é usada no nome de arquivo escolhido. Você deseja continuar?"
+
+#~ msgid "Evolution Settings"
+#~ msgstr "Configurações do Evolution"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "CN"
+#~ msgstr "CN"
+
+#~ msgid "OU"
+#~ msgstr "OU"
+
+#~ msgid "O"
+#~ msgstr "O"
+
+#~ msgid "L"
+#~ msgstr "L"
+
+#~ msgid "DN"
+#~ msgstr "DN"
+
+#~ msgid "DC"
+#~ msgstr "DC"
+
+#~ msgid "ST"
+#~ msgstr "ST"
+
+#~ msgid "E"
+#~ msgstr "L"
+
+#~ msgid "_Preview Pane"
+#~ msgstr "_Painel de Visualização"
+
+#~ msgid "_Select All"
+#~ msgstr "_Selecionar Tudo"
 
-msgid "Customize My Evolution"
-msgstr "Personalizar o Meu Evolution"
+#~ msgid "Customize My Evolution"
+#~ msgstr "Personalizar o Meu Evolution"
 
-msgid "Move"
-msgstr "Mover"
+#~ msgid "Move"
+#~ msgstr "Mover"
 
-msgid "_About Evolution..."
-msgstr "_Sobre o Evolution..."
+#~ msgid "_About Evolution..."
+#~ msgstr "_Sobre o Evolution..."
 
-msgid "_Send / Receive"
-msgstr "_Enviar/Receber"
+#~ msgid "_Send / Receive"
+#~ msgstr "_Enviar/Receber"
 
-msgid "Always Search"
-msgstr "Pesquisar Sempre"
+#~ msgid "Always Search"
+#~ msgstr "Pesquisar Sempre"
 
 #~ msgid "Message _List As"
 #~ msgstr "_Lista de Mensagens Como"
diff --git a/po/sq.po b/po/sq.po
index c08f0ada52..ac4c32beff 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,21 +1,19 @@
-# Përkthimi i mesazheve të evolution.HEAD.sq në shqip
+# Përkthimi i mesazheve të evolution në shqip
 # This file is distributed under the same license as the evolution package.
 #
-#
 # Laurent Dhima <laurenti@alblinux.net>, 2003, 2004, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.sq\n"
+"Project-Id-Version: evolution gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 06:05+0100\n"
-"PO-Revision-Date: 2006-03-02 17:45+0100\n"
+"POT-Creation-Date: 2006-04-21 04:29+0200\n"
+"PO-Revision-Date: 2006-04-21 09:39+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
-"Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
+"Language-Team: albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.2\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -111,32 +109,32 @@ msgstr "Shko tek data"
 msgid "a table to view and select the current time range"
 msgstr "një tabelë për të shfaqur dhe zgjedhur intervalin e kohës aktuale"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Përmban %d ndodhi."
 msgstr[1] "Përmban %d ndodhi."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Nuk ka ndodhi."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Paraqitja e javës së punës: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Paraqitja ditore: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "paraqitja e kalendarit për një javë pune"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "paraqitja e kalendarit për një apo më shumë ditë"
 
@@ -212,21 +210,21 @@ msgstr "Pulsanti \"shko tek\""
 msgid "Click here, you can find more events."
 msgstr "Kliko këtu për gjetur aktivitete të tjerë.֣"
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Paraqitja mujore: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Paraqitja javore: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "paraqitja e kalendarit për një muaj"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "paraqitja e kalendarit për një apo më shumë javë"
 
@@ -540,9 +538,9 @@ msgstr "Konfiguro këtu plotësimin automatik"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -814,7 +812,7 @@ msgstr "Ruaj si VCard..."
 msgid "_Properties..."
 msgstr "_Pronësitë..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Zgjedhësi i origjinës së kontakteve"
 
@@ -823,12 +821,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Hyrje anonime tek server-i LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Autentifikimi dështoi.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Shkruaj fjalëkalimin për %s (përdoruesi %s)"
@@ -1065,8 +1063,8 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "Baza e kërkimit është emri i veçantë (DN) i zërit ku kërkimet tuaja do të "
-"fillojnë. Nëse kjo fushë lihet bosh kërkimi do të fillojë nga baza e degëzimit"
-"të kartelave."
+"fillojnë. Nëse kjo fushë lihet bosh kërkimi do të fillojë nga baza e "
+"degëzimittë kartelave."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -1188,12 +1186,9 @@ msgstr "cards"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -2461,7 +2456,7 @@ msgstr "Shërbimi"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Vendodhja"
@@ -2525,15 +2520,15 @@ msgstr "Ndryshuar"
 msgid "Contact Editor - %s"
 msgstr "Editori i kontakteve - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2772
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Ju lutem zgjidhni një figurë për këtë kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Asnjë figurë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3057
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2541,7 +2536,7 @@ msgstr ""
 "E dhëna e kontaktit është e pavlefshme:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Kontakt i pavlefshëm."
 
@@ -2698,8 +2693,8 @@ msgstr "Shërbimi _IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:239
-#: ../plugins/exchange-operations/exchange-contacts.c:228
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Pozicioni:"
 
@@ -2869,7 +2864,7 @@ msgstr "Burimi"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2882,7 +2877,7 @@ msgid "Save as VCard..."
 msgstr "Ruaje si VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -3102,7 +3097,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:497
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
@@ -3149,7 +3144,7 @@ msgstr "Siti web"
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Gjerësia"
@@ -3164,7 +3159,7 @@ msgstr "Gjerësia"
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Lartësia"
@@ -3684,19 +3679,19 @@ msgstr "Importuesi i Evolution CSV dhe Tab"
 msgid "Importing ..."
 msgstr "Duke importuar ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Format LDAP Data Interchange (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Importuesi LDIF i Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Importuesi VCard i Evolution"
 
@@ -3759,7 +3754,7 @@ msgstr "Formati"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Kreu i faqes"
@@ -3864,8 +3859,8 @@ msgstr "Hija"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:229
-#: ../plugins/exchange-operations/exchange-contacts.c:211
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Madhësia:"
 
@@ -4352,7 +4347,7 @@ msgid "_Save Changes"
 msgstr "_Ruaj ndryshimet"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Dërgo"
 
@@ -4465,14 +4460,14 @@ msgid "Memos"
 msgstr "Përkujtesa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Aktivitete"
@@ -4491,9 +4486,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Shërbimi i njoftimit të alarmit të kalendarit të Evolution"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutë"
@@ -4628,67 +4620,34 @@ msgstr ""
 msgid "invalid time"
 msgstr "orë e pavlefshme"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld sekonda)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "sekondë"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "sekonda"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u sekondë"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u sekonda"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u minutë"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
 #, c-format
-msgid " %u minutes"
-msgstr " %u minuta"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d orë"
+msgstr[1] "%d orë"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
 #, c-format
-msgid "%u hour"
-msgstr "%u orë"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutë"
+msgstr[1] "%d minuta"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
 #, c-format
-msgid "%u hours"
-msgstr "%u orë"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "sekondë"
+msgstr[1] "sekonda"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -5116,10 +5075,10 @@ msgstr "Printo"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../plugins/hula-account-setup/camel-hula-listener.c:379
 #: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -5378,7 +5337,7 @@ msgstr "minutë(a)"
 msgid "start of appointment"
 msgstr "fillimit të takimit"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Veprimi"
 
@@ -5495,7 +5454,7 @@ msgid "Display"
 msgstr "Shfaq"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "I lirë/zënë"
@@ -5855,30 +5814,30 @@ msgstr "_Lëviz"
 msgid "Cancel _Drag"
 msgstr "Anullo _zvarritjen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "I pamundur rifreskimi i objektit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> I bashkangjitur"
 msgstr[1] "<b>%d</b> Të bashkangjitur"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Fshih _shtyllën e bashkangjitjes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Shfaq _shtyllën e bashkangjitjes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5887,83 +5846,83 @@ msgstr "Shfaq _shtyllën e bashkangjitjes"
 msgid "_Remove"
 msgstr "_Hiq"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Pronësitë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Shto të bashkangjitur..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../calendar/gui/dialogs/comp-editor.c:1468
 #: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Shfaq të bashkangjiturit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Shtyp butonin hapsirë për të shpalosur shtyllën e bashkangjitjes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Ndrysho takimin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Takimi - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Takimi - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Aktivitet i caktuar - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Aktiviteti - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Zë i ditarit - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Asnjë përmbledhje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "bashkangjitur"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ndryshimet e kryera në këtë element mund të anullohen nëse arrin një "
 "rifreskim"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "I pamundur përdorimi i versionit aktual!"
 
@@ -6050,106 +6009,106 @@ msgid "Recurrence"
 msgstr "Përvjetor"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Ky aktivitet përmban alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "Kale_ndari:"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganizuesi:"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "Të _deleguar"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Pjes_marrës"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Ngjarje pa datë fillimi"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Ngjarje pa datë përfundimi"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Data e fillimit është e gabuar"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Data e përfundimit është e gabuar"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Ora e fillimit është e gabuar"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Ora e përfundimit është e gabuar"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Organizuesi i zgjedhur nuk ka më një llogari."
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Nevoitet një organizues."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Nevoitet të paktën një pjesmarrës."
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Shto "
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "E pamundur hapja e kalendarit '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d ditë para takimit"
 msgstr[1] "%d ditë para takimit"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d orë para takimit"
 msgstr[1] "%d orë para takimit"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutë para takimit"
 msgstr[1] "%d minuta para takimit"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Personalizo"
 
@@ -6158,7 +6117,7 @@ msgstr "Personalizo"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6287,14 +6246,14 @@ msgstr "Anëtar"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6331,7 +6290,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "E pamundur hapja e përkujtesave tek '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupi:"
@@ -6430,6 +6389,15 @@ msgstr "në"
 msgid "first"
 msgstr "i pari"
 
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+msgid "second"
+msgstr "sekondë"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
@@ -6574,7 +6542,7 @@ msgstr "<span weight=\"bold\">Gjendja</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "U plotësua"
@@ -6650,11 +6618,11 @@ msgstr "_Aktivitet"
 msgid "Task Details"
 msgstr "Detajet e aktivitetit"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Data e duhur është e gabuar"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "E pamundur hapja e aktiviteteve tek '%s'."
@@ -6738,30 +6706,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d javë"
 msgstr[1] "%d javë"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d orë"
-msgstr[1] "%d orë"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minutë"
-msgstr[1] "%d minuta"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "sekondë"
-msgstr[1] "sekonda"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Veprim i panjohur"
@@ -6922,27 +6866,27 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Po"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Jo"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6959,35 +6903,35 @@ msgstr "Përsëritet"
 msgid "Assigned"
 msgstr "Caktuar"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Ruaj Si..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1913
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Zgjidh kartelën ku duhen ruajtur të bashkangjiturit e zgjedhur..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "figurë_paemër.%s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Ruaje si..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Vendose si _sfond"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Ruaj të zgjedhurit"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Hap në %s..."
@@ -7401,7 +7345,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7414,7 +7358,7 @@ msgstr "U pranua me përpjekje"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7743,81 +7687,81 @@ msgid "Resources"
 msgstr "Gjëndja"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Vetjake"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupi"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Burimi"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Dhoma"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Moderues"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Pjesmarrësi i kërkuar"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Pjesmarrës shtesë"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Jo pjesmarrës"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Kërkon veprim"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Përpjekje"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Deleguar"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Pjesmarrës                          "
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Në proçes"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7826,7 +7770,7 @@ msgstr "%A, %B %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -7912,7 +7856,7 @@ msgstr "Kliko për të shtuar një përkujtesë"
 msgid "Memo sort"
 msgstr "Renditja e përkujtesave"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7931,7 +7875,7 @@ msgstr "Duke ngarkuar përkujtesat"
 msgid "Opening memos at %s"
 msgstr "Duke hapur përkujtesat tek %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Duke eleminuar objektet e zgjedhur..."
 
@@ -7940,20 +7884,20 @@ msgstr "Duke eleminuar objektet e zgjedhur..."
 msgid "Enter the password for %s"
 msgstr "Shkruaj fjalëkalimin për %s"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Duke ngarkuar aktivitetet"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Duke lexuar aktivitetet tek %s"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Duke plotësuar aktivitetet..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Duke pastruar"
 
@@ -8233,12 +8177,6 @@ msgstr "I pamundur migrimi i kalendarit `%s'"
 msgid "Unable to migrate tasks `%s'"
 msgstr "I pamundur migrimi i aktiviteteve `%s'"
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d sekonda)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1-ri"
@@ -10150,7 +10088,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Shtylla e bashkangjitjes"
 
@@ -10353,7 +10291,7 @@ msgstr ""
 "tjera mail."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "Për arsye &quot;{1}&quot;."
 
@@ -10471,11 +10409,11 @@ msgstr "_Ruaj mesazhin"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Suite Groupware"
 
@@ -10643,7 +10581,7 @@ msgstr "Dëshiron t'a mbishkruash?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "File ekziston &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Mbishkruaj"
 
@@ -10811,7 +10749,7 @@ msgstr "Mungon data."
 msgid "Missing file name."
 msgstr "Mungon emri i file."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Mungon emri."
 
@@ -10883,6 +10821,10 @@ msgstr "më parë"
 msgid "months"
 msgstr "muaj"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "sekonda"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "ora aktuale"
@@ -11060,7 +11002,7 @@ msgstr "[Prezgjedhur]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Aktiv"
 
@@ -11093,14 +11035,14 @@ msgstr "Firma(t)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mesazhi i Përcjellë --------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "një dërgues i panjohur"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1713
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11240,11 +11182,11 @@ msgstr "nuk është shënuar me flamurë"
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
-msgstr "Për në plehra"
+msgstr "Të padëshiruar"
 
 #: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
-msgstr "Teksti për t'u refuzuar"
+msgstr "Teksti i padëshiruar"
 
 #: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
@@ -11268,11 +11210,11 @@ msgstr "Kreu i mesazhit"
 
 #: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
-msgstr "Mesazhi është për tu flakur"
+msgstr "Mesazhi është i padëshiruar"
 
 #: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
-msgstr "Mesazhi nuk është për tu flakur"
+msgstr "Mesazhi nuk është i padëshiruar"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
@@ -11424,7 +11366,7 @@ msgstr "Kopje e keqe"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Në ardhje"
 
@@ -11510,7 +11452,7 @@ msgstr "Kartelë e _Re..."
 msgid "_Rename..."
 msgstr "_Riemërto..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Zbraz Koshin"
 
@@ -11590,11 +11532,11 @@ msgstr "_Shëno si Parëndësi"
 
 #: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
-msgstr "Shëno si _Plehrë"
+msgstr "Shëno si _Padëshiruar"
 
 #: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
-msgstr "Shëno si _Jo për në plehra"
+msgstr "Shëno si _Jo i padëshiruar"
 
 #: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
@@ -11968,7 +11910,7 @@ msgstr "GrupeLajmesh"
 msgid "%s attachment"
 msgstr "%s bashkangjitur"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "I pamundur analizimi i mesazhit S/MIME: Gabim i panjohur"
 
@@ -11984,11 +11926,11 @@ msgstr "Lloj i pasuportuar kriptimi për multipart/encrypted"
 msgid "Unsupported signature format"
 msgstr "Format firme i pasuportuar"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Gabim gjatë kontrollit të firmës"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Gabim i panjohur gjatë verifikimit të firmës"
 
@@ -12120,20 +12062,20 @@ msgstr "Mos shfaq më këtë mesazh."
 msgid "Message Filters"
 msgstr "Filtrat e mesazheve"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "mesazh"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Ruaj mesazhin..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Shto adresën"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Mesazhet nga %s"
@@ -12156,7 +12098,7 @@ msgstr "Kontrolli automatik i smiley"
 
 #: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
-msgstr "Kontrollo që posta në ardhje të mos përmbajë material për t'u refuzuar"
+msgstr "Kontrollo që posta në ardhje të mos përmbajë material të padëshiruar"
 
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
@@ -12447,7 +12389,7 @@ msgstr "Kontrollo smiles në tekst dhe zëvendësoi me figurat."
 
 #: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
-msgstr "Vër në funksion provën për material për t'u refuzuar tek mesazhet në ardhje"
+msgstr "Vër në funksion kontrollin për material të padëshiruar tek mesazhet në ardhje"
 
 #: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
@@ -12804,8 +12746,8 @@ msgstr[1] "%d fshirë"
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d refuzim"
-msgstr[1] "%d refuzime"
+msgstr[0] "%d i padëshiruar"
+msgstr[1] "%d të padëshiruar"
 
 #: ../mail/mail-component.c:546
 #, c-format
@@ -13083,7 +13025,7 @@ msgstr "K_ontrollo për llojet suportuar "
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
-msgstr "Kontrollo postën në _hyrje për material për t'u refuzuar"
+msgstr "Kontrollo postën në _hyrje për material të padëshiruar"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -13091,7 +13033,7 @@ msgstr "Kontrollo drejtshkrimin kur _shkruan"
 
 #: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
-msgstr "Kontrolli i mesazheve në hyrje të postës për në plehra"
+msgstr "Kontrollon mesazhet në hyrje nëse duhen klasifikuar si të padëshiruar"
 
 #: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
@@ -13907,14 +13849,14 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"quit."
 msgstr ""
-"Një kartelë jo bosh tek &quot;{1}&quot; ekziston.\n"
+"Një kartelë jo bosh tek &quot;{1}&quot; ekziston rregullisht.\n"
 "\n"
 "Mund të vendosni t'a shpërfillni këtë kartelë, mbishkruani apo shtoni "
-"përmbajtjen e saj, ose të dilni.\n"
+"përmbajtjen e saj, ose të dilni."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -13922,7 +13864,7 @@ msgstr ""
 "Një ricevutë leximi është kërkuar për &quot;{1}&quot;. Dërgon njoftimin për "
 "ricevutë tek {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
@@ -13930,7 +13872,7 @@ msgstr ""
 "Një firmë me emrin &quot;{0}&quot; ekziston. Ju lutem zgjidhni një emër "
 "tjetër."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13938,27 +13880,27 @@ msgstr ""
 "Duke shtuar një frazë të qartë tek rreshti i subjektit i mesazheve tuaj u "
 "jipni një ide marrësve mbi përmbajtjen e mesazhit tuaj."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 "Jeni i sigurt që dëshironi të eleminoni këtë llogari dhe të gjithë proxies e "
 "saj?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Jeni i sigurt që dëshironi të eleminoni këtë llogari?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Jeni i sigurt që dëshironi të ç'aktivoni këtë llogari dhe fshini të gjithë "
 "proxies e saj?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Jeni i sigurt që dëshironi të hapni {0} mesazhe njëkohësisht?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13966,7 +13908,7 @@ msgstr ""
 "Jeni i sigurt që dëshironi të eleminoni përgjithmonë të gjithë mesazhet e "
 "fshirë në të gjitha kartelat?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13974,81 +13916,81 @@ msgstr ""
 "Jeni i sigurt që dëshironi të eleminoni përgjithmonë të gjithë mesazhet e "
 "fshirë tek kartela &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Jeni i sigurt që dëshironi të dërgoni një mesazh në formatin HTML?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Jeni i sigurt që dëshironi të dërgoni një mesazh vetëm me marrësit BCC?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Jeni i sigurt që dëshironi të dërgoni një mesazh pa subjekt?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Sepse &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Sepse &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Firmë bosh"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "I pamundur shtimi i kartelës së kërkimit &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "I pamundur kopjimi i kartelës &quot;{o}&quot; tek &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "I pamundur krijimi i kartelës &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "I pamundur krijimi i directory për ruajtjen e përkohshme."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "I pamundur krijimi i directory për ruajtje, sepse &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "I pamundur eleminimi i kartelës &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "E pamundur fshirja e kartelës së sistemit &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "I pamundur ndryshimi i kartelës së kërkimit &quot;{0}&quot; m.q.s. nuk "
 "ekziston."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "E pamundur lëvizja e kartelës &quot;{0}&quot; në &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "E pamundur hapja e burimit &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "E pamundur hapja e burimit &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "E pamundur hapja e objektivit &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14058,31 +14000,31 @@ msgstr ""
 "problemi instalimi.  Nuk do të jeni në gjendje të përdorni këtë provider "
 "derisa të pranoni liçencën e tij."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "I pamundur riemërtimi i &quot;{0}&quot; në &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "I pamundur riemërtimi apo lëvizja e kartelës së sistemit &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "E pamundur ruajtja e ndryshimeve në llogari."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "E pamundur ruajtja tek directory &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "E pamundur ruajtja tek file &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "I pamundur caktimi i skriptit të firmës &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14091,71 +14033,71 @@ msgstr ""
 "fjalëkalimet gërmat e mëdha ndikojnë; mund të keni shtypur pulsantin e "
 "shkrimit me gërma të mëdha."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "E pamundur ruajtja e file të firmës."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Eleminoj &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Eleminon llogarinë?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Anullon ndryshimet?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Mos elemino"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Mos ç'aktivo"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Dëshiron që operacioni të zbatohet tek nënkartelat?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Dëshiron të shënosh të gjithë mesazhet si të lexuar?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Dëshiron të ruash ndryshimet e kryera?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Shkruaj fjalëkalimin."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Gabim gjatë ngarkimit përcaktimeve të filtrit."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Gabim gjatë kryerjes së operacionit."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Gabim kur {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "File ekziston por nuk mund të mbishkruhet."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "File ekziston por nuk është një file i rregullt."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Nëse vazhdoni, nuk do të jeni në gjendje të rekuperoni këto mesazhe."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14163,11 +14105,11 @@ msgstr ""
 "Nëse eleminon kartelën, përmbajtja e saj dhe të nënkartelave të saj do të "
 "fshihen përgjithmonë."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Nëse vazhdoni, të gjithë llogaritë e proxy do të fshihen përgjithmonë."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14175,11 +14117,11 @@ msgstr ""
 "Nëse vazhdoni, informacionet e llogarisë dhe\n"
 "të gjitha informacionet e proxy do të fshihen përgjithmonë."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Nëse vazhdoni, informacionet e llogarisë do të fshihen përgjithmonë."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14187,19 +14129,19 @@ msgstr ""
 "Nëse dilni, këto mesazhe nuk do të dërgohenpara se Evolution të niset "
 "përsëri."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Shpërfill"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Autentifikim i pavlefshëm"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Filtrat e mesazheve u rifreskuan automatikisht."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14211,35 +14153,35 @@ msgstr ""
 "rreshtohen në mesazh. Për të shmangur këtë duhet shtuar të paktën një marrës "
 "Për: ose CC."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Shëno si të lexuar të gjithë mesazhet"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Shëno si të lexuar të gjithë mesazhet tek kartela e zgjedhur"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Kartela mungon."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Nuk është zgjedhur burimi."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Hapja e shumë mesazheve njëkohësisht mund të marrë një kohë tepër të gjatë."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Kontrollo rregullimet e llogarisë suaj dhe riprovo."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Aktivo llogarinë ose dërgo duke përdorur një llogari tjetër."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14248,7 +14190,7 @@ msgstr ""
 "kërkoni për adresat email duke klikuar tek butoni Për: në vazhdim tek kutia "
 "e zërave."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14260,49 +14202,49 @@ msgstr ""
 "{0}\n"
 "Dërgoj sidoqoftë?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Shkruaj një emër të papërdorur për të identifikuar këtë firmë."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Ju lutem prisni."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem gjatë migrimit të kartelës së vjetër së postës &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Duke pyetur serverin"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Duke pyetur serverin për listën me mekanizmat e suportuar të autentifikimit."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Kërkohet ricevutë leximi."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Me të vërtetë eleminon kartelën &quot;{0}&quot; me të gjitha nënkartelat e "
 "saj?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Kartela e kërkimit u përditësua automatikisht."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Dërgo ricevutë"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Firma ekziston"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14310,7 +14252,7 @@ msgstr ""
 "Kartelat e sistemit nevoiten që Ximian Evolution të funksionojë si duhet dhe "
 "ato nuk mund të riemërtohen, lëvizen, apo eleminohen."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14327,7 +14269,7 @@ msgstr ""
 "rreshtohen në mesazh. Për të shmangur këtë duhet shtuar të paktën një marrës "
 "Për: ose CC. "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14341,7 +14283,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Dhe u përditësua."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14355,23 +14297,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Dhe u përditësuan."
 
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application. "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors and "
-"resend."
-msgstr ""
-"Mesazhi është dërguar me anë të programit të jashtëm &quot;sendmail&quot;.  "
-"Sendmail njoftoi gabimin në vazhdim: status 67: mesazhi nuk u dërgua.\n"
-"Mesazhi është magazinuar në kartelën NëDalje.  Kontrollo mesazhin për "
-"gabime dhe rinise."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "File me script duhet të ekzistojë dhe duhet të jetë i ekzekutueshëm."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14380,19 +14310,19 @@ msgstr ""
 "shko tek editori i kartelave të kërkimit për t'a shtuar si duhet, nëse ka "
 "nevojë."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
-"Ky mesazh nuk mund të dërgohet pasi profili me të cilin dëshironi ta dërgoni nuk "
-"është aktivuar"
+"Ky mesazh nuk mund të dërgohet pasi profili me të cilin dëshironi ta dërgoni "
+"nuk është aktivuar"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Ky mesazh nuk mund të dërgohet pasi nuk keni specifikuar asnjë marrës"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14400,23 +14330,23 @@ msgstr ""
 "Ky server nuk suporton këtë lloj autentifikimi dhe ka mundësi të mos "
 "suportojë fare autentifikimet."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Firma është ndryshuar, por nuk është ruajtur."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
-"Të gjithë mesazhet tek kartela e zgjedhur dhe nën-kartelat e saj "
-"do të shënohen si të lexuar."
+"Të gjithë mesazhet tek kartela e zgjedhur dhe nën-kartelat e saj do të "
+"shënohen si të lexuar."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "E pamundur lidhja me serverin GroupWise."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14424,39 +14354,39 @@ msgstr ""
 "E pamundur hapja e kartelës së kopjeve për këtë profil. Dëshironi të "
 "përdorni kartelën e kopjeve të sistemit?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "I pamundur leximi i file të liçencës."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Përdor të _Prezgjedhurin"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Përdor kartelën e prezgjedhur të kopjeve?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Nuk keni plotësuar të gjitha informacionet e kërkuara."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Keni akoma mesazhe të padërguar, dëshironi të dilni sidoqoftë?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Nuk mund të krijohen dy llogari me të njëjtin emër."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Duhet t'i jepni një emër kësaj Kartele kërkimi."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Ju duhet të përcaktoni një kartelë."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14466,27 +14396,23 @@ msgstr ""
 "Mund të zgjidhni kartelat një nga një, dhe/ose duke zgjedhurtë gjitha "
 "kartelat lokale, të gjitha kartelat remote, ose së bashku."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Futja në serverin tuaj &quot;{0}&quot; si &quot;{0}&quot; dështoi."
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Mesazhi juaj me subjekt &quot;{0}&quot; nuk u dërgua."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Shto (në fund)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Anullo ndryshimet"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "_Pastro"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Hap mesazhet"
 
@@ -14557,7 +14483,7 @@ msgstr "%b %d %Y"
 msgid "Messages"
 msgstr "Mesazhet"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Duke krijuar listën e mesazheve"
 
@@ -14758,8 +14684,8 @@ msgid ""
 "lists."
 msgstr ""
 "Plotëson automatikisht rubrikën me emrat dhe adresat email kur i përgjigjeni "
-"mesazheve. Gjithashtu plotëson informacionet e kontaktit IM nga lista "
-"juaj buddy."
+"mesazheve. Gjithashtu plotëson informacionet e kontaktit IM nga lista juaj "
+"buddy."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14894,11 +14820,10 @@ msgid "Default Sources"
 msgstr "Burimet e prezgjedhur"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-#, fuzzy
 msgid ""
 "Provides functionallity for marking a calendar or addressbook as the default "
 "one."
-msgstr "Afron funksionet bazë për kalendarët e motit."
+msgstr "Afron funksionin për kthimin e një kalendari apo rubrike si të prezgjedhur."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15003,9 +14928,8 @@ msgid "Exchange Settings"
 msgstr "Rregullimet e Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:609
-#, fuzzy
 msgid "_OWA URL:"
-msgstr "Url _OWA:"
+msgstr "_OWA URL:"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
@@ -15019,13 +14943,15 @@ msgstr "Lloji i autentikimit"
 msgid "Ch_eck for Supported Types"
 msgstr "Kontrollo për lloj_et suportuar"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:193
-#: ../plugins/exchange-operations/exchange-contacts.c:167
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:166
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
-msgstr "Evolution është në modaliteti Ti or tani tek modaliteti për veprimet."
+msgstr ""
+"Evolution ndodhet në modalitetin jashtë linje. Tani nuk mund të krijosh apo "
+"ndryshosh kartelat.\n"
+"Për të kryer këto lloj veprimesh, kalo në modalitetin në linjë."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
@@ -15061,9 +14987,9 @@ msgstr ""
 "tuaj."
 
 #: ../plugins/exchange-operations/exchange-config-listener.c:662
-#, fuzzy, c-format
+#, c-format
 msgid "Your password will expire in the next %d days"
-msgstr "Fjalëkalimi juaj ka skaduar."
+msgstr "Fjalëkalimi juaj do të skadojë pas %d ditësh"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
@@ -15202,37 +15128,33 @@ msgstr "Degëzimi i kartelës Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Ç'regjistro kartelën..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Me të vërtetë ç'regjistrohesh nga kartela \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Ç'regjistrohu nga \"%s\""
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-#, fuzzy
 msgid "Password Expiry Warning..."
-msgstr "Paralajmërim në lidhje me skadimin e fjalëkalimit..."
+msgstr "Paralajmërim mbi skadimin e fjalëkalimit..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-#, fuzzy
 msgid "Your password will expire in 7 days..."
-msgstr "Fjalëkalimi juaj ka skaduar."
+msgstr "Fjalëkalimi juaj do të skadojë pas 7 ditësh..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-#, fuzzy
 msgid "_Change Password"
-msgstr "Ndrysho fjalëkalimin"
+msgstr "_Ndrysho fjalëkalimin"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
-#, fuzzy
 msgid "ok_button"
-msgstr "Pulsant i kombinuar"
+msgstr "ok_button"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
@@ -15307,7 +15229,6 @@ msgid "Select User"
 msgstr "Zgjidh përdorues"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
-#, fuzzy
 msgid "Address Book..."
 msgstr "Rubrika..."
 
@@ -15320,16 +15241,16 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Regjistro tek kalendari i përdoruesve të tjerë"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr "A a nga Exchange llogari veprimet dhe."
+msgstr ""
+"Një plugin që trajton veprime specifike dhe funksione të një koleksioni "
+"profilesh Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-#, fuzzy
 msgid "Exchange Operations"
-msgstr "Rregullimet e Exchange"
+msgstr "Veprimet e Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
@@ -15366,9 +15287,8 @@ msgstr ""
 "Kontrollo URL, fjalëkalimin, dhe riprovo përsëri."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
-#, fuzzy
 msgid "Could not connect to Exchange server."
-msgstr "E pamundur lidhja me serverin {0}."
+msgstr "E pamundur lidhja me serverin Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
@@ -15415,7 +15335,6 @@ msgid "Exchange Account is offline."
 msgstr "Llogaria Exchange është jashtë linje."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-#, fuzzy
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15440,8 +15359,7 @@ msgstr ""
 "Informacionet që duhet t'i jepni administratorit tuaj të Exchange \n"
 "mund t'i merrni duke ndjekur lidhjen në vazhdim:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
@@ -15532,7 +15450,6 @@ msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Serveri Exchange nuk është kompatibël me Exchange Connector."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-#, fuzzy
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15584,7 +15501,6 @@ msgid "Unsupported operation"
 msgstr "Veprim i pasuportuar"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-#, fuzzy
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Je duke ju afruar kufirit të quotës në dispozicion për magazinimin e "
@@ -15595,7 +15511,6 @@ msgid "You cannot make yourself your own delegate"
 msgstr "Nuk mund të delegoni vetveten"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#, fuzzy
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Ke tejkaluar kufirit të quotës për magazinimin e mesazheve në këtë server."
 
@@ -15604,31 +15519,28 @@ msgid "You may only configure a single Exchange account."
 msgstr "Mund të konfigurosh një llogari të vetme Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
-"Përdorimi aktual është : {0}KB. Liro pak hapsirë duke fshirë disa nga "
-"mesazhet e vjetër."
+"Përdorimi aktual është : {0} KB. Liro pak hapësirë duke fshirë disa prej "
+"mesazheve."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
-"Përdorimi aktual është : {0}KB. Nuk do të jesh më në gjendje të dërgosh apo "
+"Përdorimi aktual është : {0} KB. Nuk do të jesh më në gjendje të dërgosh apo "
 "marrësh mesazhe tani."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 msgstr ""
-"Përdorimi aktual është : {0}KB. Nuk do të jesh në gjendje të dërgosh mesazhe "
-"po nuk lirove pak hapsirë duke fshirë disa mesazhe të vjetër."
+"Përdorimi aktual është : {0} KB. Nuk do të jesh në gjendje të dërgosh "
+"mesazhe po nuk lirove pak hapësirë duke fshirë disa mesazhe të vjetër."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15669,7 +15581,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Ç'regjistro kartelat"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Lista zgjedhjes"
 
@@ -15679,20 +15591,19 @@ msgstr "Rregullimi i llogarisë Groupware"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
-msgstr "Përcaktimi i refuzimeve"
+msgstr "Rregullimet e të padëshiruarve"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Rregullimet e mesazheve për t'u refuzuar</b>"
+msgstr "<b>Rregullimet e mesazheve të padëshiruar</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 msgid "Junk Mail Settings..."
-msgstr "Rregullimet e mesazheve për t'u refuzuar..."
+msgstr "Rregullimet e mesazheve të padëshiruar..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-#, fuzzy
 msgid "<b>Junk List:</b>"
-msgstr "<b>Lista e refuzimeve:</b>"
+msgstr "<b>Lista e të padëshiruarve:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
@@ -15700,7 +15611,7 @@ msgstr "Email:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "Rregullimet e mesazheve për refuzim"
+msgstr "Rregullimet e mesazheve të padëshiruar"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -15713,7 +15624,7 @@ msgstr "_Aktivo"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "_Lista e refuzimit"
+msgstr "_Lista e të padëshiruarve"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
@@ -15738,9 +15649,8 @@ msgid "Accept Tentatively"
 msgstr "Prano duke e konsideruar si provë"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-#, fuzzy
 msgid "<b>Users:</b>"
-msgstr "<b>Përdoruesit :</b>"
+msgstr "<b>Përdoruesit:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
@@ -15760,7 +15670,6 @@ msgid "_Contacts..."
 msgstr "_Kontakte..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
-#, fuzzy
 msgid "_Customize notification message"
 msgstr "_Personalizo mesazhin e njoftimit"
 
@@ -15846,9 +15755,8 @@ msgid "_Proxy Login..."
 msgstr "Identifikimi në _Proxy..."
 
 #: ../plugins/groupwise-features/proxy.c:697
-#, fuzzy
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "Skeda e Proxy do të jetë e dukshme vetëm kur të aktivohet llogaria."
+msgstr "Skeda e Proxy do të jetë në dispozicion vetëm kur profili të jetë në linjë."
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
@@ -15875,39 +15783,32 @@ msgid "Track Message Status..."
 msgstr "Ndiq gjendjen e mesazheve..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin to setup hula calendar sources."
-msgstr "A tek kalendari burimet."
+msgstr "Një plugin për të rregulluar burimet e kalendarit hula."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-#, fuzzy
 msgid "Hula Account Setup"
-msgstr "Rregullimi i llogarisë Groupware"
+msgstr "Rregullimi i profilit Hula"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:83
-#, fuzzy
 msgid "_Import to Calendar"
-msgstr "Kalendari mujor"
+msgstr "_Importo në kalendar"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:88
-#, fuzzy
 msgid "_Import to Tasks"
-msgstr "Ktheje në akti_vitet"
+msgstr "_Importo tek aktivitetet"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:198
-#, fuzzy
 msgid "Import ICS"
-msgstr "Importo"
+msgstr "Importo ICS"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:226
-#, fuzzy
 msgid "Select Task List"
-msgstr "Listë e Re Aktivitetesh"
+msgstr "Zgjidh listën e aktiviteteve"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:230
-#, fuzzy
 msgid "Select Calendar"
-msgstr "Kalendar i Ri"
+msgstr "Zgjidh kalendarin"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
 #: ../shell/e-shell-importer.c:703
@@ -15920,102 +15821,90 @@ msgid "iCalendar format (.ics)"
 msgstr "Format iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-#, fuzzy
 msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Sinkronizimi zgjedhur kalendari me"
+msgstr "Sinkronizon aktivitetin/kalendarin/rubrikën e zgjedhur me Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-#, fuzzy
 msgid "Synchronize to iPod"
-msgstr "Opsionet e _sinkronizimit..."
+msgstr "Sinkronizo me iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-#, fuzzy
 msgid "iPod Synchronization"
-msgstr "Opsionet e _sinkronizimit..."
+msgstr "Sinkronizimi i iPod"
 
 #: ../plugins/ipod-sync/sync.c:158
-#, fuzzy
 msgid "No output directory!"
-msgstr "Rikthe kartelën e Evolution"
+msgstr "Asnjë directory output!"
 
 #: ../plugins/ipod-sync/sync.c:159
-#, fuzzy
 msgid ""
 "The output directory was not found on iPod! Please ensure that iPod has been "
 "correctly set up and try again."
-msgstr "nuk në sipër dhe."
+msgstr ""
+"Directory e daljes nuk u gjet në iPod! Sigurohu që iPod është konfiguruar si "
+"duhet dhe provo përsëri."
 
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-#, fuzzy
 msgid "Could not export data!"
-msgstr "I pamundur shkrimi i të dhënave: %s"
+msgstr "I pamundur eksportimi i të dhënave!"
 
 #: ../plugins/ipod-sync/sync.c:203
-#, fuzzy
 msgid "Exporting data failed."
-msgstr "Duke importuar të dhënat."
+msgstr "Eksportimi i të dhënve dështoi."
 
 #: ../plugins/ipod-sync/sync.c:231
-#, fuzzy
 msgid "Could not open addressbook!"
-msgstr "I pamundur ngarkimi i librit të adresave"
+msgstr "E pamundur hapja e rubrikës!"
 
 #: ../plugins/ipod-sync/sync.c:232
-#, fuzzy
 msgid "Could not open the Evolution addressbook to export data."
-msgstr "Rubrika e Evolution përfundoi në menyrë të papritur."
+msgstr "E pamundur hapja e rubrikës së Evolution për të eksportuar të dhënat."
 
 #: ../plugins/ipod-sync/sync.c:291
-#, fuzzy
 msgid "Could not open calendar/todo!"
-msgstr "E pamundur hapja e objektivit"
+msgstr "E pamundur hapja e kalendarit/listës me gjërat për tu bërë!"
 
 #: ../plugins/ipod-sync/sync.c:292
-#, fuzzy
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "nuk hap Evolution kalendari lista tek."
+msgstr ""
+"E pamundur hapja e kalendarit/listës me gjërat për tu bërë për të eksportuar "
+"të dhënat."
 
 #: ../plugins/itip-formatter/itip-formatter.c:275
 #: ../plugins/itip-formatter/itip-formatter.c:392
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load the calendar '%s'"
-msgstr "E pamundur hapja e kalendarit '%s'."
+msgstr "E pamundur hapja e kalendarit '%s'"
 
 #: ../plugins/itip-formatter/itip-formatter.c:407
-#, fuzzy, c-format
+#, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "E pamundur hapja e kalendarit '%s' për të krijuar ngjarje dhe takime"
+msgstr "Një takim tek kalendari '%s' është në konflikt me këtë mbledhje"
 
 #: ../plugins/itip-formatter/itip-formatter.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "E pamundur hapja e kalendarit '%s'."
+msgstr "Takimi u gjet tek kalendari '%s'"
 
 #: ../plugins/itip-formatter/itip-formatter.c:488
-#, fuzzy
 msgid "Unable to find any calendars"
-msgstr "I pamundur migrimi i kalendarit `%s'"
+msgstr "Nuk u gjet asnjë kalendar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:495
-#, fuzzy
 msgid "Unable to find this meeting in any calendar"
-msgstr "E pamundur hapja e kalendarit '%s'."
+msgstr "E pamundur gjetja e mbledhjes në asnjë kalendar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:499
-#, fuzzy
 msgid "Unable to find this task in any task list"
-msgstr "I pamundur shtimi i përdoruesit tek lista e kontrollit të hyrjeve:"
+msgstr "E pamundur gjetja e këtij aktiviteti në asnjë listë aktivitetesh"
 
 #: ../plugins/itip-formatter/itip-formatter.c:503
-#, fuzzy
 msgid "Unable to find this journal entry in any journal"
-msgstr "tek gjej zë në"
+msgstr "E pamundur gjetja e këtij zë ditari në asnjë ditar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:529
-#, fuzzy
 msgid "Searching for an existing version of this appointment"
-msgstr "Duke kërkuar për versioni nga"
+msgstr "Duke kërkuar për një version ekzistues të këtij takimi"
 
 #: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
@@ -16042,9 +15931,9 @@ msgid "Sent to calendar '%s' as declined"
 msgstr "Dërguar kalendarit «%s» si e papranuar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:807
-#, fuzzy, c-format
+#, c-format
 msgid "Sent to calendar '%s' as canceled"
-msgstr "Dërguar kalendarit «%s» si e anulluar"
+msgstr "Dërguar kalendarit '%s' si e anulluar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
@@ -16052,14 +15941,12 @@ msgid "Organizer has removed the delegate %s "
 msgstr "Organizuesi ka fshirë delegatin %s "
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
-#, fuzzy
 msgid "Sent a cancelation notice to the delegate"
-msgstr "Dërgoi delegatit një njoftim fshirje"
+msgstr "Dërgoi delegatit një njoftim anullimi"
 
 #: ../plugins/itip-formatter/itip-formatter.c:909
-#, fuzzy
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "I pamundur dërgimi i njoftimit të fshirjes delegatit"
+msgstr "I pamundur dërgimi i njoftimit të anullimit delegatit"
 
 #: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
@@ -16081,13 +15968,12 @@ msgid "The calendar attached is not valid"
 msgstr "Kalendari i bashkangjitur nuk është i vlefshëm"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1153
-#, fuzzy
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
-"Mesazhi përmban një kalendar, por kalendari nuk është një iCalendar i "
-"vlefshëm."
+"Mesazhi reklamon praninë e një kalendari, por kalendari nuk është një "
+"iCalendar i vlefshëm."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:1202
@@ -16125,9 +16011,8 @@ msgstr "_Elemino mesazhin mbas aksionit"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2004
 #: ../plugins/itip-formatter/itip-formatter.c:2036
-#, fuzzy
 msgid "Conflict Search"
-msgstr "Tabela e kërkimit të konflikteve"
+msgstr "Kërkimi i konflikteve"
 
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2019
@@ -16327,12 +16212,12 @@ msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ka dërguar mbrapsht përgjigjen në vazhdim:"
 
 #: ../plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> nëpërmjet %s ka anulluar mbledhjen në vazhdim:"
+msgstr "<b>%s</b> me anë të %s ka anulluar mbledhjen në vazhdim:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ka anulluar mbledhjen në vazhdim."
 
@@ -16401,12 +16286,12 @@ msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ka dërguar përgjigjen në vazhdim mbi detyrën e shënuar:"
 
 #: ../plugins/itip-formatter/itip-view.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> me anë të %s ka anulluar detyrën e shënuar në vazhdim:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ka anulluar detyrën e shënuar në vazhdim:"
 
@@ -16427,9 +16312,8 @@ msgstr "<b>%s</b> nuk ka pranuar detyrën e shënuar në vazhdim:"
 
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:705
-#, fuzzy
 msgid "_Open Calendar"
-msgstr "Duke hapur kalendarin"
+msgstr "_Hap kalendarin"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:710
@@ -16437,57 +16321,48 @@ msgstr "Duke hapur kalendarin"
 #: ../plugins/itip-formatter/itip-view.c:720
 #: ../plugins/itip-formatter/itip-view.c:736
 #: ../plugins/itip-formatter/itip-view.c:741
-#, fuzzy
 msgid "_Accept"
-msgstr "Prano"
+msgstr "_Prano"
 
 #: ../plugins/itip-formatter/itip-view.c:713
-#, fuzzy
 msgid "_Decline all"
-msgstr "_Elemino gjithçka"
+msgstr "_Refuzoi të gjithë"
 
 #: ../plugins/itip-formatter/itip-view.c:713
 #: ../plugins/itip-formatter/itip-view.c:718
 #: ../plugins/itip-formatter/itip-view.c:734
 #: ../plugins/itip-formatter/itip-view.c:739
-#, fuzzy
 msgid "_Decline"
-msgstr "Refuzo"
+msgstr "_Refuzo"
 
 #: ../plugins/itip-formatter/itip-view.c:714
-#, fuzzy
 msgid "_Tentative all"
-msgstr "Përpjekje"
+msgstr "_Provoi të gjithë"
 
 #: ../plugins/itip-formatter/itip-view.c:714
 #: ../plugins/itip-formatter/itip-view.c:719
 #: ../plugins/itip-formatter/itip-view.c:735
 #: ../plugins/itip-formatter/itip-view.c:740
-#, fuzzy
 msgid "_Tentative"
-msgstr "Përpjekje"
+msgstr "_Provo"
 
 #: ../plugins/itip-formatter/itip-view.c:715
-#, fuzzy
 msgid "_Accept all"
-msgstr "Prano"
+msgstr "_Prano të gjithë"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:724
-#, fuzzy
 msgid "_Send Information"
-msgstr "Informacione mbi serverin"
+msgstr "_Dërgo informacionet"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:728
-#, fuzzy
 msgid "_Update Attendee Status"
-msgstr "Rifresko gjendjen e përgjigjes"
+msgstr "_Rifresko gjëndjen e pjesmarrësve"
 
 #: ../plugins/itip-formatter/itip-view.c:731
-#, fuzzy
 msgid "_Update"
-msgstr "Rifresko"
+msgstr "_Rifresko"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:888
@@ -16613,9 +16488,8 @@ msgid "Mail to task"
 msgstr "Mail në aktivitet"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-#, fuzzy
 msgid "Convert the selected message to a new task"
-msgstr "Hape mesazhin e zgjedhur në një dritare të re"
+msgstr "Konverton mesazhin e zgjedhur në një aktivitet të ri"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
@@ -16767,19 +16641,16 @@ msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Ç'regjistrohu nga mailing list tek e cila bën pjesë ky mesazh"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-#, fuzzy
 msgid "Mark All Read"
-msgstr "Shë_no si të Lexuar"
+msgstr "Shënoi të gjithë si të lexuar"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-#, fuzzy
 msgid "Mark me_ssages as read"
 msgstr "Shëno me_sazhet si të lexuar"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-#, fuzzy
 msgid "Used for marking all the messages under a folder as read"
-msgstr "Në përdorim për gjithçka mesazhe a kartelë"
+msgstr "Përdoret për të shënuar si të lexuar të gjithë mesazhet e një kartele"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -16832,9 +16703,8 @@ msgid "Enable and disable plugins"
 msgstr "Aktivo dhe ç'aktivo plugins"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-#, fuzzy
 msgid "_Plugins"
-msgstr "Shtojca"
+msgstr "_Shtojca"
 
 #: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
@@ -16856,7 +16726,6 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
 "disable HTML messages.\n"
@@ -16864,7 +16733,7 @@ msgid ""
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
 "Një shtojcë prove që demostron një plugin formatues që ju jep mundësinë e "
-"zgjedhjes së ç'aktivimit të mesazheve HTML.\n"
+"zgjedhjes së çaktivimit të mesazheve HTML.\n"
 "\n"
 "Kjo shtojcë është vetëm për të kryer prova.\n"
 
@@ -16909,74 +16778,64 @@ msgid "Prints the message"
 msgstr "Printon mesazhin"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-#, fuzzy
 msgid "Evolution Profiler"
-msgstr "Gabim i Evolution"
+msgstr "Profiluesi i Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-#, fuzzy
 msgid "Writes a log of profiling data events."
-msgstr "a log nga."
+msgstr "Regjistron një log profilimi të eventeve."
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#, fuzzy
 msgid "Allows calendars to be published to the web"
-msgstr "tek publikuar tek"
+msgstr "Lejo publikimin e kalendarëve në web"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
-#, fuzzy
 msgid "Calendar Publishing"
-msgstr "Kalendarët"
+msgstr "Publikimi i kalendarëve"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "Locations"
-msgstr "Vendodhja"
+msgstr "Pozicionet"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-#, fuzzy
 msgid "_Publish Calendar Information"
-msgstr "Informacione iCalendar"
+msgstr "_Publiko informacionet e kalendarit"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Jeni i sigurt që dëshiron të eleminosh këtë URL?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
-#, fuzzy
 msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">Opsione</span>"
+msgstr "<span weight=\"bold\">Pozicioni/span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:4
-#, fuzzy
 msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">Gjendja</span>"
+msgstr "<span weight=\"bold\">Burimet</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:6
-#, fuzzy
 msgid ""
 "Daily\n"
 "Weekly\n"
 "Manual (via Actions menu)"
-msgstr "Veprimet menuja"
+msgstr ""
+"Ditor\n"
+"Javor\n"
+"Manualisht (me anë të menusë së veprimeve)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
-#, fuzzy
 msgid "P_ort:"
-msgstr "_Porta:"
+msgstr "P_orta:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:11
-#, fuzzy
 msgid "Publishing Location"
-msgstr "<b>_Vendi për publikimin</b>"
+msgstr "Vendi për publikimin"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:12
-#, fuzzy
 msgid "Publishing _Frequency:"
-msgstr "<b>Frekuenca e publikimit</b>"
+msgstr "_Frekuenca e publikimit:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
-#, fuzzy
 msgid ""
 "SSH\n"
 "Public FTP\n"
@@ -16985,45 +16844,50 @@ msgid ""
 "WebDAV (HTTP)\n"
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
-msgstr "SSH FTP me identifikimi HTTP Vendodhja"
+msgstr ""
+"SSH\n"
+"Public FTP\n"
+"FTP (me identifikim)\n"
+"Të përbashkëta Windows\n"
+"WebDAV (HTTP)\n"
+"WebDAV i sigurt (HTTPS)\n"
+"Vendodhje e personalizuar"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
-#, fuzzy
 msgid "Service _type:"
-msgstr "_Lloji i serverit: "
+msgstr "Lloji i shërbimit_t:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#, fuzzy
 msgid "_File:"
-msgstr "_File"
+msgstr "_File:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
-#, fuzzy
 msgid "_Publish as:"
-msgstr "Tabela e Publikimit"
+msgstr "_Publiko si:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
-#, fuzzy
 msgid ""
 "iCal\n"
 "Free/Busy"
-msgstr "I lirë/zënë"
+msgstr ""
+"iCal\n"
+"I lirë/Zënë"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:101
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
-msgstr "Filtrat mesazhe tek instaluar."
+msgstr ""
+"Filtron mesazhet e padëhiruar duke përdorur Spamassassin. Ky plugin kërkon "
+"instalimin e Spamassassin."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "Spamassassin junk plugin"
-msgstr "Spamassassin (built-in)"
+msgstr "Plugin për të padëshiruarit i Spamassassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -17102,9 +16966,8 @@ msgid "percent Done"
 msgstr "përqindja e plotësuar"
 
 #: ../plugins/save-calendar/csv-format.c:398
-#, fuzzy
 msgid "URL"
-msgstr "_URL:"
+msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
@@ -17147,9 +17010,8 @@ msgid "Saves selected calendar or tasks list to disk."
 msgstr "Ruan kalendarin e zgjedhur apo listën e veprimtarive në disk."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "_Save to Disk"
-msgstr "Ruaj në _Disk"
+msgstr "_Ruaj në Disk"
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -17178,19 +17040,16 @@ msgid "Selects a single calendar or task source for viewing."
 msgstr "Zgjedh një kalendar të vetëm apo burim veprimtarie për të shfaqur."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-#, fuzzy
 msgid "Show _only this Calendar"
-msgstr "_Shfaq vetëm këtë Kalendar"
+msgstr "Shfaq +vetëm këtë Kalendar"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-#, fuzzy
 msgid "Show _only this Task List"
-msgstr "_Shfaq vetëm këtë listë aktivitetesh"
+msgstr "Shfaq _vetëm këtë listë aktivitetesh"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin that handles the Startup wizard."
-msgstr "A."
+msgstr "Një plugin që merret me proçedurën e nisjes."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
@@ -17305,24 +17164,24 @@ msgid "Printer settings"
 msgstr "Rregullimet e printerit"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
-#, fuzzy
 msgid "Sidebar is visible"
-msgstr "Paneli i instrumentëve është i dukshëm"
+msgstr "Paneli anësor është i dukshëm"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Kapërce dialogun e paralajmërimit të versionit në zhvillim"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Fillo në modalitetin jashtë linje"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Versioni i konfigurimit të Evolution, me nivelet major/minor/konfigurim"
+msgstr ""
+"Versioni i konfigurimit të Evolution, me nivelet e konfigurimit major/minor/ "
+"(për shembull \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
@@ -17337,13 +17196,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Gjerësia e prezgjedhur e kuadratit anësor, në pixel."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
-#, fuzzy
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr ""
-"Versioni i fundit i përditsuar i konfigurimit të Evolution, me nivelet major/"
-"minor/konfigurim"
+"Versioni i fundit i përditsuar i konfigurimit të Evolution, me nivelet e "
+"konfigurimit major/minor/ (për shembull \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
@@ -17366,9 +17224,8 @@ msgstr ""
 "modalitetit në linjë."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
 msgid "Whether the sidebar should be visible."
-msgstr "Nëse paneli i instrumentëve duhet të jetë i dukshëm."
+msgstr "Nëse paneli anësor duhet të jetë i dukshëm."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
@@ -17464,9 +17321,8 @@ msgid "Import a _single file"
 msgstr "Importo një file të _vetëm"
 
 #: ../shell/e-shell-settings-dialog.c:318
-#, fuzzy
 msgid "Evolution Preferences"
-msgstr "Kontrolli i preferimeve të postës së Evolution"
+msgstr "Prefrimet e Evolution"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -17508,35 +17364,37 @@ msgstr "Bug buddy nuk mund të vihet në funksionim."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr "Laurent Dhima <laurenti@alblinux.net>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
-msgstr "_Puno online"
+msgstr "_Puno në linjë"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Puno Jashtë Linje"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
-msgstr "Puno online"
+msgstr "Puno në linjë"
 
 #: ../shell/e-shell-window.c:368
-#, fuzzy
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution aktualisht është online.  Kliko tek ky buton për të punuar offline."
+msgstr ""
+"Evolution aktualisht është në linjë.  Kliko tek ky buton për të punuar "
+"jashtë linje."
 
 #: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
-msgstr "Evolution është në procesin e daljes offline."
+msgstr "Evolution është në procesin e daljes jashtë linje."
 
 #: ../shell/e-shell-window.c:383
-#, fuzzy
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution aktualisht është offline.  Kliko tek ky buton për të punuar online."
+msgstr ""
+"Evolution aktualisht është jashtë linje.  Kliko tek ky buton për të punuar "
+"në linjë."
 
 #: ../shell/e-shell-window.c:783
 #, c-format
@@ -17623,8 +17481,8 @@ msgstr ""
 "të files së jashtëm nën Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
-#, fuzzy, no-c-format
+#: ../shell/main.c:231
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17649,19 +17507,18 @@ msgstr ""
 "përfundimit, por disa nga karakteristikat janë akoma të paplota\n"
 "apo nuk funksionojnë si duhet.\n"
 "\n"
-"Nëse dëshironi një version stabël të Evolution, do t'ju duhet të "
-"ç'instaloni\n"
+"Nëse dëshironi një version stabël të Evolution, do t'ju duhet të çinstaloni\n"
 "këtë version dhe të instaloni versionin %s në vend të tij.\n"
 "\n"
-"Nëse ndeshni në difekte, jeni të lutur t'i raportoni tek bugzilla.ximian."
-"com.\n"
+"Nëse ndeshni në difekte, jeni të lutur t'i raportoni tek bugzilla.gnome."
+"org.\n"
 "Ky version vjen pa garanci dhe nuk është menduar për\n"
 "persona që nxehen shpejt.\n"
 "\n"
 "Shpresojmë t'ju pëlqejë rezultati i punës sonë të vështirë, dhe\n"
 "ne presim me dëshirë kontributin tuaj!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17669,36 +17526,35 @@ msgstr ""
 "Ju faleminderit\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:261
-#, fuzzy
+#: ../shell/main.c:262
 msgid "Do not tell me again"
-msgstr "Mos e shfaq më"
+msgstr "Mos ma përsërit më"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Fillo Evolution duke aktivuar komponentin e specifikuar"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Fillo në modalitetin në linjë"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Detyro përfundimin e të gjithë komponentëve të Evolution"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Detyro ri-emigrimin nga Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Dërgo rezultatin e debug të të gjithë komponuesve në një file."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Ç'aktivo ngarkimin e çfarëdo plugin."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17724,7 +17580,6 @@ msgid "Evolution can not start."
 msgstr "E pamundur nisja e Evolution."
 
 #: ../shell/shell.error.xml.h:5
-#, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -17741,7 +17596,6 @@ msgid "Really delete old data?"
 msgstr "Me të vërtetë eleminon të dhënat e vjetra?"
 
 #: ../shell/shell.error.xml.h:9
-#, fuzzy
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -17764,7 +17618,6 @@ msgstr ""
 "mëparshëm të Evolution pa ndërhyrë manualisht.\n"
 
 #: ../shell/shell.error.xml.h:15
-#, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -17786,7 +17639,6 @@ msgid "Upgrade from previous version failed: {0}"
 msgstr "Përditësimi nga versioni i kaluar dështoi: {0}"
 
 #: ../shell/shell.error.xml.h:20
-#, fuzzy
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -18352,33 +18204,28 @@ msgid "Shutting down %s (%s)\n"
 msgstr "Duke mbyllur %s (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:1
-#, fuzzy
 msgid "Address _Book Properties"
-msgstr "Pronësitë e Rubrikës"
+msgstr "Pronësitë e Ru_brikës"
 
 #: ../ui/evolution-addressbook.xml.h:3
-#, fuzzy
 msgid "Change the properties of the selected folder"
-msgstr "Ndrysho pronësitë e kësaj kartele"
+msgstr "Ndrysho pronësitë e kartelës së zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:4
-#, fuzzy
 msgid "Co_py All Contacts To..."
-msgstr "Kopjo kontaktet tek"
+msgstr "Ko_pjo të gjithë kontaktet tek..."
 
 #: ../ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Contact _Preview"
-msgstr "Prova e printimit të kontakteve"
+msgstr "_Pamja e parë e kontaktit"
 
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopjo kontaktet e zgjedhuar tek një kartelë tjetër..."
 
 #: ../ui/evolution-addressbook.xml.h:8
-#, fuzzy
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Kopjo mesazhet e zgjedhur në një kartelë tjetër"
+msgstr "Kopjo kontaktet e kartelës së zgjedhur në një kartelë tjetër"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -18389,9 +18236,8 @@ msgid "Copy to Folder..."
 msgstr "Kopjo tek kartela..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Create a new addressbook folder"
-msgstr "Krijo një rubrikë të re"
+msgstr "Krijo një kartelë të re rubrike"
 
 #: ../ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
@@ -18404,36 +18250,32 @@ msgid "Cut the selection"
 msgstr "Preje pjesën e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:14
-#, fuzzy
 msgid "Del_ete Address Book"
-msgstr "Rubrikë e Re"
+msgstr "El_emino rubrikën"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "Fshi kontaktet e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:17
-#, fuzzy
 msgid "Delete the selected folder"
-msgstr "Anullo fshirjen e mesazheve të zgjedhur"
+msgstr "Elemino kartelën e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
 msgstr "Përcill kontaktin"
 
 #: ../ui/evolution-addressbook.xml.h:19
-#, fuzzy
 msgid "Mo_ve All Contacts To..."
-msgstr "Lëviz kontaktet tek"
+msgstr "Lë_viz të gjithë kontaktet tek..."
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Lëviz kontaktet e zgjedhura tek një kartelë tjetër..."
 
 #: ../ui/evolution-addressbook.xml.h:21
-#, fuzzy
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "Lëviz kartelën e zgjedhur nën një kartelë tjetër"
+msgstr "Lëviz kontaktet e kartelës së zgjedhur në një kartelë tjetër"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
@@ -18458,23 +18300,20 @@ msgid "Print selected contacts"
 msgstr "Printo kontaktet e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:29
-#, fuzzy
 msgid "Rename the selected folder"
-msgstr "Riemërto kartelën \"%s\" në:"
+msgstr "Riemërto kartelën e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:30
-#, fuzzy
 msgid "S_ave Address Book As VCard"
-msgstr "Rubrikë e Re"
+msgstr "Ru_aj rubrikën si VCard"
 
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Ruaj kontaktet e zgjedhur si një VCard."
 
 #: ../ui/evolution-addressbook.xml.h:33
-#, fuzzy
 msgid "Save the contacts of the selected folder as VCard"
-msgstr "Ruaj kontaktet e zgjedhur si një VCard."
+msgstr "Ruaj kontaktet e kartelës së zgjedhur si VCard"
 
 #: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
@@ -18507,9 +18346,8 @@ msgid "Show contact preview window"
 msgstr "Shfaq dritaren e pamjes së parë të kontaktit"
 
 #: ../ui/evolution-addressbook.xml.h:41
-#, fuzzy
 msgid "St_op"
-msgstr "Ndal"
+msgstr "Ndal_o"
 
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
@@ -18529,52 +18367,44 @@ msgid "_Actions"
 msgstr "_Veprimet"
 
 #: ../ui/evolution-addressbook.xml.h:47
-#, fuzzy
 msgid "_Copy Contact to..."
-msgstr "Kopjo kontaktin tek"
+msgstr "_Kopjo kontaktin tek..."
 
 #: ../ui/evolution-addressbook.xml.h:48
-#, fuzzy
 msgid "_Copy Folder Contacts To"
-msgstr "_Kopjo kartelën tek..."
+msgstr "_Kopjo kartelën e kontakteve tek..."
 
 #: ../ui/evolution-addressbook.xml.h:50
-#, fuzzy
 msgid "_Delete Contact"
-msgstr "_Kontakt"
+msgstr "_Elemino kontaktin"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "_Përcill kontaktin..."
 
 #: ../ui/evolution-addressbook.xml.h:53
-#, fuzzy
 msgid "_Move Contact to..."
-msgstr "Lëvize kontaktin tek"
+msgstr "_Lëvize kontaktin tek..."
 
 #: ../ui/evolution-addressbook.xml.h:54
-#, fuzzy
 msgid "_Move Folder Contacts To"
-msgstr "_Lëviz kartelën tek..."
+msgstr "_Lëviz kartelën e kontakteve tek"
 
 #: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_E re"
 
 #: ../ui/evolution-addressbook.xml.h:60
-#, fuzzy
 msgid "_Rename"
-msgstr "_Riemërto..."
+msgstr "_Riemërto"
 
 #: ../ui/evolution-addressbook.xml.h:61
-#, fuzzy
 msgid "_Save Contact as VCard..."
-msgstr "_Ruaje si VCard..."
+msgstr "_Ruaj kontaktin si VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:62
-#, fuzzy
 msgid "_Save Folder Contacts As VCard"
-msgstr "Ruaj kontaktet e zgjedhur si një VCard."
+msgstr "_Ruaj kartelën e kontakteve si VCard"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
@@ -18585,12 +18415,10 @@ msgid "Day"
 msgstr "Dita"
 
 #: ../ui/evolution-calendar.xml.h:6
-#, fuzzy
 msgid "Delete _all Occurrences"
-msgstr "Elemino të _gjitha përkujtimoret"
+msgstr "Elemino të gjith_a përkujtimoret"
 
 #: ../ui/evolution-calendar.xml.h:7
-#, fuzzy
 msgid "Delete all occurrences"
 msgstr "Elemino të gjithë përvjetorët"
 
@@ -18599,7 +18427,6 @@ msgid "Delete the appointment"
 msgstr "Elemino takimin"
 
 #: ../ui/evolution-calendar.xml.h:10
-#, fuzzy
 msgid "Delete this occurrence"
 msgstr "Elemino këtë përvjetor"
 
@@ -18705,7 +18532,6 @@ msgid "Copy selected text to the clipboard"
 msgstr "Kopjo tekstin e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-composer-entries.xml.h:3
-#, fuzzy
 msgid "Copy selection to clipboard"
 msgstr "Kopjo tekstin e zgjedhur tek Shënimet"
 
@@ -18714,12 +18540,10 @@ msgid "Cut selected text to the clipboard"
 msgstr "Preje tekstin e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-composer-entries.xml.h:7
-#, fuzzy
 msgid "Cut selection to clipboard"
 msgstr "Preje tekstin e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-composer-entries.xml.h:9
-#, fuzzy
 msgid "Paste from clipboard"
 msgstr "Ngjit nga shënimet"
 
@@ -18736,24 +18560,20 @@ msgid "Attach"
 msgstr "Bashkangjit"
 
 #: ../ui/evolution-editor.xml.h:2
-#, fuzzy
 msgid "Click here to attach a file"
-msgstr "<kliko këtu për të zgjedhur një kartelë>"
+msgstr "Kliko këtu për të bashkangjitur një file"
 
 #: ../ui/evolution-editor.xml.h:3
-#, fuzzy
 msgid "Click here to close the current window"
-msgstr "Mbylle file aktual"
+msgstr "Kliko këtu për të mbyllur dritaren aktuale"
 
 #: ../ui/evolution-editor.xml.h:4
-#, fuzzy
 msgid "Click here to save the current window"
-msgstr "Mbylle file aktual"
+msgstr "Kliko këtu për të ruajtur dritaren aktuale"
 
 #: ../ui/evolution-editor.xml.h:5
-#, fuzzy
 msgid "Click here to view help available"
-msgstr "<kliko këtu për të zgjedhur një datë>"
+msgstr "Kliko këtu për të shfaqur ndihmën në dispozicion"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18791,166 +18611,136 @@ msgid "_Insert"
 msgstr "_Ndërfut"
 
 #: ../ui/evolution-editor.xml.h:21
-#, fuzzy
 msgid "_Options"
-msgstr "Mundësitë"
+msgstr "_Opsionet"
 
 #: ../ui/evolution-event-editor.xml.h:2
-#, fuzzy
 msgid "All Day Event"
-msgstr "_Ngjarje të ditës"
+msgstr "Ngjarje e përditshme"
 
 #: ../ui/evolution-event-editor.xml.h:3
-#, fuzzy
 msgid "All _Day Event"
-msgstr "_Ngjarje të ditës"
+msgstr "Ngjarje e për_Ditshme"
 
 #: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
 #: ../ui/evolution-task-editor.xml.h:1
-#, fuzzy
 msgid "Classify as Confidential"
-msgstr "Në konfidencë"
+msgstr "Klasifiko si në konfidencë"
 
 #: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
 #: ../ui/evolution-task-editor.xml.h:2
-#, fuzzy
 msgid "Classify as Private"
-msgstr "Privat"
+msgstr "Klasifiko si privat"
 
 #: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
 #: ../ui/evolution-task-editor.xml.h:3
 msgid "Classify as public"
-msgstr ""
+msgstr "Klasifiko si publik"
 
 #: ../ui/evolution-event-editor.xml.h:7
-#, fuzzy
 msgid "Click here to set or unset alarms for this event"
-msgstr "Kliko këtu për të zgjedhur kartelat ku duhet dërguar"
+msgstr "Kliko këtu për të vendosur ose hequr alarmet për këtë ndodhi"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-#, fuzzy
 msgid "Insert advanced send options"
-msgstr "Opsionet e de_tajuara të dërgimit"
+msgstr "Fut opsionet e hollësishme të dërgimit"
 
 #: ../ui/evolution-event-editor.xml.h:10
-#, fuzzy
 msgid "Make this a recurring event"
-msgstr "Përcaktoje këtë ngjarje si të _lëvizëshme"
+msgstr "Përcaktoje këtë ngjarje si përkujtimore"
 
 #: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
 #: ../ui/evolution-task-editor.xml.h:6
-#, fuzzy
 msgid "Pu_blic"
-msgstr "Publik"
+msgstr "Pu_blik"
 
 #: ../ui/evolution-event-editor.xml.h:12
-#, fuzzy
 msgid "Query free / busy information for the attendees"
-msgstr "Publiko informacionet e disponibilitetit për këtë kalendar"
+msgstr "Kërko informacione disponibilitetit për pjesmarrësin"
 
 #: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-#, fuzzy
 msgid "R_ole Field"
-msgstr "Fusha _Për"
+msgstr "Fusha e r_olit"
 
 #: ../ui/evolution-event-editor.xml.h:16
-#, fuzzy
 msgid "Show time as _busy"
 msgstr "Shfaq kohën si i _zënë"
 
 #: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
-#, fuzzy
 msgid "Time _Zone"
-msgstr "Zona e orës:"
+msgstr "_Zona orare"
 
 #: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
-#, fuzzy
 msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e fushës së llojit të pjesmarrësit"
 
 #: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
-#, fuzzy
 msgid "Toggles whether the RSVP field is displayed"
-msgstr "Shkëmbe shfaqjen e fushës CC"
+msgstr "Ndryshon shfaqjen e fushës së RSVP"
 
 #: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
-#, fuzzy
 msgid "Toggles whether the Role field is displayed"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e fushës së rolit"
 
 #: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
-#, fuzzy
 msgid "Toggles whether the Status field is displayed"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e fushës së gjëndjes"
 
 #: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
-#, fuzzy
 msgid "Toggles whether the time zone is displayed"
-msgstr "Shkëmbe shfaqjen e fushës Nga"
+msgstr "Ndryshon shfaqjen e zonës orare"
 
 #: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
-#, fuzzy
 msgid "Toggles whether to display categories"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e kategorive"
 
 #: ../ui/evolution-event-editor.xml.h:24
-#, fuzzy
 msgid "Toggles whether to have All Day Event"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon prezencën e aktivitetit të përditshëm"
 
 #: ../ui/evolution-event-editor.xml.h:25
-#, fuzzy
 msgid "Toggles whether to show time as busy"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e kohës si i zënë"
 
 #: ../ui/evolution-event-editor.xml.h:26
-#, fuzzy
 msgid "_Alarms"
-msgstr "Alarme"
+msgstr "_Alarme"
 
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
-#, fuzzy
 msgid "_Classification"
-msgstr "K_lasifikimi"
+msgstr "_Klasifikimi"
 
 #: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
-#, fuzzy
 msgid "_Confidential"
-msgstr "Në konfidencë"
+msgstr "_Në konfidencë"
 
 #: ../ui/evolution-event-editor.xml.h:30
-#, fuzzy
 msgid "_Free/Busy"
-msgstr "_I lirë/zënë:"
+msgstr "_I lirë/zënë"
 
 #: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
-#, fuzzy
 msgid "_Private"
-msgstr "Privat"
+msgstr "_Privat"
 
 #: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
-#, fuzzy
 msgid "_RSVP"
-msgstr "RSVP"
+msgstr "_RSVP"
 
 #: ../ui/evolution-event-editor.xml.h:33
-#, fuzzy
 msgid "_Recurrence"
-msgstr "Përvjetor"
+msgstr "_Përvjetor"
 
 #: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
-#, fuzzy
 msgid "_Status Field"
-msgstr "_Gjendja:"
+msgstr "Fu_Sha e gjëndjes"
 
 #: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
-#, fuzzy
 msgid "_Type Field"
-msgstr "Fusha _Për"
+msgstr "Fusha e lloji_T"
 
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -19011,9 +18801,8 @@ msgid "_Copy Folder To..."
 msgstr "_Kopjo kartelën tek..."
 
 #: ../ui/evolution-mail-global.xml.h:17
-#, fuzzy
 msgid "_Message Filters"
-msgstr "F_iltrat e mesazheve"
+msgstr "Filtrat e _Mesazheve"
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
@@ -19039,14 +18828,12 @@ msgid "Change the properties of this folder"
 msgstr "Ndrysho pronësitë e kësaj kartele"
 
 #: ../ui/evolution-mail-list.xml.h:3
-#, fuzzy
 msgid "Collapse All _Threads"
-msgstr "Grumbullo sipas _Tematikës"
+msgstr "Palos të gjitha _Temat"
 
 #: ../ui/evolution-mail-list.xml.h:4
-#, fuzzy
 msgid "Collapse all message threads"
-msgstr "Shëno si të lexuar të gjithë mesazhet"
+msgstr "Palos të gjitha temat e mesazheve"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
@@ -19058,18 +18845,16 @@ msgid "Cut selected message(s) to the clipboard"
 msgstr "Preje mesazhin(et) e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-mail-list.xml.h:8
-#, fuzzy
 msgid "E_xpand All Threads"
-msgstr "Shpalos Gjithçka"
+msgstr "Sh_palos të gjitha temat"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "_Elemino përgjithmonë"
 
 #: ../ui/evolution-mail-list.xml.h:10
-#, fuzzy
 msgid "Expand all message threads"
-msgstr "Shëno si të lexuar të gjithë mesazhet"
+msgstr "Shpalos të gjitha temat e mesazheve"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
@@ -19088,9 +18873,8 @@ msgid "Hide deleted messages rather than displaying them with a line through the
 msgstr "Fshih mesazhet e fshirë në vend që t'i shfaqësh të vizuar"
 
 #: ../ui/evolution-mail-list.xml.h:16
-#, fuzzy
 msgid "Mar_k All Messages as Read"
-msgstr "Shëno me_sazhet si të lexuar"
+msgstr "Shën_o të gjithë mesazhet si të lexuar"
 
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
@@ -19147,9 +18931,8 @@ msgid "Threaded Message list"
 msgstr "Rreshtim sipas diskutimeve"
 
 #: ../ui/evolution-mail-list.xml.h:31
-#, fuzzy
 msgid "_Group By Threads"
-msgstr "Grumbullo sipas _Tematikës"
+msgstr "_Grumbullo sipas tematikës"
 
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
@@ -19179,7 +18962,7 @@ msgstr "Aplikoi rregullat e filtrit mesazheve të zgjedhur"
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr "Kontrollo për _Refuzime"
+msgstr "Kontrollo për _të padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -19202,9 +18985,8 @@ msgid "Copy selected messages to another folder"
 msgstr "Kopjo mesazhet e zgjedhur në një kartelë tjetër"
 
 #: ../ui/evolution-mail-message.xml.h:13
-#, fuzzy
 msgid "Copy selected messages to the clipboard"
-msgstr "Kopjo mesazhin(et) e zgjedhur tek Shënimet"
+msgstr "Kopjo mesazhet e zgjedhur tek shënimet"
 
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
@@ -19243,9 +19025,8 @@ msgid "Create a rule to filter messages with this subject"
 msgstr "Krijo një rregull për të filtruar mesazhet me këtë subjekt"
 
 #: ../ui/evolution-mail-message.xml.h:23
-#, fuzzy
 msgid "Cut selected messages to the clipboard"
-msgstr "Preje mesazhin(et) e zgjedhur tek Shënimet"
+msgstr "Preje mesazhin e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
@@ -19260,9 +19041,8 @@ msgid "Display the next message"
 msgstr "Shfaq mesazhin në vazhdim"
 
 #: ../ui/evolution-mail-message.xml.h:28
-#, fuzzy
 msgid "Display the next thread"
-msgstr "Shfaq diskutimin e palexuar në vazhdim"
+msgstr "Shfaq temën në vazhdim"
 
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
@@ -19281,9 +19061,8 @@ msgid "Display the previous unread message"
 msgstr "Shfaq mesazhin paraardhës të palexuar"
 
 #: ../ui/evolution-mail-message.xml.h:33
-#, fuzzy
 msgid "F_orward As..."
-msgstr "_Përcill kontaktin..."
+msgstr "P_ërcille si..."
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
@@ -19303,12 +19082,11 @@ msgstr "Filtro në _Subjekt..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "Kontrollo nëse duhen flakur mesazhet e zgjedhur"
+msgstr "Kontrollo mesazhet e zgjedhur për praninë e të padëshiruarve"
 
 #: ../ui/evolution-mail-message.xml.h:39
-#, fuzzy
 msgid "Flag selected messages for follow-up"
-msgstr "Shëno mesazhin(et) e zgjedhur si vazhdim"
+msgstr "Shëno mesazhet e zgjedhur për në ndjekje"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -19343,43 +19121,36 @@ msgid "Mar_k as"
 msgstr "Shë_no si"
 
 #: ../ui/evolution-mail-message.xml.h:50
-#, fuzzy
 msgid "Mark the selected messages as having been read"
-msgstr "Shëno mesazhin(et) e zgjedhur si të lexuar"
+msgstr "Shëno mesazhet e zgjedhur si të lexuar"
 
 #: ../ui/evolution-mail-message.xml.h:51
-#, fuzzy
 msgid "Mark the selected messages as important"
-msgstr "Shëno mesazhin(et) e zgjedhur si të rendësishëm"
+msgstr "Shëno mesazhet e zgjedhur si të rendësishëm"
 
 #: ../ui/evolution-mail-message.xml.h:52
-#, fuzzy
 msgid "Mark the selected messages as junk"
-msgstr "Shëno mesazhin(et) e zgjedhur si për tu hedhur në kosh"
+msgstr "Shëno mesazhet e zgjedhur si të padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:53
-#, fuzzy
 msgid "Mark the selected messages as not being junk"
-msgstr "Shëno mesazhin(et) e zgjedhur si jo për tu hedhur në kosh"
+msgstr "Shëno mesazhet e zgjedhur si jo të padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:54
-#, fuzzy
 msgid "Mark the selected messages as not having been read"
-msgstr "Shëno mesazhin(et) e zgjedhur si të palexuar"
+msgstr "Shëno mesazhet e zgjedhur si të palexuar"
 
 #: ../ui/evolution-mail-message.xml.h:55
-#, fuzzy
 msgid "Mark the selected messages as unimportant"
-msgstr "Shëno mesazhin(et) e zgjedhur si të parendësishëm"
+msgstr "Shëno mesazhet e zgjedhur si të parendësishëm"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Shëno mesazhet e zgjedhur për t'i eleminuar"
 
 #: ../ui/evolution-mail-message.xml.h:57
-#, fuzzy
 msgid "Move selected messages to another folder"
-msgstr "Lëviz mesazhin(et) e zgjedhur në një kartelë tjetër"
+msgstr "Lëviz mesazhet e zgjedhur në një kartelë tjetër"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
@@ -19395,30 +19166,27 @@ msgstr "Mesazhi në vazhdim i _Palexuar"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
-msgstr "Jo për t'u flakur"
+msgstr "Jo i padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "Hap një dritare për të hartuar një mesazh"
 
 #: ../ui/evolution-mail-message.xml.h:64
-#, fuzzy
 msgid "Open the selected messages in a new window"
-msgstr "Hape mesazhin e zgjedhur në një dritare të re"
+msgstr "Hap mesazhet e zgjedhur në një dritare të re"
 
 #: ../ui/evolution-mail-message.xml.h:65
-#, fuzzy
 msgid "Open the selected messages in the composer for editing"
-msgstr "Hape mesazhin e zgjedhur në një dritare për t'a ndryshuar"
+msgstr "Hap mesazhet e zgjedhur në kompozues për t'a ndryshuar"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "Mesazhi pa_raardhës i palexuar"
 
 #: ../ui/evolution-mail-message.xml.h:67
-#, fuzzy
 msgid "Paste messages from the clipboard"
-msgstr "Ngjit mesazhin(et) nga shënimet"
+msgstr "Ngjit mesazhet nga shënimet"
 
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
@@ -19461,9 +19229,8 @@ msgid "Reset the text to its original size"
 msgstr "Rikthe tekstin në madhësine e tij orgjinale"
 
 #: ../ui/evolution-mail-message.xml.h:85
-#, fuzzy
 msgid "Save the selected messages as a text file"
-msgstr "Ruaj mesazhin si file teksti"
+msgstr "Ruaj mesazhet e zgjedhur si file teksti"
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
@@ -19502,21 +19269,18 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Shfaq një kursor pulsues në trupin e mesazheve"
 
 #: ../ui/evolution-mail-message.xml.h:95
-#, fuzzy
 msgid "Show messages in the normal style"
-msgstr "Paraqit mesazhin në stil normal"
+msgstr "Shfaq mesazhet në stilin e zakonshëm"
 
 #: ../ui/evolution-mail-message.xml.h:96
-#, fuzzy
 msgid "Show messages with all email headers"
-msgstr "Shfaq mesazhin me të gjithë emrat e email-it"
+msgstr "Shfaq mesazhet me të gjithë headers e email"
 
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "Shfaq buruesin e papërpunuar të mesazhit"
 
 #: ../ui/evolution-mail-message.xml.h:98
-#, fuzzy
 msgid "Undelete the selected messages"
 msgstr "Anullo fshirjen e mesazheve të zgjedhur"
 
@@ -19529,18 +19293,16 @@ msgid "Zoom _Out"
 msgstr "Zv_ogëlo"
 
 #: ../ui/evolution-mail-message.xml.h:101
-#, fuzzy
 msgid "_Attached"
-msgstr "Bashkangjit"
+msgstr "_Bashkangjitur"
 
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr "Modalitet paraqitje _kursori"
 
 #: ../ui/evolution-mail-message.xml.h:103
-#, fuzzy
 msgid "_Clear Flag"
-msgstr "H_iq flamurin"
+msgstr "_Hiq shënimin"
 
 #: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
@@ -19551,9 +19313,8 @@ msgid "_Find in Message..."
 msgstr "_Gjej në mesazh..."
 
 #: ../ui/evolution-mail-message.xml.h:109
-#, fuzzy
 msgid "_Flag Completed"
-msgstr "Shën_o si plotësuar"
+msgstr "Shën_o si të plotësuar"
 
 #: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
@@ -19564,22 +19325,20 @@ msgid "_Important"
 msgstr "_Me rendësi"
 
 #: ../ui/evolution-mail-message.xml.h:113
-#, fuzzy
 msgid "_Inline"
-msgstr "Direkt"
+msgstr "_Në linjë"
 
 #: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
-msgstr "_Refuzo"
+msgstr "_I padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
 msgstr "_Ngarko figurat"
 
 #: ../ui/evolution-mail-message.xml.h:117
-#, fuzzy
 msgid "_Message Source"
-msgstr "Burimi i mesazhit"
+msgstr "Burimi i _Mesazhit"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
@@ -19591,7 +19350,7 @@ msgstr "Madhësi _Normale"
 
 #: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
-msgstr "_Mos refuzo"
+msgstr "_Jo i padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
@@ -19602,9 +19361,8 @@ msgid "_Previous Message"
 msgstr "Mesazhi _Paraardhës"
 
 #: ../ui/evolution-mail-message.xml.h:125
-#, fuzzy
 msgid "_Quoted"
-msgstr "I kuotuar"
+msgstr "_Kuotuar"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
@@ -19631,44 +19389,36 @@ msgid "Main toolbar"
 msgstr "Paneli qendror i instrumentëve"
 
 #: ../ui/evolution-memos.xml.h:3
-#, fuzzy
 msgid "Copy selected memo"
-msgstr "Kopjo aktivitetin e zgjedhur"
+msgstr "Kopjo memorjen e zgjedhur"
 
 #: ../ui/evolution-memos.xml.h:5
-#, fuzzy
 msgid "Cut selected memo"
-msgstr "Preje aktivitetin e zgjedhur"
+msgstr "Preje memorjen e zgjedhur"
 
 #: ../ui/evolution-memos.xml.h:7
-#, fuzzy
 msgid "Delete selected memos"
-msgstr "Elemino aktivitetet e zgjedhur"
+msgstr "Elemino memorjet e zgjedhura"
 
 #: ../ui/evolution-memos.xml.h:9
-#, fuzzy
 msgid "Paste memo from the clipboard"
-msgstr "Ngjite tekstin nga Shënimet"
+msgstr "Ngjit memorje nga Shënimet"
 
 #: ../ui/evolution-memos.xml.h:10
-#, fuzzy
 msgid "Previews the list of memos to be printed"
-msgstr "Pamja e parë e listës së aktiviteteve që duhet printuar"
+msgstr "Pamja e parë e listës së memorjeve që duhet printuar"
 
 #: ../ui/evolution-memos.xml.h:13
-#, fuzzy
 msgid "Print the list of memos"
-msgstr "Printo listën e aktiviteteve"
+msgstr "Printo listën e memorjeve"
 
 #: ../ui/evolution-memos.xml.h:14
-#, fuzzy
 msgid "View the selected memo"
-msgstr "Shiko aktivitetin e zgjedhur"
+msgstr "Shiko memorjen e zgjedhur"
 
 #: ../ui/evolution-memos.xml.h:18
-#, fuzzy
 msgid "_Open Memo"
-msgstr "_Hap mesazhet"
+msgstr "_Hap memorjen"
 
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
@@ -19702,9 +19452,8 @@ msgid "For_mat"
 msgstr "For_mati"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#, fuzzy
 msgid "Get delivery notification when your message is read"
-msgstr "Zgjidhe për të marrë ricevutë kur mesazhi yt të jetë lexuar"
+msgstr "Merr ricevutë kur mesazhi yt të jetë lexuar"
 
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
@@ -19712,9 +19461,8 @@ msgstr "HT_ML"
 
 #: ../ui/evolution-message-composer.xml.h:11
 #: ../ui/evolution-signature-editor.xml.h:16
-#, fuzzy
 msgid "I_nsert"
-msgstr "_Ndërfut"
+msgstr "Nd_ërfut"
 
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
@@ -19729,9 +19477,8 @@ msgid "PGP Sign"
 msgstr "Firmos me PGP"
 
 #: ../ui/evolution-message-composer.xml.h:16
-#, fuzzy
 msgid "R_equest Read Receipt"
-msgstr "Kërko ricevutë leximi"
+msgstr "Kërko ric_evutë leximi"
 
 #: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
@@ -19791,9 +19538,8 @@ msgid "Send this message"
 msgstr "Nise këtë mesazh"
 
 #: ../ui/evolution-message-composer.xml.h:32
-#, fuzzy
 msgid "Set the message priority to high"
-msgstr "Ruaj mesazhin si file teksti"
+msgstr "Cakto si të lartë prioritetin e mesazhit"
 
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
@@ -19852,9 +19598,8 @@ msgid "_Post-To Field"
 msgstr "Fusha _Posto-Tek"
 
 #: ../ui/evolution-message-composer.xml.h:51
-#, fuzzy
 msgid "_Prioritize Message"
-msgstr "Printo Mesazhin"
+msgstr "_Prioritet mesazhit"
 
 #: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
@@ -19920,39 +19665,32 @@ msgid "_Invert Selection"
 msgstr "_Inverto zgjedhjen"
 
 #: ../ui/evolution-task-editor.xml.h:4
-#, fuzzy
 msgid "Click change / view the status details of the task"
-msgstr "shfaq gjendja hollësi nga"
+msgstr "Kliko ndrysho / shiko hollësitë e gjëndjes së aktivitetit"
 
 #: ../ui/evolution-task-editor.xml.h:9
-#, fuzzy
 msgid "Status Details"
-msgstr "Gjendja: %s"
+msgstr "Hollësitë e gjëndjes"
 
 #: ../ui/evolution-task-editor.xml.h:10
-#, fuzzy
 msgid "Time Zone"
-msgstr "Zona orare "
+msgstr "Zona orare"
 
 #: ../ui/evolution-task-editor.xml.h:23
-#, fuzzy
 msgid "_Send Options"
-msgstr "Opsione dërgimi"
+msgstr "_Opsione dërgimi"
 
 #: ../ui/evolution-task-editor.xml.h:24
-#, fuzzy
 msgid "_Status Details"
-msgstr "Gjendja: %s"
+msgstr "_Detajet e gjëndjes"
 
 #: ../ui/evolution-tasks.xml.h:3
-#, fuzzy
 msgid "Copy selected tasks"
-msgstr "Kopjo aktivitetin e zgjedhur"
+msgstr "Kopjo aktivitetet e zgjedhur"
 
 #: ../ui/evolution-tasks.xml.h:5
-#, fuzzy
 msgid "Cut selected tasks"
-msgstr "Preje aktivitetin e zgjedhur"
+msgstr "Preje aktivitetet e zgjedhur"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -19971,7 +19709,6 @@ msgid "Mark selected tasks as complete"
 msgstr "Shëno aktivitetet e zgjedhura si të plotësuara"
 
 #: ../ui/evolution-tasks.xml.h:12
-#, fuzzy
 msgid "Paste tasks from the clipboard"
 msgstr "Ngjit aktivitete nga shënimet"
 
@@ -19984,14 +19721,12 @@ msgid "Print the list of tasks"
 msgstr "Printo listën e aktiviteteve"
 
 #: ../ui/evolution-tasks.xml.h:18
-#, fuzzy
 msgid "Show task preview window"
-msgstr "Shfaq dritaren e pamjes së parë të kontaktit"
+msgstr "Shfaq dritaren e pamjes së parë të aktivitetit"
 
 #: ../ui/evolution-tasks.xml.h:19
-#, fuzzy
 msgid "Task _Preview"
-msgstr "_Pamja e parë e mesazhit"
+msgstr "_Pamja e parë e aktivitetit"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
@@ -20048,9 +19783,8 @@ msgid "Hide window buttons"
 msgstr "Fshih pulsantët e dritares"
 
 #: ../ui/evolution.xml.h:13
-#, fuzzy
 msgid "I_mport..."
-msgstr "_Importim..."
+msgstr "I_mportimi..."
 
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
@@ -20073,9 +19807,8 @@ msgid "Send / Receive"
 msgstr "Dërgo / Merr"
 
 #: ../ui/evolution.xml.h:20
-#, fuzzy
 msgid "Send / _Receive"
-msgstr "Dërgo / Merr"
+msgstr "Dërgo / _Merr"
 
 #: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
@@ -20090,14 +19823,12 @@ msgid "Show information about Evolution"
 msgstr "Shfaq informacionet në lidhje me Evolution"
 
 #: ../ui/evolution.xml.h:24
-#, fuzzy
 msgid "Side _Bar"
-msgstr "_Bar"
+msgstr "_Shtylla anësore"
 
 #: ../ui/evolution.xml.h:25
-#, fuzzy
 msgid "Status _Bar"
-msgstr "Gjendja"
+msgstr "_Shtylla e gjëndjes"
 
 #: ../ui/evolution.xml.h:26
 msgid "Submit Bug Report"
@@ -20128,26 +19859,22 @@ msgid "Tool_bar style"
 msgstr "Stili i panelit të _instrumentëve"
 
 #: ../ui/evolution.xml.h:36
-#, fuzzy
 msgid "View/Hide the Side Bar"
-msgstr "Paraqitja Fshih Bar"
+msgstr "Shfaq/Fshih shtyllën anësore"
 
 #: ../ui/evolution.xml.h:37
-#, fuzzy
 msgid "View/Hide the Status Bar"
-msgstr "Paraqitja Fshih Gjendja Bar"
+msgstr "Shfaq/Fshih shtyllën e gjëndjes"
 
 #: ../ui/evolution.xml.h:38
-#, fuzzy
 msgid "_About"
-msgstr "_Llogaria:"
+msgstr "_Informacione"
 
 #: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Mbyll dritaren"
 
 #: ../ui/evolution.xml.h:42
-#, fuzzy
 msgid "_Forget Passwords"
 msgstr "Harro _Fjalëkalimet"
 
@@ -20240,9 +19967,8 @@ msgid "_Messages"
 msgstr "_Mesazhet"
 
 #: ../views/memos/galview.xml.h:1
-#, fuzzy
 msgid "_Memos"
-msgstr "_Anëtarë"
+msgstr "_Memorje"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
@@ -20309,7 +20035,7 @@ msgid "_Edit..."
 msgstr "_Ndrysho..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20347,9 +20073,8 @@ msgid "Define Views..."
 msgstr "Përcakto paraqitjet..."
 
 #: ../widgets/menus/gal-view-menus.c:291
-#, fuzzy
 msgid "C_urrent View"
-msgstr "Paraqitja aktuale"
+msgstr "Paraqitja akt_uale"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -20438,14 +20163,14 @@ msgstr "Y2"
 #: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Gjerësia minimum"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Gjerësia më e Vogël"
 
@@ -20500,9 +20225,8 @@ msgid "Korean"
 msgstr "Koreane"
 
 #: ../widgets/misc/e-charset-picker.c:72
-#, fuzzy
 msgid "Thai"
-msgstr "En"
+msgstr "Thai"
 
 #: ../widgets/misc/e-charset-picker.c:73
 msgid "Turkish"
@@ -20556,18 +20280,16 @@ msgid "Other..."
 msgstr "Tjetër..."
 
 #: ../widgets/misc/e-charset-picker.c:482
-#, fuzzy
 msgid "Ch_aracter Encoding"
-msgstr "Kodifikimi i gërmave"
+msgstr "Kodifikimi i gërm_ave"
 
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
 #: ../widgets/misc/e-dateedit.c:321
-#, fuzzy
 msgid "Date and Time"
-msgstr "Shtimi i datës dhe orës"
+msgstr "Datë dhe ora"
 
 #: ../widgets/misc/e-dateedit.c:340
 msgid "Text entry to input date"
@@ -20582,9 +20304,8 @@ msgid "Combo box to select time"
 msgstr "Kuti e kombinuar për zgjedhjen e orarit"
 
 #: ../widgets/misc/e-dateedit.c:385
-#, fuzzy
 msgid "Time"
-msgstr "_Kohëzgjatja:"
+msgstr "Ora"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
@@ -20660,9 +20381,8 @@ msgid "_Searches"
 msgstr "_Kërkimet"
 
 #: ../widgets/misc/e-filter-bar.c:204
-#, fuzzy
 msgid "Searches"
-msgstr "_Kërkimet"
+msgstr "Kërkimet"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:227
@@ -20725,9 +20445,8 @@ msgstr "Gjerësia e kollonës"
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
 #: ../widgets/misc/e-search-bar.c:371
-#, fuzzy
 msgid "Search"
-msgstr "_Kërko"
+msgstr "Kërko"
 
 #: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
@@ -20763,12 +20482,12 @@ msgstr "Teksti"
 msgid "Find _Now"
 msgstr "Gjej _Tani"
 
-#: ../widgets/misc/e-selection-model-array.c:546
+#: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "Rreshti kursorit"
 
-#: ../widgets/misc/e-selection-model-array.c:553
+#: ../widgets/misc/e-selection-model-array.c:554
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "Kollona kursorit"
@@ -20876,9 +20595,8 @@ msgid "When decli_ned:"
 msgstr "Kur refu_zohet:"
 
 #: ../widgets/misc/e-send-options.glade.h:26
-#, fuzzy
 msgid "Wi_thin"
-msgstr "B_renda"
+msgstr "Për_mban"
 
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
@@ -20923,9 +20641,8 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% plotësuar)"
 
 #: ../widgets/misc/e-url-entry.c:107
-#, fuzzy
 msgid "Click here to go to URL"
-msgstr "kliko këtu për të shkuar tek url"
+msgstr "Kliko këtu për të shkuar tek adresa URL"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
@@ -21087,9 +20804,8 @@ msgid "No grouping"
 msgstr "Të pa grupuara"
 
 #: ../widgets/table/e-table-config.c:584
-#, fuzzy
 msgid "Available Fields"
-msgstr "Fushat në di_spozicion:"
+msgstr "Fushat në dispozicion"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
@@ -21102,14 +20818,14 @@ msgstr "_Shfaq këto fusha duke i renditur:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Kod DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Titulli i plotë"
 
@@ -21153,7 +20869,7 @@ msgstr "%s (%d elementë)"
 #: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Ndryshimi i ngjyrave të rreshtave"
 
@@ -21161,7 +20877,7 @@ msgstr "Ndryshimi i ngjyrave të rreshtave"
 #: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
 #: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "Rrjetë e vizatuar horizontalisht"
@@ -21170,7 +20886,7 @@ msgstr "Rrjetë e vizatuar horizontalisht"
 #: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "Rrjetë e vizatuar vertikalisht"
@@ -21179,7 +20895,7 @@ msgstr "Rrjetë e vizatuar vertikalisht"
 #: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "Fokusi i rrjetës"
@@ -21188,7 +20904,7 @@ msgstr "Fokusi i rrjetës"
 #: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Modaliteti kursor"
 
@@ -21196,7 +20912,7 @@ msgstr "Modaliteti kursor"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Modeli i zgjedhjes"
 
@@ -21204,7 +20920,7 @@ msgstr "Modeli i zgjedhjes"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
 #: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
 #: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
@@ -21214,7 +20930,7 @@ msgstr "Gjatësia kufirit"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
 #: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
@@ -21275,31 +20991,31 @@ msgstr "Formato kollonat..."
 msgid "Customize Current View..."
 msgstr "Personalizo paraqitjen aktuale..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Gërmat"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Rendit informacionin"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Degëzimi"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Titull i tabelës"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Modeli i tabelës"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Rreshti kursorit"
 
diff --git a/po/sv.po b/po/sv.po
index 72c290b8b0..b18b9717de 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,25 +1,25 @@
 # Swedish messages for Evolution.
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# Daniel Nylander <po@danielnylander.se>, 2006.
 # Andreas Hyden <a.hyden@cyberpoint.se>, 2000.
 # Richard Hult <rhult@codefactory.se>, 2000, 2001.
 # Christian Rose <menthos@menthos.com>, 2000, 2001, 2002, 2003, 2004, 2005.
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 # Johan Dahlin <zilch.am@home.se>, 2001.
+# Daniel Nylander <po@danielnylander.se>, 2006.
 #
 # Terminology
 # appointment = möte
 # meeting = sammanträde
 # event = evenemang
 #
-# $Id: sv.po,v 1.220 2006/07/16 14:49:27 dnylande Exp $
+# $Id: sv.po,v 1.218.2.3 2006/05/19 06:37:31 dnylande Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-16 07:06+0200\n"
-"PO-Revision-Date: 2006-07-16 16:20+0100\n"
+"POT-Creation-Date: 2006-05-18 20:46+0200\n"
+"PO-Revision-Date: 2006-05-18 23:24+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution-adressbok"
 
@@ -43,12 +43,12 @@ msgstr "Ny kontakt"
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "aktuella adressboksmappen %s har %d kort"
-msgstr[1] "aktuella adressboksmappen %s har %d kort"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "aktuella adressboksmappen har %d kort"
+msgstr[1] "aktuella adressboksmappen har %d kort"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -67,32 +67,32 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "evolution-minikort"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Det har alarm."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Det har upprepningar."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Det är ett sammanträde."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenderevenemang: Sammanfattningen är %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenderevenemang: Det har ingen sammanfattning."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "kalendervisningshändelse"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Tag fokus"
 
@@ -121,9 +121,7 @@ msgstr "Gå till datum"
 msgid "a table to view and select the current time range"
 msgstr "en tabell för att visa och välja den aktuella tidsperioden"
 
-#. 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-day-view.c:149
 #: ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
@@ -131,34 +129,26 @@ msgid_plural "It has %d events."
 msgstr[0] "Det har %d evenemang."
 msgstr[1] "Det har %d evenemang."
 
-#. 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-day-view.c:151
 #: ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Det har inga evenemang."
 
-#. 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbetsveckovy: %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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dagsvy: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "kalendervy för en arbetsvecka"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "kalendervy för en eller flera dagar"
 
@@ -175,10 +165,9 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711
+#: ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -209,10 +198,9 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -342,14 +330,6 @@ msgstr "Aktivera standardalternativ"
 msgid "Popup Menu"
 msgstr "Popup-meny"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Växla bilagerad"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "aktivera"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
 msgstr "Det finns redan en kontakt med denna adress. Vill du ändå lägga till ett nytt kort med samma adress?"
@@ -479,7 +459,7 @@ msgid "Your contacts for {0} will not be available until Evolution is restarted.
 msgstr "Dina kontakter för {0} kommer inte att vara tillgängliga innan Evolution har startats om."
 
 #: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -493,7 +473,7 @@ msgstr "_Förkasta"
 # Vad är detta?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -535,10 +515,10 @@ msgstr "Konfigurera automatisk ifyllning här"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247
 #: ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -606,8 +586,8 @@ msgstr "På denna dator"
 #: ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198
 #: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054
+#: ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Personligt"
 
@@ -634,7 +614,7 @@ msgid "Create a new contact list"
 msgstr "Skapa en ny kontaktlista"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
@@ -650,77 +630,76 @@ msgstr "Skapa en ny adressbok"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Misslyckades med att uppgradera adressboksinställningar eller mappar."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Bas"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Kopiera bokinnehåll lokalt för frånkopplad åtgärd"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../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:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222
-#: ../mail/mail-config.glade.h:85
-#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allmänt"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:7
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:791
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Söker"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Hämtning"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Egenskaper för adressboken"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
 #: ../calendar/gui/migration.c:153
-#: ../mail/em-migrate.c:1202
+#: ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Migrerar..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:200
-#: ../mail/em-migrate.c:1243
+#: ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerar \"%s\""
@@ -793,21 +772,20 @@ msgstr "Mappnamn kan inte innehålla \"/\""
 msgid "A Folder with this name already exists"
 msgstr "En mapp med detta namn finns redan"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Ny adressbok"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617
+#: ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061
-#: ../mail/em-folder-view.c:1126
+#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30
@@ -816,18 +794,17 @@ msgstr "_Ny adressbok"
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Spara som Vcard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/memos-component.c:453
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Väljare för kontaktkälla"
 
@@ -836,7 +813,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ansluter anonymt till LDAP-servern"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
@@ -879,7 +856,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI för den mapp som senast användes i namnväljardialogen."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Vertikal panelposition"
 
@@ -1101,8 +1078,8 @@ msgstr "_Inloggningsmetod:"
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:163
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Namn:"
 
@@ -1115,7 +1092,7 @@ msgid "_Search scope:"
 msgstr "_Sökomfattning:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1149,15 +1126,17 @@ msgstr "minut"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h: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
@@ -1202,13 +1181,13 @@ msgstr "<b>Jobb</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1217,7 +1196,7 @@ msgstr "Kontakt"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -1260,8 +1239,8 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Jobb"
 
@@ -1283,15 +1262,16 @@ msgid "_Birthday:"
 msgstr "_Födelsedag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "_Kategorier..."
+#: ../ui/evolution-event-editor.xml.h:27
+#: ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Kategorier"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1378,8 +1358,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Postnummer:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Adress"
 
@@ -1387,15 +1367,15 @@ msgstr "Adress"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835
+#: ../widgets/table/e-cell-text.c:1777
 #: ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313
 #: ../widgets/text/e-text.c:3607
@@ -2375,7 +2355,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Namn"
@@ -2386,7 +2366,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2396,7 +2376,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2406,7 +2386,6 @@ msgstr "Tjänst"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../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
 msgid "Location"
@@ -2427,17 +2406,17 @@ msgid "Other"
 msgstr "Annat"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2466,20 +2445,20 @@ msgid "Changed"
 msgstr "Ändrad"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigerare - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2790
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 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:2791
-msgid "_No image"
-msgstr "_Ingen bild"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "Ingen bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2487,31 +2466,31 @@ msgstr ""
 "Data för kontakten är ogiltiga:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3119
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" är tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3145
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Ogiltig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "_Redigera fullständigt namn"
 
@@ -2519,11 +2498,11 @@ msgstr "_Redigera fullständigt namn"
 msgid "_Full name"
 msgstr "_Fullständigt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Välj adressbok"
 
@@ -2531,7 +2510,7 @@ msgstr "_Välj adressbok"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Är du säker på att du vill\n"
 "ta bort kontaktlistan (%s)?"
@@ -2548,7 +2527,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Är du säker på att du vill\n"
 "ta bort kontakten (%s)?"
@@ -2659,7 +2638,6 @@ msgid "_IM Service:"
 msgstr "_Snabbmeddelandetjänst:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2675,7 +2653,7 @@ msgid "Add an email to the List"
 msgstr "Lägg till e-post till listan"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigerare"
 
@@ -2707,24 +2685,24 @@ msgstr "_Markera"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ange en e-postadress eller dra en kontakt till listan nedan:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Bok"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Är ny lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Medlemmar"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Medlemmar i kontaktlista"
 
@@ -2765,18 +2743,25 @@ msgstr ""
 "Denna kontakts namn eller e-postadress finns redan i den\n"
 "här mappen. Vill du lägga till den ändå?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 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:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Kategori är"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-postadress börjar med"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Namn börjar med"
@@ -2794,9 +2779,9 @@ msgstr[1] "%d kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Fråga"
 
@@ -2820,11 +2805,11 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Källkod"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
@@ -2833,100 +2818,99 @@ msgstr "Källkod"
 msgid "Type"
 msgstr "Typ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Spara som VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698
-#: ../calendar/gui/e-memo-table.c:844
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595
+#: ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Ny kontakt_lista..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Spara som VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Vidarebefordra kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Vidarebefordra kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Skicka _meddelande till kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Skicka _meddelande till lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Skicka _meddelande till kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "Ko_piera till adressbok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "Fly_tta till adressbok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4
 #: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705
-#: ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3158
-#: ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112
-#: ../mail/message-list.c:1899
+#: ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724
 #: ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "Klistra _in"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Alla kategorier"
 
@@ -2964,7 +2948,7 @@ msgid "Car Phone"
 msgstr "Biltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -2976,7 +2960,7 @@ msgid "Company Phone"
 msgstr "Företagets telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-post"
@@ -3026,7 +3010,7 @@ msgid "Manager"
 msgstr "Manager"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -3035,7 +3019,7 @@ msgid "Nickname"
 msgstr "Smeknamn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Notering"
 
@@ -3044,7 +3028,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisation"
 
@@ -3171,7 +3155,7 @@ msgstr "Maximal fältnamnslängd"
 msgid "Column Width"
 msgstr "Kolumnbredd"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3185,7 +3169,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:175
 msgid ""
 "\n"
 "\n"
@@ -3199,7 +3183,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:180
 msgid ""
 "\n"
 "\n"
@@ -3209,7 +3193,7 @@ msgstr ""
 "\n"
 "Sök efter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3219,7 +3203,7 @@ 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:499
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -3231,93 +3215,71 @@ msgstr "Markerad"
 msgid "Has Cursor"
 msgstr "Har markör"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163
-#: ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Öppna länk i webbläsare"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "_Kopiera länkplats"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Skicka nytt meddelande till ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Kopiera _e-postadress"
-
 # Osäker
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(karta)"
 
 # Osäker
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "karta"
 
 # Osäker
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Listmedlemmar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-post"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Videochatt"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Videokonferens"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "jobb"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Hemsida"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
 msgstr "Webblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "personligt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Jobbtitel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Hemsida"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Webblogg"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3348,7 +3310,7 @@ msgstr "Ingen självkontakt definierad"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
@@ -3373,8 +3335,8 @@ msgstr "Protokollet stöds inte"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463
-#: ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462
+#: ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Avbruten"
 
@@ -3482,7 +3444,7 @@ msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Fel vid tillägg av kontakt"
 
@@ -3499,7 +3461,7 @@ msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Fel vid borttagning av kontakt"
 
@@ -3518,7 +3480,7 @@ 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:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3527,69 +3489,69 @@ msgstr ""
 "%s finns redan\n"
 "Vill du skriva över den?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 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:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Välj adressbok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Flytta kontakt till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Kopiera kontakt till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Flytta kontakter till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Kopiera kontakter till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Kontaktinformation"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformation för %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Frågar adressboken..."
 
@@ -3680,12 +3642,12 @@ msgstr "Evolutions VCard-importör"
 msgid "Print envelope"
 msgstr "Skriv ut kuvert"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
@@ -3734,7 +3696,7 @@ msgstr "Format"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Rubrik"
@@ -3838,7 +3800,7 @@ msgstr "Skuggning"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4037,17 +3999,14 @@ 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:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Är du säker på att du vill ta bort denna dagbokspost?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 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:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Är du säker på att du vill ta bort denna uppgift?"
 
@@ -4288,8 +4247,8 @@ msgstr "Delade flerdagsevenemang:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Kunde inte starta evolution-data-server"
 
@@ -4323,12 +4282,12 @@ 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:2012
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Kalender och uppgifter"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalendrar"
 
@@ -4378,15 +4337,15 @@ msgid "Memos"
 msgstr "Memo"
 
 #: ../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/print.c:1840
+#: ../calendar/gui/e-calendar-table.c:525
+#: ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828
 #: ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/exchange-operations/exchange-folder.c:592
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4406,13 +4365,13 @@ msgstr "_Uppgifter"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutionkalenderns alarmaviseringstjänst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4425,7 +4384,7 @@ 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"
 
@@ -4436,10 +4395,10 @@ msgstr "Möten"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Plats:"
 
@@ -4450,20 +4409,20 @@ msgstr "Slumringsti_d:"
 #: ../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:158
+#: ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51
 #: ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:14
-#: ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../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:40
 msgid "_Edit"
 msgstr "_Redigera"
 
@@ -4475,31 +4434,32 @@ msgstr "_Slumra"
 msgid "location of appointment"
 msgstr "platsen för mötet"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Ingen platsinformation finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarm"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Varning"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4511,7 +4471,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:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4527,7 +4487,7 @@ 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:1388
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
@@ -4628,345 +4588,321 @@ msgid "Default reminder value"
 msgstr "Standardpåminnelsevärde"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Evenemangsgradient"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Genomskinlighet för evenemang"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "URL:er för ledig-/upptagenserver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "URL för ledig-/upptagenmall"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Gradient för evenemang i kalendervyer."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Dölj färdiga uppgifter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Dölj uppgiftsenheter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Dölj uppgiftsvärde"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Horisontell panelposition"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Timme som arbetsdagen slutar, i tjugofyratimmarsformat, 0 till 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Timme som arbetsdagen börjar, i tjugofyratimmarsformat, 0 till 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervall som visas i dags- och arbetsveckovyerna, i minuter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Senaste alarmtid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista med server-url:er för ledig-/upptagenpublicering."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Färg på Marcus Bains-linje - Dagsvy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Färg på Marcus Bains-linje - Tidsrad"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut som arbetsdagen slutar, 0 till 59."
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut som arbetsdagen börjar, 0 till 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Horisontell panelposition för månadsvyn"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Vertikal panelposition för månadsvyn"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Antal enheter för att bestämma en standardpåminnelse."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Antal enheter för avgörande av när uppgifter ska döljas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Färg på uppgifter som skulle ha utförts"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
 msgstr "Position för den horisontella panelen, mellan datumbläddrarkalendern och uppgiftslistan då månadsvyn inte används, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "Position för den horisontella panelen, mellan vyn och datumbläddrarkalendern och uppgiftslistan i månadsvyn, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 msgstr "Position för den vertikala panelen, mellan uppgiftslistan och uppgiftsförhandsgranskningspanelen, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "Position för den vertikala panelen, mellan vyn och datumbläddrarkalendern och uppgiftslistan i månadsvyn, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
 msgstr "Position för den vertikala panelen, mellan vyn och datumbläddrarkalendern och uppgiftslistan i månadsvyn då månadsvyn inte används, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Program som tillåts att köra som en del av alarm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Visa OSA-fältet i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Visa rollfältet i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Visa sluttiderna på möten i vecko- och månadsvyerna"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Visa kategorierfältet i evenemang/sammanträde/uppgiftsredigeraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Visa visningsalarm i notifieringslådan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Visa statusfältet i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Visa panelen \"Förhandsvisning\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Visa panelen \"Förhandsvisning\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Visa tidszonfältet i evenemang/sammanträdesredigeraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Visa typfältet i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Visa veckonummer i datumbläddraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Färg på uppgifter som ska utföras idag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Vertikal panelposition för uppgifter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
 msgstr "URL-mallen att använda som en reserv för ledig-/upptagendata, %u ersätts av användardelen av e-postadressen, och %d ersätts av domänen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "Standardstidszonen att använda för datum och tider i kalendern, som en oöversatt Olsen-tidszonsdatabasplats som till exempel \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Tidsdivisioner"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid som senaste alarmet körde, i time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid "Transparency of the events in calendar views (A value between 0 and 10, opaque by default)."
-msgstr "Genomskinlighet för evenemang i kalendervyer (ett värde mellan 0 och 10, opak som standard)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Tjugofyratimmarstidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enheter för en standardpåminnelse, \"minutes\" (minuter), \"hours\" (timmar) eller \"days\" (dagar)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enheter för avgörande av när uppgifter ska döljas, \"minutes\" (minuter), \"hours\" (timmar) eller \"days\" (dagar)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Veckan börjar"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Veckodag som veckan börjar, från söndag (0) till lördag (6)."
 
 # Osäker
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Huruvida notifieringslådan ska användas för visning av alarm eller inte."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Huruvida det ska frågas efter bekräftelse vid borttagning av ett möte eller en uppgift."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Huruvida det ska frågas efter bekräftelse vid borttagning av möten och uppgifter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
 msgstr "Huruvida veckoslut ska komprimeras i månadsvyn, vilket placerar lördag och söndag i utrymmet för en veckodag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Huruvida sluttiderna på möten i vecko- och månadsvyerna ska visas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Huruvida Marcus Bains-linjen (linjen vid aktuell tid) ska ritas i kalendern."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Huruvida färdigställda uppgifter i uppgiftsvyn ska döljas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Huruvida en standardpåminnare för möten ska ställas in."
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Huruvida OSA-fältet ska visas i evenemang/uppgift/sammanträdesredigeraren."
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Huruvida kategorierfältet ska visas i evenemang/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Huruvida rollfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Huruvida statusfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Huruvida tider ska visas i 24-timmarsformat istället för fm/em."
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Huruvida tidszonfältet ska visas i evenemang/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Huruvida typfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Huruvida veckonummer ska visas i datumbläddraren."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Huruvida sommartid skall användas vid visning av evenemang."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Arbetsdagar"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Timme som arbetsdagen slutar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minut som arbetsdagen slutar"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Timme som arbetsdagen börjar"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minut som arbetsdagen börjar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
-msgid "daylight savings time"
-msgstr "sommartid"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Sammanfattningen innehåller"
@@ -4975,20 +4911,20 @@ msgstr "Sammanfattningen innehåller"
 msgid "Description contains"
 msgstr "Beskrivningen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Platsen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Omatchade"
 
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75
@@ -4999,9 +4935,9 @@ msgstr "Skriv ut"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
@@ -5066,59 +5002,59 @@ msgstr "Misslyckades med att uppgradera kalendrar."
 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:1155
+#: ../calendar/gui/calendar-component.c:1152
 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:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Väljare för kalenderkälla"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Nytt sammanträde"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Sammanträde"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Skapa en ny sammanträdesbegäran"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Nytt heldagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Hel_dagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt heldagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
@@ -5151,11 +5087,11 @@ msgid "Permission denied to open the calendar"
 msgstr "Åtkomst nekas för öppnande av kalendern"
 
 #: ../calendar/gui/comp-editor-factory.c:439
-#: ../shell/e-shell.c:1272
+#: ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "Redigera alarm"
 
@@ -5271,25 +5207,55 @@ msgid "A_dd"
 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/cal-prefs-dialog.glade.h:14
 #: ../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: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
-msgid "_Suggest automatic display of attachment"
-msgstr "_Föreslå automatisk visning av bilaga"
+#: ../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 "Föreslå automatisk visning av bilaga"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../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 "Egenskaper hos bilagan"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Beskrivning:"
+
+#: ../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 "Filnamn:"
+
+#: ../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-typ:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Markerade kalendrar för alarm"
 
@@ -5313,7 +5279,7 @@ msgid "<i>%u and %d will be replaced by user and domain from the email address.<
 msgstr "<i>%u och %d kommer att ersättas med användaren och domänen från e-postadressen.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Varningar</span>"
 
@@ -5322,7 +5288,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Standard ledig-/upptagenserver</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Allmänt</span>"
@@ -5341,31 +5307,27 @@ msgstr "<span weight=\"bold\">Tid</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Arbetsvecka</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Justera för s_ommartid"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Dagen _slutar:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Visning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Ledig/Upptagen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "fredag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5375,13 +5337,13 @@ msgstr ""
 "Timmar\n"
 "Dagar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "måndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5399,193 +5361,187 @@ msgstr ""
 "Lördag\n"
 "Söndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_sön"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "lördag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Välj kalendrar för alarmnotifiering"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "_Visa en påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 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/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "söndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "U_ppgifter som ska utföras idag:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "to_r"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Mall:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Tids_zon:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "onsdag"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "Vec_kan börjar på:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Arbetsdagar:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12-timmars (FM/EM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24-timmars"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Fråga efter bekräftelse vid borttagning av objekt"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "T_ryck ihop helger i månadsvyn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Dagen börjar:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_fre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "_Dölj färdiga uppgifter efter"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_mån"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "Uppgi_fter som skulle ha utförts:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "_lör"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Visa sluttiderna på möten i vecko- och månadsvyerna"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "_Tidsdivisioner:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "t_is"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_ons"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "före varje möte"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Kopie_ra kalenderinnehåll lokalt för frånkopplad åtgärd"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Kopiera kalenderinnehåll lokalt för frånkopplad åtgärd"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Kopie_ra innehåll i uppgiftslista lokalt för frånkopplad åtgärd"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Kopiera innehåll i uppgiftslista lokalt för frånkopplad åtgärd"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Kopie_ra innehåll i memolista lokalt för frånkopplad åtgärd"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Kopiera innehåll i memolista lokalt för frånkopplad åtgärd"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "F_ärg:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Uppgiftslista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Memolista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Egenskaper för kalendern"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Egenskaper för uppgiftslistan"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Ny memolista"
 
@@ -5674,32 +5630,32 @@ msgid "Validation error: %s"
 msgstr "Valideringsfel: %s"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2280
+#: ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " till "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2284
+#: ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Färdigt "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2286
+#: ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Färdigt "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2291
+#: ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Ska utföras "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2293
+#: ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Ska utföras "
 
 #: ../calendar/gui/dialogs/comp-editor.c:207
-#: ../composer/e-msg-composer.c:2894
+#: ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Bifogat meddelande - %s"
@@ -5707,8 +5663,8 @@ msgstr "Bifogat meddelande - %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:2899
-#: ../composer/e-msg-composer.c:3095
+#: ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5716,18 +5672,18 @@ msgstr[0] "Bifogat meddelande"
 msgstr[1] "%d bifogade meddelanden"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446
-#: ../composer/e-msg-composer.c:3159
-#: ../mail/em-folder-tree.c:987
+#: ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008
-#: ../mail/message-list.c:1900
+#: ../mail/em-folder-view.c:973
+#: ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Flytta"
 
 #: ../calendar/gui/dialogs/comp-editor.c:448
-#: ../composer/e-msg-composer.c:3161
-#: ../mail/em-folder-tree.c:989
-#: ../mail/message-list.c:1902
+#: ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982
+#: ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Avbryt _dragning"
 
@@ -5736,7 +5692,7 @@ msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
 #: ../calendar/gui/dialogs/comp-editor.c:945
-#: ../composer/e-msg-composer.c:2504
+#: ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5748,100 +5704,101 @@ msgid "Hide Attachment _Bar"
 msgstr "Dölj _bilageraden"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Visa _bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3659
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3660
-#: ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620
+#: ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Egenskaper"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3662
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Lägg till bilaga..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2262
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Visa bilagor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Tryck på blankstegstangenten för att växla bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sammanträde - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tilldelad uppgift - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555
-#: ../widgets/misc/e-attachment-bar.c:365
+#: ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535
+#: ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "bilaga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Ändringar som görs i detta objekt kan komma att kastas om en uppdatering kommer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Kan inte använda aktuell version!"
 
@@ -5857,10 +5814,6 @@ msgstr "Kunde inte öppna mål"
 msgid "Destination is read only"
 msgstr "Målet är skrivskyddat"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-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
 msgid "The event could not be deleted due to a corba error"
 msgstr "Evenemanget kunde inte tas bort på grund av ett corba-fel"
@@ -5922,116 +5875,130 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_Möte"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Detta evenemang har alarm"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Kale_nder:"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganisatör:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Delta_gare"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Evenemang utan startdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Evenemang utan slutdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Slutdatumet är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Starttiden är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Sluttiden är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Organisatören som valts har inte längre ett konto."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Lägg till "
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan inte öppna kalendern \"%s\"."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, 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:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, 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:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 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:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Anpassa"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
 #: ../calendar/gui/e-itip-control.c:1099
-#: ../composer/e-msg-composer.c:2296
+#: ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889
 #: ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388
@@ -6040,10 +6007,12 @@ msgstr "Anpassa"
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249
-#: ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505
+#: ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "Ingen"
 
@@ -6060,33 +6029,38 @@ msgid "15 minutes before appointment"
 msgstr "15 minuter före möte"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "De_ltagare..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "D_eltagare..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Anpassat alarm:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "B_eskrivning:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Evenemangsbeskrivning"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Plats:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../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:16
 msgid "_Alarm"
 msgstr "_Alarm"
 
@@ -6108,6 +6082,14 @@ msgstr "i"
 msgid "until"
 msgstr "till"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "Dele_gatörer"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Från:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6157,7 +6139,7 @@ msgstr "OSA"
 #: ../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
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -6178,12 +6160,12 @@ msgid "Organizer"
 msgstr "Organisatör"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisatör:"
 
 #: ../calendar/gui/dialogs/memo-editor.c:219
-#: ../calendar/gui/print.c:2321
+#: ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Memo"
 
@@ -6381,7 +6363,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Undantag</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>Förhandsvisning</b>"
 
@@ -6446,19 +6428,19 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462
+#: ../calendar/gui/e-calendar-table.c:461
 #: ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Färdigt"
 
 #: ../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:1029
+#: ../calendar/gui/e-calendar-table.c:386
+#: ../mail/message-list.c:1012
 msgid "High"
 msgstr "Hög"
 
@@ -6467,23 +6449,23 @@ msgstr "Hög"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461
-#: ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460
+#: ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Pågår"
 
 #: ../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:1027
+#: ../calendar/gui/e-calendar-table.c:388
+#: ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Låg"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919
-#: ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918
+#: ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
@@ -6491,8 +6473,8 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460
-#: ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459
+#: ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Inte startad"
 
@@ -6505,7 +6487,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Odefinierad"
 
@@ -6522,12 +6504,12 @@ msgstr "_Prioritet:"
 msgid "_Web Page:"
 msgstr "_Webbsida:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Uppgiftsdetaljer"
 
@@ -6540,10 +6522,6 @@ msgstr "Förfallodatumet är fel"
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna uppgifter i \"%s\"."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "D_eltagare..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Kategor_ier..."
@@ -6687,7 +6665,7 @@ msgstr "%s för en okänd triggertyp"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70
-#: ../mail/em-folder-view.c:2862
+#: ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att öppna %s"
@@ -6708,7 +6686,7 @@ msgstr "Namnlös"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -6726,7 +6704,7 @@ msgstr "Förfallodatum:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Status:"
 
@@ -6734,31 +6712,22 @@ msgstr "Status:"
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../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:3
-msgid "Description:"
-msgstr "Beskrivning:"
-
 #: ../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
+#: ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Publikt"
 
 #: ../calendar/gui/e-cal-list-view.c:256
 #: ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/e-cal-list-view.c:257
 #: ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -6773,19 +6742,19 @@ 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
+#: ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Sammanfattning"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Ledig"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Upptagen"
 
@@ -6800,19 +6769,19 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005
-#: ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005
-#: ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nej"
@@ -6826,23 +6795,23 @@ msgstr "Nej"
 #: ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124
-#: ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222
-#: ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221
+#: ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Tilldelad"
 
@@ -6852,7 +6821,7 @@ msgid "Save As..."
 msgstr "Spara som..."
 
 #: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:2110
+#: ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Välj mapp att spara markerade bilagor i..."
 
@@ -6863,10 +6832,10 @@ msgid "untitled_image.%s"
 msgstr "namnlös_bild.%s"
 
 #: ../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:846
-#: ../mail/em-folder-view.c:1122
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596
+#: ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087
 #: ../mail/em-popup.c:554
 #: ../mail/em-popup.c:565
 msgid "_Save As..."
@@ -6888,84 +6857,79 @@ msgstr "_Spara markerade"
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675
 #: ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803
 #: ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248
-#: ../calendar/gui/e-memo-table.c:741
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138
+#: ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "Ny _uppgift"
-
-#: ../calendar/gui/e-calendar-table.c:1281
-#: ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Öppna _webbsida"
 
-#: ../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:847
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597
+#: ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58
 #: ../ui/evolution-calendar.xml.h:44
@@ -6975,9 +6939,9 @@ msgstr "Öppna _webbsida"
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704
-#: ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1
@@ -6985,10 +6949,10 @@ msgstr "Skriv _ut..."
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: ../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:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603
+#: ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15
@@ -6998,38 +6962,30 @@ msgstr "Klipp _ut"
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: ../calendar/gui/e-calendar-table.c:1293
+#: ../calendar/gui/e-calendar-table.c:1187
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: ../calendar/gui/e-calendar-table.c:1294
-#: ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188
+#: ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_Markera som ej färdig"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Markera markerade uppgifter som ej färdiga"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
@@ -7040,7 +6996,7 @@ msgid "% Complete"
 msgstr "% färdigt"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
-#: ../mail/mail-send-recv.c:636
+#: ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "Färdigt"
 
@@ -7065,105 +7021,109 @@ msgstr "Startdatum"
 msgid "Task sort"
 msgstr "Sortera efter uppgift"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Flyttar objekt"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopierar objekt"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nytt sa_mmanträde"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Ny _uppgift"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Markera i_dag"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Markera datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_era till kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytta till kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegera sammanträde..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ../calendar/gui/e-calendar-view.c:1716
-#: ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613
+#: ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559
 #: ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1619
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 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:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisatör: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisatör: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195
-#: ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053
+#: ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -7193,7 +7153,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutdivisioner"
@@ -7204,25 +7164,24 @@ msgstr "%02i minutdivisioner"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707
+#: ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312
+#: ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745
+#: ../calendar/gui/e-day-view.c:744
 #: ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748
+#: ../calendar/gui/e-day-view.c:747
 #: ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "em"
 
@@ -7346,26 +7305,26 @@ msgstr "<br> Granska följande information, och välj sedan en åtgärd från me
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185
+#: ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Godtaget"
 
 #: ../calendar/gui/e-itip-control.c:1136
 #: ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Preliminärt godtaget"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675
 #: ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Avslaget"
 
@@ -7580,7 +7539,7 @@ msgid "Attendee status updated\n"
 msgstr "Deltagarstatus är uppdaterad\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Deltagarstatusen kan inte uppdateras eftersom objektet inte längre finns"
 
@@ -7630,36 +7589,49 @@ msgstr "Skicka senaste information"
 
 #: ../calendar/gui/e-itip-control.c:2345
 #: ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432
-#: ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423
+#: ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--till--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalendermeddelande"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Läser in kalendern"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Läser in kalendern..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Servermeddelande:"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "slutdatum"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "startdatum"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
@@ -7678,76 +7650,76 @@ msgid "Resources"
 msgstr "Resurser"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99
-#: ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98
+#: ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Person"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100
+#: ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupp"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Resurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Rum"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Mötesordförande"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Preliminärt"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegerat"
 
@@ -7756,15 +7728,15 @@ msgstr "Delegerat"
 msgid "Attendee                          "
 msgstr "Deltagare                         "
 
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -7772,87 +7744,87 @@ msgstr "%A %d %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %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:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:412
 #: ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Ingen information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Del_tagare..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "A_lternativ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Visa ut_zoomade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Allt folk och resurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Allt _folk och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Folk som k_rävs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Ta bort markerade memo"
 
-#: ../calendar/gui/e-memo-table.c:985
+#: ../calendar/gui/e-memo-table.c:993
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klicka för att lägga till ett memo"
@@ -7862,7 +7834,7 @@ msgid "Memo sort"
 msgstr "Sortera memo"
 
 #: ../calendar/gui/e-memos.c:724
-#: ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7882,7 +7854,7 @@ msgid "Opening memos at %s"
 msgstr "Öppnar memo i %s"
 
 #: ../calendar/gui/e-memos.c:1026
-#: ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
@@ -7891,33 +7863,32 @@ msgstr "Tar bort markerade objekt..."
 msgid "Enter the password for %s"
 msgstr "Ange lösenordet för %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Läser in uppgifter"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Tömmer"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541
-#: ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329
+#: ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8071,9 +8042,27 @@ msgstr "iCalendar-information"
 msgid "You must be an attendee of the event."
 msgstr "Du måste delta i evenemanget."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "_Ny memolista"
+#: ../calendar/gui/memos-component.c:451
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopiera"
+
+#: ../calendar/gui/memos-component.c:452
+#: ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Egenskaper..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8113,8 +8102,8 @@ msgid "New memo"
 msgstr "Nytt memo"
 
 #: ../calendar/gui/memos-component.c:1156
-msgid "Mem_o"
-msgstr "Mem_o"
+msgid "_Memo"
+msgstr "_Memo"
 
 #: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
@@ -8125,8 +8114,8 @@ msgid "New memo list"
 msgstr "Ny memolista"
 
 #: ../calendar/gui/memos-component.c:1164
-msgid "Memo li_st"
-msgstr "Memoli_sta"
+msgid "Memo l_ist"
+msgstr "Memol_ista"
 
 #: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
@@ -8174,244 +8163,244 @@ msgstr "Kan inte migrera kalendern \"%s\""
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan inte migrera uppgifterna \"%s\""
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1:a"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2:a"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3:e"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4:e"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5:e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6:e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7:e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8:e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9:e"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10:e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11:e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12:e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13:e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14:e"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15:e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16:e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17:e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18:e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19:e"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20:e"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21:a"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22:a"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23:e"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24:e"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25:e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26:e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27:e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28:e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29:e"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30:e"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31:a"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "Sö"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "Må"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "On"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "Lö"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Markerad dag (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1961
-#: ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948
+#: ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966
-#: ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953
+#: ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Markerad vecka (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Markerad månad (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Markerat år (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Möte"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Uppgift"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammanfattning: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent klar: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/print.c:2601
-#: ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820
+#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799
 #: ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Skriv ut objekt"
 
@@ -8468,14 +8457,14 @@ msgid "New task list"
 msgstr "Ny uppgiftslista"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
-msgstr "Uppgif_tslista"
+msgid "Task l_ist"
+msgstr "Uppgiftsl_ista"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Skapa en ny uppgiftslista"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
@@ -8485,11 +8474,11 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Skriv ut uppgifter"
 
@@ -10084,7 +10073,7 @@ msgid "%.0fG"
 msgstr "%.0f G"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Bilagerad"
 
@@ -10092,46 +10081,31 @@ msgstr "Bilagerad"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241
-#: ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439
-#: ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238
+#: ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441
+#: ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan inte bifoga filen %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249
-#: ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246
+#: ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan inte bifoga filen %s: inte en vanlig fil"
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Egenskaper hos bilagan"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Filnamn:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME-typ:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Postdestination"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Välj mappar att posta meddelandet till."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
@@ -10142,60 +10116,60 @@ msgstr "Klicka här för att ta fram adressboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Svara till:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Från:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Ämne:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Till:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Kopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska få en kopia av meddelandet"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Blindkopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
 msgstr "Ange adresserna till de som ska ta emot en extra kopia av meddelandet utan att visas i mottagarlistan av meddelandet."
 
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Posta till:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Klicka här för att välja mappar att posta till"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Posta till:"
 
@@ -10203,70 +10177,70 @@ msgstr "Posta till:"
 msgid "A_ttach"
 msgstr "_Bifoga"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Infoga bilaga"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Kan inte signera utgående meddelande: Inget signeringscertifikat angivet för detta konto"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 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:1297
-#: ../composer/e-msg-composer.c:2533
+#: ../composer/e-msg-composer.c:1295
+#: ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Dölj _bilageraden"
 
-#: ../composer/e-msg-composer.c:1300
-#: ../composer/e-msg-composer.c:2536
-#: ../composer/e-msg-composer.c:3905
+#: ../composer/e-msg-composer.c:1298
+#: ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Visa _bilageraden"
 
-#: ../composer/e-msg-composer.c:1332
-#: ../composer/e-msg-composer.c:1366
+#: ../composer/e-msg-composer.c:1330
+#: ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Kunde inte öppna fil"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: ../composer/e-msg-composer.c:1691
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Namnlöst meddelande"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1726
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Öppna fil"
 
-#: ../composer/e-msg-composer.c:2176
+#: ../composer/e-msg-composer.c:2151
 #: ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651
 #: ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automatiskt genererad"
 
-#: ../composer/e-msg-composer.c:2279
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-msg-composer.c:2547
-#: ../composer/e-msg-composer.c:3787
-#: ../composer/e-msg-composer.c:3790
+#: ../composer/e-msg-composer.c:2522
+#: ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Skriv ett meddelande"
 
-#: ../composer/e-msg-composer.c:5014
+#: ../composer/e-msg-composer.c:4974
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
 msgstr "<b>(Redigeraren innehåller ett meddelande som inte är text och som inte kan redigeras.)<b>"
 
@@ -10390,7 +10364,7 @@ msgstr "_Spara meddelande"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10458,14 +10432,18 @@ msgid "Yes, Change Status"
 msgstr "Ja, ändra status"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Mottagande av e-post</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Skickande av e-post:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
 "sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
@@ -10473,35 +10451,35 @@ msgstr ""
 "<small>Denna sida låter dig välja om du vill uppmärksammas via ett kvitto över läsning då ett\n"
 "meddelande till dig lästs, och ange vad du vill att Evolution ska göra när någon begär ett kvitto från dig.</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "Skicka alltid tillbaka ett läskvitto"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Fråga mig om jag vill skicka tillbaka ett läskvitto"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Skicka aldrig tillbaka ett läskvitto"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Läskvitton"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Begär ett läskvitto för alla meddelanden som jag skickar"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Såvida inte meddelandet skickas till en sändlista och inte till mig personligen"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid "When you receive an email with a read receipt request, what should Evolution do?"
 msgstr "Vad ska Evolution göra när du får e-post med en begäran av läskvitto?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10509,33 +10487,33 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: ../e-util/e-dialog-utils.c:285
+#: ../e-util/e-dialog-utils.c:283
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: ../e-util/e-error.c:86
-#: ../e-util/e-error.c:87
-#: ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84
+#: ../e-util/e-error.c:85
+#: ../e-util/e-error.c:127
 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:86
+#: ../e-util/e-error.c:87
+#: ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution-varning"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution-information"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution-fråga"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Internt fel, okänt fel \"%s\" begärt"
@@ -10632,29 +10610,28 @@ 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:293
-#: ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Välj en fil"
 
 #: ../filter/filter-label.c:121
 #: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052
+#: ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "viktigt"
 
 #. forest green
 #: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Att-göra"
 
 #. blue
 #: ../filter/filter-label.c:125
-#: ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Senare"
 
@@ -10705,12 +10682,12 @@ msgstr "Inkludera trådar"
 
 #: ../filter/filter-rule.c:986
 #: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Inkommande"
 
 #: ../filter/filter-rule.c:986
-#: ../mail/em-utils.c:329
+#: ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -10809,7 +10786,7 @@ msgid "months"
 msgstr "månader"
 
 #: ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "sekunder"
 
@@ -10878,24 +10855,24 @@ msgid "Evolution Mail preferences control"
 msgstr "Evolutions e-postinställningskontroll"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:523
+#: ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387
 #: ../mail/mail-component.c:578
 #: ../mail/mail-component.c:579
-#: ../mail/mail-component.c:701
+#: ../mail/mail-component.c:664
 #: ../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:532
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "E-postkonton"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-postinställningar"
 
@@ -10922,7 +10899,7 @@ msgstr ""
 
 #: ../mail/em-account-editor.c:482
 #: ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Välj mapp"
 
@@ -10931,12 +10908,12 @@ msgid "Ask for each message"
 msgstr "Fråga för varje meddelande"
 
 #: ../mail/em-account-editor.c:1780
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identitet"
 
 #: ../mail/em-account-editor.c:1829
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
@@ -10945,18 +10922,18 @@ msgid "Automatically check for _new mail every"
 msgstr "Kontrollera automatiskt _ny e-post var"
 
 #: ../mail/em-account-editor.c:2194
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
 #: ../mail/em-account-editor.c:2253
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Standardvärden"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2319
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Säkerhet"
@@ -10972,13 +10949,13 @@ msgstr "Alternativ för mottagning"
 msgid "Checking for New Mail"
 msgstr "Kontroll av ny e-post"
 
-#: ../mail/em-account-editor.c:2799
-#: ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigerare"
 
-#: ../mail/em-account-editor.c:2799
-#: ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795
+#: ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
@@ -11000,24 +10977,24 @@ msgid "[Default]"
 msgstr "[Standard]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519
+#: ../mail/em-account-prefs.c:518
 #: ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Kontonamn"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protokoll"
 
 #: ../mail/em-composer-prefs.c:311
 #: ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Namnlös"
 
@@ -11090,15 +11067,6 @@ msgstr "Ankomstdatum"
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Ta bort"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Borttagen"
@@ -11188,7 +11156,7 @@ msgid "is not Flagged"
 msgstr "är inte flaggad"
 
 #: ../mail/em-filter-i18n.h:35
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Skräp"
@@ -11198,7 +11166,7 @@ msgid "Junk Test"
 msgstr "Skräptest"
 
 #: ../mail/em-filter-i18n.h:37
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
 
@@ -11246,7 +11214,6 @@ msgid "Read"
 msgstr "Läst"
 
 #: ../mail/em-filter-i18n.h:48
-#: ../mail/message-list.etspec.h:11
 msgid "Recipients"
 msgstr "Mottagare"
 
@@ -11275,12 +11242,11 @@ msgid "Run Program"
 msgstr "Kör program"
 
 #: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Poäng"
 
 #: ../mail/em-filter-i18n.h:56
-#: ../mail/message-list.etspec.h:13
 msgid "Sender"
 msgstr "Avsändare"
 
@@ -11313,11 +11279,11 @@ msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
 #: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format-html.c:1659
+#: ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313
 #: ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:90
-#: ../mail/message-list.etspec.h:17
+#: ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11333,42 +11299,10 @@ msgstr "Töm status"
 msgid "<b>Then</b>"
 msgstr "<b>Då</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "S_kapa sökmapp från sökning..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "Alla meddelanden"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "Olästa meddelanden"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "Ingen etikett"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "Lästa meddelanden"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "Senaste meddelanden"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "Meddelanden de senaste 5 dagarna"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "Meddelanden med bilagor"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "Meddelandet är inte skräp"
-
 #. 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
@@ -11403,8 +11337,8 @@ msgstr "Mapp_namn:"
 
 #: ../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/mail-vfolder.c:938
+#: ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Sökmappar"
 
@@ -11422,7 +11356,7 @@ msgstr "Utkast"
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487
 #: ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Inkorg"
 
@@ -11441,86 +11375,86 @@ msgstr "Skickat"
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "E-postmappträd"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flyttar mappen %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierar mappen %s"
 
-#: ../mail/em-folder-tree.c:870
-#: ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:863
+#: ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meddelanden till mappen %s"
 
-#: ../mail/em-folder-tree.c:872
-#: ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:865
+#: ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierar meddelanden till mappen %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 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:984
+#: ../mail/em-folder-tree.c:977
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopiera till mapp"
 
-#: ../mail/em-folder-tree.c:985
+#: ../mail/em-folder-tree.c:978
 #: ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: ../mail/em-folder-tree.c:1690
-#: ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683
+#: ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: ../mail/em-folder-tree.c:2049
+#: ../mail/em-folder-tree.c:2042
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24
-#: ../ui/evolution-mail-global.xml.h:29
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56
 #: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Visa"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Öppna i _nytt fönster"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Flytta..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: ../mail/em-folder-tree.c:2062
+#: ../mail/em-folder-tree.c:2055
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: ../mail/em-folder-tree.c:2067
+#: ../mail/em-folder-tree.c:2060
 #: ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Töm papperskorgen"
@@ -11531,15 +11465,15 @@ msgid "Copying `%s' to `%s'"
 msgstr "Kopierar \"%s\" till \"%s\""
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Välj mapp"
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Kopiera"
 
@@ -11561,309 +11495,298 @@ msgstr "Skapa mapp"
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1081
 #: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: ../mail/em-folder-view.c:1118
+#: ../mail/em-folder-view.c:1083
 #: ../mail/em-popup.c:561
 #: ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1086
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
-msgstr "Markera som ovikt_igt"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr "Markera som ovi_ktigt"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Markera som _skräp"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Markera som _inte skräp"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Markera för _uppföljning..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141
-#: ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Ingen"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Fla_gga färdig"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "T_öm flagga"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Ska_pa regel från meddelande"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Sökmapp på _ämne"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Sökmapp på _avsändare"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Sökmapp på _mottagare"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Sökmapp på sänd_lista"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002
-#: ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Standard"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Kan inte hämta meddelande"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Kopiera länkplats"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Skapa ny _sökmapp"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Från denna adress"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Till denna adress"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att skicka e-post till %s"
 
-#: ../mail/em-folder-view.c:2860
-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:502
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Träffar: %d"
 
-#: ../mail/em-format-html-display.c:645
-msgid "Find:"
-msgstr "Sök:"
-
-#: ../mail/em-format-html-display.c:676
-msgid "M_atch case"
-msgstr "M_atcha versaler/gemener"
-
-#: ../mail/em-format-html-display.c:924
-#: ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Osignerat"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:756
 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:925
-#: ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Giltig signatur"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:757
 msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "Detta meddelande är signerat och giltigt, vilket betyder att det är mycket sannolikt att meddelandet är autentiskt."
 
-#: ../mail/em-format-html-display.c:926
-#: ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758
+#: ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Ogiltig signatur"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:758
 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:927
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Giltig signatur, kan inte verifiera avsändaren"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:759
 msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "Detta meddelande är signerat med en giltig signatur, men meddelandets avsändare kan inte verifieras."
 
-#: ../mail/em-format-html-display.c:933
-#: ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Okrypterat"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:765
 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:934
-#: ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766
+#: ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Krypterat, svagt"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:766
 msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
 msgstr "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:935
-#: ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767
+#: ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Krypterat"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:767
 msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "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:936
-#: ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Krypterat, starkt"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:768
 msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
 msgstr "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:1037
+#: ../mail/em-format-html-display.c:869
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Visa certifikat"
 
-#: ../mail/em-format-html-display.c:1052
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Detta certifikatet är inte visningsbart"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1174
 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:1379
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Skulle ha utförts:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %k.%M"
 
-#: ../mail/em-format-html-display.c:1442
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Visa inuti"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Dölj"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Anpassa till bredden"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Visa _originalstorlek"
 
-#: ../mail/em-format-html-display.c:1864
-#: ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667
+#: ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: ../mail/em-format-html-display.c:2071
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Välj mapp att spara alla bilagor i..."
 
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Spara markerade..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2185
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d bila_ga"
 msgstr[1] "%d bila_gor"
 
-#: ../mail/em-format-html-display.c:2192
-#: ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:1995
+#: ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "Sp_ara"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Spara _alla"
 
-#: ../mail/em-format-html-display.c:2264
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Ingen bilaga"
 
@@ -11878,44 +11801,44 @@ msgstr "Sida %d av %d"
 msgid "Retrieving `%s'"
 msgstr "Hämtar \"%s\""
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Giltig signatur men kan inte verifiera avsändaren"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formaterar meddelande"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844
 #: ../mail/em-mailer-prefs.c:85
@@ -11924,29 +11847,29 @@ msgstr "Formaterar meddelande"
 msgid "From"
 msgstr "Från"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845
 #: ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846
 #: ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Till"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847
 #: ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Kopia"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848
 #: ../mail/em-mailer-prefs.c:89
@@ -11954,23 +11877,23 @@ msgid "Bcc"
 msgstr "Blindkopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663
+#: ../mail/em-format-html.c:1588
 #: ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a %H.%M %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%H.%M %Z)</I>"
 
-#: ../mail/em-format-html.c:1703
+#: ../mail/em-format-html.c:1628
 #: ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850
 #: ../mail/em-mailer-prefs.c:91
@@ -11980,7 +11903,7 @@ msgstr "<I> (%H.%M %Z)</I>"
 msgid "Date"
 msgstr "Datum"
 
-#: ../mail/em-format-html.c:1726
+#: ../mail/em-format-html.c:1651
 #: ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
@@ -12036,7 +11959,7 @@ msgstr "En gång per vecka"
 msgid "Once per month"
 msgstr "En gång per månad"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
@@ -12046,48 +11969,48 @@ msgstr ""
 "\n"
 "Vänta medan Evolution migrerar dina mappar..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan inte skapa nya mappen \"%s\": %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan inte kopiera mappen \"%s\" till \"%s\": %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan inte söka efter befintliga postlådor på \"%s\": %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Kan inte öppna gamla POP-behåll-på-server-data \"%s\": %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Kan inte skapa katalog för POP3-behåll-på-server-data \"%s\": %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kan inte kopiera POP3-behåll-på-server-data \"%s\": %s"
 
-#: ../mail/em-migrate.c:2578
-#: ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577
+#: ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Misslyckades med att skapa lokalt e-postlager \"%s\": %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kan inte skapa lokala postlådemappar på \"%s\": %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr "Kan inte läsa inställningar från tidigare Evolution-installation, \"evolution/config.xmldb\" finns inte eller är skadad."
 
@@ -12102,6 +12025,10 @@ msgstr "_Svara till avsändaren"
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Öppna länk i webbläsare"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Skicka nytt meddelande till..."
@@ -12114,46 +12041,46 @@ msgstr "_Lägg till i adressbok"
 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:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Mapp"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Välj en server."
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Meddelandefilter"
 
-#: ../mail/em-utils.c:516
-#: ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496
+#: ../mail/em-utils.c:533
 msgid "message"
 msgstr "meddelande"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Spara meddelande..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Lägg till adress"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Meddelanden från %s"
@@ -12162,7 +12089,7 @@ msgstr "Meddelanden från %s"
 msgid "Search _Folders"
 msgstr "Sök_mappar"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Sökmappskälla"
 
@@ -12195,457 +12122,401 @@ msgid "Composer Window default width"
 msgstr "Standardbredd för redigerarfönstret"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Minska visning av adresser i Till/Kopia/Blindkopia"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
-msgstr "Minska visning av adresser i Till/Kopia/Blindkopia till det antal som angivits i address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Standardteckentabell som ska användas vid skapande av meddelanden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Standardteckentabell som ska användas vid skapande av meddelanden."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Standardteckentabell som ska användas vid visning av meddelanden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Standardteckentabell som ska användas vid visning av meddelanden."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Standardstil för vidarebefordran"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Standardhöjd för redigerarfönstret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Standardhöjd för meddelandefönstret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Standardhöjd för prenumerationsdialogfönstret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Standardstil för svar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Standardbredd för fönstret för meddelanderedigering"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Standardbredd för meddelandefönstret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Standardbredd för prenumerationsdialogfönstret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Rita stavfelsindikatorer på ord efterhand som du skriver."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Töm papperskorgsmappar vid avslut"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Töm alla papperskorgsmappar vid avslutande av Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Aktivera markörläge, så att du ser en markör när du läser e-post."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Aktivera eller inaktivera sökfunktion för förhandsinmatning"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid "Enable side bar search feature so that you can start interactive searching by typing in the text. Use is that you can easily find a folder in that side bar by just typing the folder name and the selection jumps automatically to that folder."
-msgstr "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.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Aktivera/inaktivera markörläge"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Höjd för meddelandelistpanelen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Höjd för meddelandelistpanelen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr "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.in.h:32
-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.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
 msgstr "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.in.h:34
-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.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Senaste tid då tömning av papperskorgen kördes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Lista med etiketter och deras associerade färger"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Lista med godtagna licenser"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lista med konton"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "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.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista med anpassade huvuden och huruvida de är aktiverade."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
 msgstr "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.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 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.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista med protokollnamn vars licens har accepterats."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Läs in bilder för HTML-meddelanden över http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
 msgstr "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.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Logga filteråtgärder"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Logga filteråtgärder i den angivna loggfilen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Loggfil att logga filteråtgärder i"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Loggfil att logga filteråtgärder i"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Markera som läst efter angiven time-out"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Markera som läst efter angiven time-out."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markera citat i meddelandeförhandsgranskningen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markera citat i meddelandeförhandsgranskningen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Standardhöjd för meddelandefönstret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Standardbredd för meddelandefönstret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil på meddelandevisning (normal, \"full headers\" (fullständiga huvuden), \"source\" (källa))"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 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.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 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.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Ljudfil för avisering om ny post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Typ av avisering om ny post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Antal adresser att visa i Till/Kopia/Blindkopia"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Fråga vid tom ämnesrad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Fråga användaren då han eller hon försöker att tömma en mapp."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Fråga användaren då han eller hon försöker att skicka ett meddelande utan en ämnesrad."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Fråga då användaren tömmer"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Fråga då användaren endast fyller i blindkopia"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Fråga då användaren försöker att öppna tio eller fler meddelanden på samma gång"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Fråga då användaren försöker skicka HTML-brev till mottagare som kanske inte vill ha HTML-brev."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Fråga då användaren försöker skicka ett meddelande utan till- eller kopiemottagare."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Fråga då användaren försöker skicka oönskad HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "Fråga vid markering av flera meddelanden"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 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.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Känn igen smilisar i text och ersätt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Kör skräptest på inkommande e-post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Skicka HTML-brev som standard"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Skicka HTML-brev som standard."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Visa animationer"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Visa animerade bilder som animationer."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 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.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Visa borttagna meddelanden i meddelandelistan"
 
-#: ../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 "Visa avsändarens e-postadress i meddelandets kompositkolumn i meddelandelistan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Visa avsändarens e-postadress i meddelandekolumnen i meddelandelistan"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Ljudfil att spela då ny post anländer."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Anger typen av avisering om ny e-post som användaren vill använda."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Stavningskontrollera inuti"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Standardhöjd på prenumerationsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Standardbredd på prenumerationsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminaltypsnitt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 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.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Terminaltypsnittet för e-postvisning"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 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.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr "Denna nyckel bör innehålla en lista med XML-strukturer som anger anpassade huvuden, och huruvida de ska visas. Formatet på XML-strukturen är &lt;huvud enabled&gt; - ställ detta till \"enabled\" om huvudet ska visas i e-postvyn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
-msgstr "Detta ställer in antalet adresser som skall visas i standardmeddelandelistan, utanför gränsen visas en \"...\"."
-
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Tråda meddelandelistan."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Tråda meddelandelistan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Tråda meddelandelistan baserat på ämnet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Time-out för markering av meddelande som läst"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Time-out för markering av meddelande som läst."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID-sträng för standardkontot."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Använd Spamassassin-demonen och klient"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Använd Spamassassin-demonen och klient (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Använd anpassade typsnitt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Använd anpassade typsnitt för visning av e-post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Använd endast lokala spamtest."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Använd endast de lokala spamtesten (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "Använd sida-vid-sida eller bred layout"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Typsnitt med variabelt breddsteg"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Menyposten Visa/Blindkopia är ikryssad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Menyposten Visa/Blindkopia är ikryssad."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Menyposten Visa/Kopia är ikryssad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Menyposten Visa/Kopia är ikryssad."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Menyposten Visa/Från är ikryssad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Menyposten Visa/Från är ikryssad."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Menyposten Visa/Posta till är ikryssad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Menyposten Visa/Posta till är ikryssad."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Menyposten Visa/Svara till är ikryssad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Menyposten Visa/Svara till är ikryssad."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr "Huruvida Evolution ska falla tillbaka på att tråda efter ämne då meddelandena inte innehåller \"In-Reply-To\"- eller \"References\"-headers."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Bredd på meddelandelistpanelen"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Bredd på meddelandelistpanelen."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Importerar Elm-data"
@@ -12678,15 +12549,15 @@ msgstr "Importera mappar i Berkeley-brevlådeformat"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
 #: ../mail/importers/mail-importer.c:233
-#: ../shell/e-shell-importer.c:529
+#: ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerar \"%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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Var vänlig vänta"
 
@@ -12867,31 +12738,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d oläst"
 msgstr[1] ", %d olästa"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "Ny e-postmapp"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "E-post_mapp"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "Skapa en ny e-postmapp"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Misslyckades med att uppgradera e-postinställningar eller e-postmappar."
 
@@ -12920,219 +12791,226 @@ msgid "_Later"
 msgstr "Se_nare"
 
 #: ../mail/mail-config.glade.h:1
+#: ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 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:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Sig_naturer</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Språk</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Detta kommer att göra filtret mer pålitligt, men långsammare</small>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Kontoinformation</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentiseringstyp</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentisering</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Redigerar meddelanden</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfiguration</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Standardbeteende</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Ta bort e-post</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Visade e-post_huvuden</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filteralternativ</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiketter och färger</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Inläsning av bilder</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Meddelandevisning</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Meddelandetypsnitt</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Meddelandekvitton</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Avisering om ny e-post</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Valfri information</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Alternativ</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Utskrivna typsnitt</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Obligatorisk information</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Säker MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Säkerhet</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Skickade meddelanden och utkast</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serverkonfiguration</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontohantering"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Lägg till n_y signatur..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Lägg till _skript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Signera all_tid utgående meddelanden när detta konto används"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Kryptera alltid till mig sj_älv när krypterad post skickas"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Skicka allti_d kopia (Cc) till:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Skicka alltid _blindkopia (Bcc) till:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Lita alltid på nycklar i min nyckelring vid kryptering"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Kryptera alltid till _mig själv när krypterad post skickas"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Bifoga originalmeddelandet"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "_Infoga automatiskt smilisbilder"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip då ny post anländer"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Te_ckenkodning:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Kontrollera vilka typer som stöds "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "Kontrollera om _inkommande e-post innehåller skräp"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Kontrollera stavning medan jag skri_ver"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Kontrollerar om inkommande e-postmeddelanden är skräp"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "T_öm"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Tö_m"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Färg för _felstavade ord:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Färger"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "Bekräfta _vid tömning av en mapp"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13147,132 +13025,132 @@ msgstr ""
 "\n"
 "Klicka på \"Verkställ\" för att spara dina inställningar."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Standard"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Standardtecken_kodning:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Signera utgående meddelanden digitalt (som standard)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Citera inte originalmeddelandet"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Klar"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Utkast_mapp:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "A_ktivera"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-postkonton"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-post_adress:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Töm papperskorgsmappar vid a_vslut"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Krypteringscertifikat:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Kryptera ut_gående meddelanden (som standard)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Typsnitt med fast _breddsteg:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fast _breddsteg:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Typsnittsegenskaper"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formatera meddelanden med _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "_Fullständigt namn:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML-brev"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Rubriker"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "_Inkludera fjärrtester"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Inuti"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "E-posthuvudtabell"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Meddelanderedigerare"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Note: you will not be prompted for a password until you connect for the first time"
 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:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nyckelid:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Spela ljudfil då ny post a_nländer"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13280,127 +13158,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:109
+#: ../mail/mail-config.glade.h:110
 msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 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:110
+#: ../mail/mail-config.glade.h:111
 msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this 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:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Välj mellan följande alternativ"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Fr_åga då meddelanden skickas med endast blindkopiemottagare angivna"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citera originalmeddelande"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citerad"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Ko_m ihåg lösenord"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Sva_ra till:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "Kom ihåg _lösenord"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "_Välj..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "_Standardtypsnitt:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "V_älj..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "Välj HTML-typsnitt med fast breddsteg för utsnitt"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "Välj ljudfil"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "Skicka meddelandekvitton:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Skickande av post"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Certifikat för sig_nering:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Tabell med signaturer"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Ange _filnamn:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "T_yp:"
 
-#: ../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 "Listan med språk här återspeglar endast de språk för vilka en ordbok är installerad."
 
-#: ../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"
@@ -13410,7 +13288,7 @@ msgstr ""
 "din signatur. Namnet du anger kommer att endast\n"
 "användas för visning."
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13418,16 +13296,16 @@ 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:148
+#: ../mail/mail-config.glade.h:149
 #: ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "V_ariabelt breddsteg:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13437,71 +13315,67 @@ msgstr ""
 "\n"
 "Klicka på \"Framåt\" för att börja. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "Läs _alltid in bilder från Internet"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notifiera inte mig när ny post anländer"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 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:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Läs in bilder i brev från kontakter"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "Läs al_drig in bilder från Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "_Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Fråga då meddelanden skickas med en _tom ämnesrad"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skript:"
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "_Visa bildanimeringar"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Minska huvuden för Till / Kopia / Blindkopia till "
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Använd säker anslutning:"
@@ -13511,21 +13385,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "adresser"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "färg"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "beskrivning"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Källor för sökmappar</b>"
@@ -13539,65 +13405,49 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Kryptering</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Alla aktiva fjärrmappar"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Alla lokala och aktiva fjärrmappar"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Alla lokala mappar"
-
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "Skiftläges_känslig"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:6
 #: ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Fä_rdigt"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "S_ök:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Sök i meddelande"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 #: ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flagga att följa upp"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Mapprenumerationer"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Licensavtal"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Inga markerade"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Säkerhetsinformation"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "Specifika mappar"
-
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 #: ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
@@ -13606,54 +13456,70 @@ 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:19
 msgid "_Accept License"
 msgstr "_Godtag licens"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 #: ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ska utföras den:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:21
 #: ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagga:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryssa för detta för att godta licensavtalet"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "endast specifika mappar"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "med alla aktiva fjärrmappar"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "med alla lokala och aktiva fjärrmappar"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "med alla lokala mappar"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Filtrerar mapp"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Misslyckades med att tillämpa utgående filter: %s"
 
-#: ../mail/mail-ops.c:578
-#: ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577
+#: ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13662,116 +13528,125 @@ msgstr ""
 "Misslyckades med att lägga till i %s: %s\n"
 "Lägger till i lokala \"Skickat\"-mappen istället."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Misslyckades med att lägga till i lokala \"Skickat\"-mappen: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Misslyckades med att skicka %d av %d meddelanden"
 
-#: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762
+#: ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Avbruten."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Färdig."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tömmer och lagrar kontot \"%s\""
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar kontot \"%s\""
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: ../mail/mail-ops.c:1614
-#: ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613
+#: ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, 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:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Sparar %d meddelande"
 msgstr[1] "Sparar %d meddelanden"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Kan inte spara utdatafilen: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13780,12 +13655,12 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: ../mail/mail-ops.c:2098
 #: ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13794,70 +13669,61 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "Avbryter..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Skicka och ta emot e-post"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "Avbryt _allt"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: ../mail/mail-send-recv.c:434
-#: ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425
+#: ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "Kontrollerar ny e-post"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Ange lösenfras för %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Ange lösenfras"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
@@ -13913,11 +13779,11 @@ 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:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Redigera sökmapp"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Ny sökmapp"
 
@@ -13931,7 +13797,7 @@ msgid ""
 "\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 finns redan vid &quot;{1}&quot;.\n"
 "\n"
 "Du kan välja att ignorera denna mapp, skriva över eller lägga till dess innehåll, eller avsluta."
 
@@ -14266,8 +14132,8 @@ msgid "Signature Already Exists"
 msgstr "Signatur finns redan"
 
 #: ../mail/mail.error.xml.h:89
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Systemmappar krävs för att Evolution ska fungera korrekt och de kan inte flyttas, tas bort eller döpas om."
+msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "Systemmappar krävs för att Ximian Evolution ska fungera korrekt och de kan inte flyttas, tas bort eller döpas om."
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -14407,81 +14273,80 @@ msgstr "_Töm"
 msgid "_Open Messages"
 msgstr "_Öppna meddelanden"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Oläst"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Läst"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Besvarad"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Lägre"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Högre"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Högsta"
 
-#: ../mail/message-list.c:1449
+#: ../mail/message-list.c:1341
 #: ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456
+#: ../mail/message-list.c:1348
 #: ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Idag %l.%M"
 
-#: ../mail/message-list.c:1465
+#: ../mail/message-list.c:1357
 #: ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: ../mail/message-list.c:1477
+#: ../mail/message-list.c:1369
 #: ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1485
+#: ../mail/message-list.c:1377
 #: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1487
+#: ../mail/message-list.c:1379
 #: ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2239
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -14501,15 +14366,15 @@ msgstr "Flaggad"
 msgid "Follow Up Flag"
 msgstr "Uppföljningsflagga"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "Ursprunglig plats"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Mottaget"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Skickade meddelanden"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Storlek"
@@ -14657,10 +14522,6 @@ msgstr "Automatiska kontakter"
 msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Skapa _automatiskt poster i adressboken då e-post besvaras"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "Välj adressbok för automatiska kontakter"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter för snabbmeddelanden"
@@ -14670,10 +14531,6 @@ msgstr "Kontakter för snabbmeddelanden"
 msgid "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "Synkronisera periodiskt kontaktinformation och bilder från Gaims kompislista"
 
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "Välj adressbok för Gaims kompislista"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -14774,6 +14631,10 @@ msgstr "Väderkalendrar"
 msgid "A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard."
 msgstr "En testinsticksmodul som demonstrerar en insticksmodul för popupmenyer som låter dig kopiera saker till urklipp."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopiera _e-postadress"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Kopieringsverktyg"
@@ -14960,15 +14821,13 @@ msgstr "Nytt lösenord:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Ditt nuvarande lösenord har gått ut. Byt ditt lösenord nu."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Ditt lösenord går ut om %d dagar"
 
-#. 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
 msgid "Custom"
 msgstr "Anpassad"
 
@@ -15089,7 +14948,7 @@ msgstr "Mappnamn"
 msgid "Folder Size"
 msgstr "Mappstorlek"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Prenumerera på annan användares mapp"
@@ -15104,14 +14963,14 @@ msgstr "Exchange-mappträd"
 msgid "Unsubscribe Folder..."
 msgstr "Säg upp prenumeration på mapp..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Verkligen säga upp prenumerationen på mappen \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Säg upp prenumerationen på \"%s\""
@@ -15144,59 +15003,59 @@ msgstr "Lägg till användare:"
 msgid "Add User"
 msgstr "Lägg till användare"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>Rättigheter</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "Kan inte ta bort"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "Kan inte redigera"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "Skapa objekt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "Skapa undermappar"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "Ta bort alla objekt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "Ta bort egna objekt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "Redigera alla objekt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "Redigera egna objekt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "Mappkontakt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "Mappägare"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "Mapp synlig"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "Lästa objekt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "Roll: "
 
@@ -15233,22 +15092,18 @@ msgid "Cannot display folders."
 msgstr "Kan inte visa mappar."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Kan inte genomföra åtgärden."
+msgid "Changes to Exchange account configuration will take place after you quit and restart Evolution."
+msgstr "Ändringar i Exchange-kontokonfigurationen kommer att börja gälla efter det att du avslutar och startar om Evolution."
 
 #: ../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 "Ändringar i konfigurationen av Exchange-kontot \"{0}\" kommer att börja gälla efter att du har startat om Evolution."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not authenticate to server."
 msgstr "Kunde inte autentisera till servern."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Kunde inte byta lösenord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15259,55 +15114,55 @@ msgstr ""
 "Kontrollera URL:en, användarnamnet och \n"
 "lösenordet och försök igen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Kunde inte ansluta till Exchange-server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Kunde inte ansluta till servern {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Kunde inte avgöra mapprättigheterna för delegater."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Kunde inte hitta Exchange Web Storage-systemet."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Kunde inte hitta servern {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Kunde inte göra {0} till en delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Kunde inte läsa mapprättigheter"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Kunde inte läsa mapprättigheter."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Kunde inte läsa inte-på-kontoret-tillstånd"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Kunde inte uppdatera mapprättigheter."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 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:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15336,88 +15191,88 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 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:34
 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:35
 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:36
 msgid "Folder offline"
 msgstr "Mapp frånkopplad"
 
-#: ../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:37
+#: ../shell/e-shell.c:1269
 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:38
 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:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 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:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 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:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 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:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 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:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 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:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 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:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Det finns ingen användare {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Lösenordet byttes utan problem."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-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:48
+msgid "Please restart Evolution"
+msgstr "Starta om Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Välj en användare."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 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:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 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:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 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:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 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:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15425,7 +15280,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:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15439,75 +15294,75 @@ msgstr ""
 "\n"
 "Eller så har du kanske bara skrivit ditt lösenord fel."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 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:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 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:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Kan inte redigera delegater."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Okänt fel vid uppslag av {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Okänt fel."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Okänd typ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Åtgärden stöds inte"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "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:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 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:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 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:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 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:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
 msgstr "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:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
 msgstr "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:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
 msgstr "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:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Ditt lösenord har gått ut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 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:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} är redan en delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} är redan i listan"
 
@@ -15704,10 +15559,7 @@ msgstr "Proxyinloggning"
 msgid "%sEnter password for %s (user %s)"
 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:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "_Proxyinloggning..."
 
@@ -15768,12 +15620,12 @@ msgid "Select Calendar"
 msgstr "Välj kalender"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importera"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
@@ -15822,138 +15674,138 @@ msgstr "Kunde inte öppna kalender/att-göra!"
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "Kunde inte öppna Evolutions kalender-/att-göra-lista för att exportera data."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Misslyckades med att läsa in kalendern \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, 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:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hittade mötet i kalendern \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Kunde inte hitta några kalendrar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 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:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 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:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Kunde inte hitta den här dagboksposten i någon dagbok"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Söker efter en existerande version av detta möte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Kan inte tolka objekt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, 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:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Skickade till kalendern \"%s\" som accepterat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Skickade till kalendern \"%s\" som preliminärt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Skickade till kalendern \"%s\" som avslaget"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Skickade till kalendern \"%s\" som avbrutet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisatören har tagit bort delegaten %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Skickade ett avbokningsmeddelande till delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunde inte skicka en avbokningsnotering till delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 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:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan inte uppdatera deltagare. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Deltagarstatusen är uppdaterad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Den bifogade kalendern är inte giltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 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:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Objektet i kalendern är inte giltigt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 msgstr "Meddelandet innehåller en kalender, men kalendern innehåller inga händelser, uppgifter eller ledig-/upptageninformation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Den bifogade kalendern innehåller flera objekt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 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"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Ta bort meddelande efter åtgärd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Konfliktsökning"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Välj de kalendrar som ska genomsökas efter sammanträdeskonflikter"
 
@@ -15961,6 +15813,7 @@ msgstr "Välj de kalendrar som ska genomsökas efter sammanträdeskonflikter"
 #: ../plugins/itip-formatter/itip-view.c:184
 #: ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:241
+#: ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Idag"
 
@@ -16296,26 +16149,26 @@ msgid "_Update"
 msgstr "_Uppdatera"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Starttid:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Sluttid:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Kommentar: "
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Skicka u_ppdateringar till deltagare"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "_Tillämpa på alla instanser"
 
@@ -16329,7 +16182,7 @@ msgstr "Itip-formatör"
 
 # FIXME: The whitespace before the colon ought to be bug reported.
 #: ../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; har delegerat sammanträdet. Vill du lägga till delegaten &quot;{1}&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16408,14 +16261,17 @@ msgid "Convert the selected message to a new task"
 msgstr "Konvertera det markerade meddelandet till en ny uppgift"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "Kontaktliste_ägare"
 
 #: ../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 "Hämta listarki_v"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "Hämta list_användningsinformation"
 
@@ -16433,14 +16289,17 @@ msgid "Provide actions for common mailing list commands (subscribe, unsubscribe,
 msgstr "Tillhandahåll åtgärder för de vanligaste sändlistekommandona (prenumerera, säg upp prenumeration, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Posta meddelande till listan"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Prenumerera på listan"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "_Säg upp prenumeration på listan"
 
@@ -16510,27 +16369,15 @@ msgstr "_Redigera meddelande"
 msgid "_Send message"
 msgstr "_Skicka meddelande"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Kontakta list_ägaren"
-
 #: ../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 "Kontakta ägaren av den sändlista som detta meddelande tillhör"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Hämta list_arkiv"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Hämta listan_vändningsinformation"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Få ett arkiv av den lista som detta meddelande tillhör"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Få information om användningen av den lista som detta meddelande tillhör"
 
@@ -16546,24 +16393,12 @@ msgstr "Prenumerera på sändlistan som detta meddelande tillhör"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Säg upp prenumerationen på sändlistan som detta meddelande tillhör"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Posta meddelande till listan"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Prenumerera på listan"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "Avsluta prenumerationen på listan"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Markera alla som lästa"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "Markera me_ddelanden som lästa"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -16820,16 +16655,16 @@ msgstr "Spara bilagor..."
 msgid "Save all attachments"
 msgstr "Spara alla bilagor"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Välj basnamn för sparande"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME-typ"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11
 #: ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Spara"
@@ -16940,7 +16775,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Välj målfil"
 
@@ -16986,19 +16821,19 @@ msgstr ""
 "\n"
 "Klicka på knappen \"Framåt\" för att fortsätta. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Välj den information som du vill importera:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importerar data."
 
@@ -17084,75 +16919,67 @@ msgid "Skip development warning dialog"
 msgstr "Hoppa över varningsdialogen för utveckling"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#: ../shell/main.c:470
+#: ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Statusraden är synlig"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "Evolutions konfigurationsversion, med överordnad/underordnad/konfigurationsnivå (till exempel \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Standardhöjd för huvudfönstret, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Standardbredd för huvudfönstret, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Standardbredd för sidopanelen, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "Den senast uppgraderade konfigurationsversionen för Evolution, med överordnad/underordnad/konfigurationsnivå (till exempel \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
 msgstr "Stilen på fönsterknapparna. Kan vara \"text\", \"icons\" (ikoner), \"both\" (både och), \"toolbar\" (verktygsrad). Om \"toolbar\" är angivet kommer stilen på knapparna att avgöras utifrån verktygsradsinställningen i GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Verktygsraden är synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Huruvida Evolution kommer att starta i frånkopplat läge istället för anslutet läge."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Huruvida fönstret ska vara maximerat eller inte."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Huruvida sidoraden ska vara synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Huruvida statusraden ska vara synlig."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Huruvida verktygsraden ska vara synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Huruvida varningsdialogen i utvecklingsversioner av Evolution hoppas över."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Huruvida fönsterknapparna ska vara synliga."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Stil på fönsterknappar"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Fönsterknapparna är synliga"
 
@@ -17173,11 +17000,11 @@ msgstr "Klicka OK för att stänga dessa anslutningar och arbeta frånkopplad"
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 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:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
@@ -17187,11 +17014,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:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Välj målet för denna import"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17203,24 +17030,23 @@ 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:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "F_ilnamn:"
 
-#: ../shell/e-shell-importer.c:297
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Fil_typ:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importera data och inställningar från _äldre program"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importera en _ensam fil"
 
@@ -17277,16 +17103,14 @@ msgstr ""
 "Richard Hult\n"
 "Johan Dahlin\n"
 "Andreas Hydén\n"
-"\n"
-"Skicka synpunkter på översättningen till\n"
-"tp-sv@listor.tp-sv.se"
+"Skicka synpunkter på översättningen till tp-sv@listor.tp-sv.se"
 
 #: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
 #: ../shell/e-shell-window-commands.c:819
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
@@ -17311,42 +17135,37 @@ msgstr "Evolution är just nu frånkopplad. Klicka på denna knapp för att arbe
 msgid "Switch to %s"
 msgstr "Växla till %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Okänt systemfel."
 
+#: ../shell/e-shell.c:829
 #: ../shell/e-shell.c:830
-#: ../shell/e-shell.c:831
 #, c-format
 msgid "%ld KB"
 msgstr "%ld kB"
 
-#: ../shell/e-shell.c:1262
+#: ../shell/e-shell.c:1261
 #: ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " Ny "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Nytt test"
@@ -17398,7 +17217,7 @@ msgstr ""
 "importera externa filer till Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17435,7 +17254,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17443,39 +17262,35 @@ msgstr ""
 "Tack\n"
 "Evolution-teamet\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Starta Evolution och aktivera den angivna komponenten"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tvinga fram nedstängning av alla Evolution-komponenter"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvinga fram ommigrering från Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Inaktivera inläsning av alla insticksmoduler."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Den personliga informationshanteraren och e-postklienten Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17871,7 +17686,7 @@ msgid "_Edit CA Trust"
 msgstr "_Redigera pålitlighet för certifikatmyndighet"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "Certifikatet finns redan"
 
@@ -18108,13 +17923,6 @@ msgstr "Ko_piera alla kontakter till..."
 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"
-msgstr "Kopiera"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopiera markerade kontakter till en annan mapp..."
@@ -18225,7 +18033,7 @@ msgstr "Markera allt"
 
 #: ../ui/evolution-addressbook.xml.h:35
 #: ../ui/evolution-composer-entries.xml.h:11
-#: ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Markera _alla"
@@ -18297,7 +18105,7 @@ msgid "_Move Folder Contacts To"
 msgstr "_Flytta mappkontakter till"
 
 #: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Nytt"
 
@@ -18359,7 +18167,6 @@ msgstr "Månad"
 
 #: ../ui/evolution-calendar.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Nästa"
 
@@ -18370,6 +18177,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:201
 msgid "Previous"
 msgstr "Föregående"
 
@@ -18461,12 +18269,12 @@ msgid "Paste from clipboard"
 msgstr "Klistra in från urklipp"
 
 #: ../ui/evolution-composer-entries.xml.h:10
-#: ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Klistra in text från urklipp"
 
 #: ../ui/evolution-composer-entries.xml.h:12
-#: ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Markera all text"
 
@@ -18503,38 +18311,36 @@ msgstr "Klicka här för att visa tillgänglig hjälp"
 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-editor.xml.h:14
 #: ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Bilaga..."
 
-#: ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-editor.xml.h:15
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "S_täng"
 
-#: ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../ui/evolution-editor.xml.h:20
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Hjälp"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Infoga"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Alternativ"
@@ -18645,12 +18451,6 @@ msgstr "Växlar huruvida tid ska visas som upptagen"
 msgid "_Alarms"
 msgstr "_Alarm"
 
-#: ../ui/evolution-event-editor.xml.h:27
-#: ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorier"
-
 #: ../ui/evolution-event-editor.xml.h:28
 #: ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
@@ -18725,73 +18525,53 @@ msgid "F_older"
 msgstr "Ma_pp"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "Meddelande_förhandsgranskning"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Flytta den markerade mappen till en annan mapp"
 
 #. 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 "Ta bort alla borttagna meddelanden från alla mappar permanent"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Sök_mappar"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Visa meddelande_förhandsgranskning"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Visa förhandsgranskning av meddelanden sida vid sida i meddelandelistan"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Visa förhandsgranskningsfönster för meddelanden"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prenumerera eller säg upp prenumeration på mappar på fjärrservrar"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "_Klassisk vy"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Kopiera mapp till..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "_Meddelandefilter"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_Flytta mapp till..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Ny..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Förhandsgranskning"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Prenumerationer"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "_Vertikal vy"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Ändra namnet på denna mapp"
@@ -19349,10 +19129,6 @@ msgid "_Unread"
 msgstr "_Oläst"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Zooma in"
 
@@ -19362,7 +19138,7 @@ msgid "Close this window"
 msgstr "Stäng detta fönster"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Huvudverktygsrad"
 
@@ -19437,6 +19213,11 @@ msgstr "Få en leveransavisering när ditt meddelande läses"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nfoga"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Öppna en fil"
@@ -19766,51 +19547,43 @@ msgstr "Ikoner _och text"
 msgid "Import data from other programs"
 msgstr "Importera data från andra program"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "La_yout"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Nytt _fönster"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_Inställningar"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Skicka / _Ta emot"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Skicka kölagda objekt och hämta nya objekt"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Konfigurera Pilotkonfiguration"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Visa information om Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Visa sido_rad"
+msgid "Side _Bar"
+msgstr "Sido_rad"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Visa _statusrad"
+msgid "Status _Bar"
+msgstr "Status_rad"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Visa _verktygsrad"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Visa information om Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
@@ -19818,72 +19591,76 @@ msgstr "Skicka felrapport"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Växla om vi arbetar frånkopplade."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "_Verktygsrad"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Stil på verktygs_rad"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Visa/Dölj sidoraden"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Visa/Dölj statusraden"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Om"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "S_täng fönster"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "_Glöm lösenord"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Dölj knappar"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Endast _ikoner"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Snabbreferens"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_Avsluta"
 
 # Osäker.
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "_Växlarutseende"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_Synkroniseringsalternativ..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Endast _text"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Fönster"
 
@@ -19920,34 +19697,26 @@ msgid "_Work Week View"
 msgstr "_Arbetsveckovy"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Som skickatmapp för bre_d vy"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Som _skickatmapp"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Efter s_tatus"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Efter a_vsändare"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Efter _ämne"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Efter _uppföljningsflagga"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Efter _bred vy"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Meddelanden"
 
@@ -19963,12 +19732,8 @@ msgstr "Med _förfallodatum"
 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20022,7 +19787,7 @@ msgid "_Edit..."
 msgstr "_Redigera..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20036,11 +19801,11 @@ msgstr "Instans"
 msgid "Save Current View"
 msgstr "Spara aktuell vy"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "S_kapa ny vy"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "_Ersätt befintlig vy"
 
@@ -20087,19 +19852,14 @@ msgstr "Typ av vy"
 msgid "Type of view:"
 msgstr "Typ av vy:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Föreslå automatisk visning av bilaga"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20179,11 +19939,12 @@ msgstr "Minsta bredd"
 
 #: ../widgets/misc/e-canvas-vbox.c:114
 #: ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Mellanrum"
 
 #: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "Nu"
 
@@ -20314,134 +20075,110 @@ msgstr "Kombobox för att välja tid"
 msgid "Time"
 msgstr "Tid"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "N_u"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_Idag"
-
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438
-#: ../widgets/misc/e-dateedit.c:1765
+#: ../widgets/misc/e-dateedit.c:1436
+#: ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441
-#: ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439
+#: ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%H.%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expanderad"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 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:190
 msgid "Text of the expander's label"
 msgstr "Text på expanderarens etikett"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Använd understrykning"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 msgstr "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:206
 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:215
 msgid "Label widget"
 msgstr "Etikettwidget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "En widget att visa istället för den vanliga expanderaretiketten"
 
-#: ../widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:222
 #: ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Expanderarstorlek"
 
-#: ../widgets/misc/e-expander.c:224
+#: ../widgets/misc/e-expander.c:223
 #: ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Storlek på expanderarpilen"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikatormellanrum"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Mellanrum runt expanderarpilen"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "Spara sökning"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Sökningar"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Sökningar"
 
-#: ../widgets/misc/e-filter-bar.h:100
-#: ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "Spara sökning"
+
+#: ../widgets/misc/e-filter-bar.h:92
+#: ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Spara sökning..."
 
-#: ../widgets/misc/e-filter-bar.h:101
-#: ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93
+#: ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Redigera sparade sökningar..."
 
-#: ../widgets/misc/e-filter-bar.h:102
-#: ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94
+#: ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_Avancerad sökning..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Alla konton"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Aktuellt konto"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Aktuell mapp"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Aktuellt meddelande"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Välj bild"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Världskarta"
 
-#: ../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."
 msgstr "Musbaserad interaktiv karta för val av tidszon. Tangentbordsanvändare bör istället välja tidszon ur den nedanstående komboboxen."
 
@@ -20472,23 +20209,38 @@ msgstr "Reflow-modell"
 msgid "Column width"
 msgstr "Kolumnbredd"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "Sök"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Sök"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Sök nu"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595
+#: ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Töm"
 
-#: ../widgets/misc/e-search-bar.c:787
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "Sökningstyp"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: ../widgets/misc/e-search-bar.c:794
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr "Underobjekt-ID"
+
+#: ../widgets/misc/e-search-bar.c:904
 #: ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250
 #: ../widgets/text/e-text.c:3485
@@ -20496,23 +20248,9 @@ msgstr "Objekt-ID"
 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:913
-msgid "Show: "
-msgstr "Visa:"
-
-#. 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:929
-msgid "S_earch: "
-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:940
-msgid " in "
-msgstr " i "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Sök _nu"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20712,23 +20450,23 @@ msgstr "Fokuserad kolumn"
 msgid "Unselected Column"
 msgstr "Omarkerad kolumn"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Genomstryk kolumn"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Understryk kolumn"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Gör kolumn fet"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Färglägg kolumn"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Bakgrundsfärga kolumn"
 
@@ -20743,7 +20481,6 @@ msgstr "_Tillgängliga fält:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Stigande"
 
@@ -20754,7 +20491,6 @@ msgstr "Töm alla"
 
 #: ../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 "Descending"
 msgstr "Fallande"
 
@@ -20854,14 +20590,14 @@ msgstr "_Visa dessa fält i ordningen:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Drag- och släppkod"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Fullständigt huvud"
 
@@ -20992,70 +20728,66 @@ msgstr "Identisk radhöjd"
 msgid "Frozen"
 msgstr "Fryst"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Anpassa aktuell vy"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Sortera stigande"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Sortera fallande"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Osortera"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Gruppera efter detta fält"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Gruppera efter box"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Ta bort denna kolumn"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Lägg till en kolumn..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Justering"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Bästa passning"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Formatera kolumner..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Anpassa aktuell vy..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Sortera efter"
-
-#: ../widgets/table/e-table-header-item.c:1899
+#: ../widgets/table/e-table-header-item.c:1812
 #: ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Typsnittssamling"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Sorteringsinformation"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21279,52 +21011,6 @@ msgstr "IM-sammanhang"
 msgid "Handle Popup"
 msgstr "Handtagspopupfönster"
 
-#~ msgid "Category is"
-#~ msgstr "Kategori är"
-#~ msgid "Cale_ndar:"
-#~ msgstr "Kale_nder:"
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-#~ msgid "date-end"
-#~ msgstr "slutdatum"
-#~ msgid "date-start"
-#~ msgstr "startdatum"
-#~ msgid "_Memo"
-#~ msgstr "_Memo"
-#~ msgid "Task l_ist"
-#~ msgstr "Uppgiftsl_ista"
-#~ msgid "      "
-#~ msgstr "      "
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Markera som ovi_ktigt"
-#~ msgid "Original Location"
-#~ msgstr "Ursprunglig plats"
-#~ msgid "Search"
-#~ msgstr "Sök"
-#~ msgid "Search Type"
-#~ msgstr "Sökningstyp"
-#~ msgid "Subitem ID"
-#~ msgstr "Underobjekt-ID"
-#~ msgid "Find No_w"
-#~ msgstr "Sök n_u"
-#~ msgid "Video Conferencing"
-#~ msgstr "Videokonferens"
-#~ msgid "WWW"
-#~ msgstr "WWW"
-#~ msgid "Locat_ion:"
-#~ msgstr "_Plats:"
-#~ msgid "Dele_gatees"
-#~ msgstr "Dele_gatörer"
-#~ msgid "From:"
-#~ msgstr "Från:"
-#~ msgid "Properties..."
-#~ msgstr "Egenskaper..."
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Kan inte spara utdatafilen: %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"
@@ -21338,8 +21024,6 @@ msgstr "Handtagspopupfönster"
 #~ "innehåller fel och skicka på nytt."
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "Ditt meddelande med ämnet &quot;{0}&quot; levererades inte."
-#~ msgid "_Insert"
-#~ msgstr "_Infoga"
 #~ msgid "Addressbook"
 #~ msgstr "Adressbok"
 #~ msgid ""
@@ -21833,6 +21517,10 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "_Meddelanden"
 
 #, fuzzy
+#~ msgid "Un_read Messages"
+#~ msgstr "Oläst meddelande:"
+
+#, fuzzy
 #~ msgid "_All"
 #~ msgstr "Alla"
 
@@ -22002,6 +21690,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "Filtrera s_kräp"
 #~ msgid "Mark as I_mportant"
 #~ msgstr "Markera som _viktigt"
+#~ msgid "Mark as Unimp_ortant"
+#~ msgstr "Markera som ovikti_gt"
 #~ msgid "S_earch in Message..."
 #~ msgstr "_Sök i meddelande..."
 #~ msgid "S_maller"
@@ -22102,6 +21792,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "_Inställningar..."
 #~ msgid "Quick Reference"
 #~ msgstr "Snabbreferens"
+#~ msgid "As Sent Folder"
+#~ msgstr "Som skickatmapp"
 #~ msgid "By Status"
 #~ msgstr "Efter status"
 #~ msgid "By Sender"
@@ -22293,6 +21985,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "<b>%s</b> har avslagit följande sammanträdesändringar:"
 #~ msgid "Default Free/Busy Server"
 #~ msgstr "Standardserver för ledig-/upptagen"
+#~ msgid "Create vFolder"
+#~ msgstr "Skapa virtuell mapp"
 #~ msgid "From this Address"
 #~ msgstr "Från denna adress"
 #~ msgid "To this Address"
@@ -22373,6 +22067,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "Källor för virtuella mappar"
 #~ msgid "Digital Signature"
 #~ msgstr "Digital signatur"
+#~ msgid "Find:"
+#~ msgstr "Sök:"
 #~ msgid "Empty _trash"
 #~ msgstr "Töm _papperskorgen"
 #~ msgid "_Open message"
@@ -22406,6 +22102,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "veckovy:"
 #~ msgid ")"
 #~ msgstr ")"
+#~ msgid "Position of the vertical pane in main view."
+#~ msgstr "Position för den vertikala panelen i huvudvyn."
 #~ msgid ""
 #~ "The number of characters that must be typed before Evolution will attempt "
 #~ "to autocomplete"
@@ -22483,8 +22181,12 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "Anteckningar:"
 #~ msgid "Office:"
 #~ msgstr "Kontor:"
+#~ msgid "Video Chat:"
+#~ msgstr "Videochatt:"
 #~ msgid "Wants to receive HTML mail"
 #~ msgstr "Vill få HTML-post"
+#~ msgid "Web Log:"
+#~ msgstr "Webblogg:"
 #~ msgid "Zip/Postal Code:"
 #~ msgstr "Postnummer:"
 #~ msgid "Select"
@@ -22551,6 +22253,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "K_ategori:"
 #~ msgid "_Find"
 #~ msgstr "_Sök"
+#~ msgid "_Search:"
+#~ msgstr "_Sök:"
 #~ msgid "Address:"
 #~ msgstr "Adress:"
 #~ msgid "Anniversary:"
@@ -24482,6 +24186,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "Kom ihåg lösenord"
 #~ msgid "Username:"
 #~ msgstr "Användarnamn:"
+#~ msgid "Task list"
+#~ msgstr "Uppgiftslista"
 #~ msgid "Use Secure Connection (SSL):"
 #~ msgstr "Använd säker anslutning (SSL):"
 #~ msgid "_Use Secure Connection (SSL)"
@@ -24652,6 +24358,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "_Företag"
 #~ msgid "_Country"
 #~ msgstr "_Land"
+#~ msgid "Home Page"
+#~ msgstr "Hemsida"
 #~ msgid "_Profession"
 #~ msgstr "_Yrke"
 #~ msgid "Save as VCard"
@@ -25264,6 +24972,8 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "Primär _e-post:"
 #~ msgid "_Business:"
 #~ msgstr "_Företag:"
+#~ msgid "_Categories..."
+#~ msgstr "_Kategorier..."
 #~ msgid "_Home:"
 #~ msgstr "_Hem:"
 #~ msgid "_Manager's name:"
@@ -25432,6 +25142,10 @@ msgstr "Handtagspopupfönster"
 #~ msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 
 #, fuzzy
+#~ msgid "Cannot move folder `%s': illegal operation"
+#~ msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
+
+#, fuzzy
 #~ msgid "%s"
 #~ msgstr "s"
 
diff --git a/po/th.po b/po/th.po
index e1679904fe..6791b3d800 100644
--- a/po/th.po
+++ b/po/th.po
@@ -4,23 +4,22 @@
 # Supranee Thirawatthanasuk <supranee@opentle.org>, 2005.
 # Theppitak Karoonboonyanan <thep@linux.thai.net>, 2005-2006.
 # 
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-29 17:32+0700\n"
-"PO-Revision-Date: 2006-07-29 20:01+0700\n"
+"POT-Creation-Date: 2006-04-08 12:12+0700\n"
+"PO-Revision-Date: 2006-04-08 12:06+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <L10N@opentle.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "สมุดที่อยู่ evolution"
 
@@ -34,12 +33,12 @@ msgstr "ที่อยู่ติดต่อใหม่"
 msgid "New Contact List"
 msgstr "รายชื่อที่อยู่ติดต่อใหม่"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "โฟลเดอร์สมุดที่อยู่ %s มีนามบัตร %d ใบ"
-msgstr[1] "โฟลเดอร์สมุดที่อยู่ %s มีนามบัตร %d ใบ"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "โฟลเดอร์สมุดที่อยู่ปัจจุบันมีนามบัตร %d ใบ"
+msgstr[1] "โฟลเดอร์สมุดที่อยู่ปัจจุบันมีนามบัตร %d ใบ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -58,32 +57,32 @@ msgstr "ที่อยู่ติดต่อ: "
 msgid "evolution minicard"
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr "มีการเตือน"
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "มีการเวียนซ้ำ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "คือการประชุม"
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ปฏิทินเหตุการณ์: สรุปคือ %s"
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "ปฏิทินเหตุการณ์: ไม่มีรายการสรุป"
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr "เหตุการณ์การดูปฏิทิน"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr "ยึดโฟกัส"
 
@@ -112,47 +111,37 @@ msgstr "ไปยังวันที่"
 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:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "มี %d เหตุการณ์"
 msgstr[1] "มี %d เหตุการณ์"
 
-#. 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:151 ../a11y/calendar/ea-week-view.c:153
 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
-msgstr "รายสัปดาห์ทำงาน: %s, %s"
+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:158
 #, c-format
 msgid "Day View: %s. %s"
-msgstr "รายวัน: %s, %s"
+msgstr "รายวัน: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "มุมมองสำหรับหนึ่งสัปดาห์ทำงาน"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "มุมมองปฏิทินสำหรับวันเดียวหรือหลายวัน"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Ey"
 
@@ -163,20 +152,18 @@ msgstr "%A %d %b %Ey"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../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
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Ey"
 
@@ -184,10 +171,10 @@ msgstr "%a %d %b %Ey"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Ey"
 
@@ -197,11 +184,9 @@ msgstr "%d %b %Ey"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:732
-#: ../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
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -227,21 +212,21 @@ msgstr ""
 msgid "Click here, you can find more events."
 msgstr "คุณสามารถดูเหตุการณ์มากกว่านี้ โดยคลิกที่นี่"
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "รายเดือน: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "รายสัปดาห์: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "ปฏิทินสำหรับหนึ่งเดือน"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "ปฏิทินดูภายใน 1 สัปดาห์ หรือมากกว่า"
 
@@ -331,14 +316,6 @@ msgstr "ใช้ค่าปริยาย"
 msgid "Popup Menu"
 msgstr "เมนูแบบผุดขึ้น"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "ซ่อน/แสดงแถบเอกสารแนบ"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "เปิดใช้"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -502,9 +479,9 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ที่อยู่ติดต่อ {0} นี้จะยังไม่สามารถใช้ได้ จนกว่าจะเริ่มการทำงานของ Evolution ใหม่"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "เ_พิ่ม"
@@ -514,7 +491,7 @@ msgid "_Discard"
 msgstr "_ละทิ้ง"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -554,9 +531,9 @@ 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:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "ที่อยู่ติดต่อ"
 
@@ -596,8 +573,8 @@ msgstr "จัดการการตรวจสอบ S/MIME ของคุ�
 #. 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:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -612,13 +589,12 @@ msgstr "ในคอมพิวเตอร์นี้"
 #. 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:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "ส่วนบุคคล"
 
@@ -645,7 +621,7 @@ 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-config.c:1202
 msgid "New Address Book"
 msgstr "สมุดที่อยู่ใหม่"
 
@@ -661,73 +637,72 @@ msgstr "สร้างสมุดที่อยู่ใหม่"
 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:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "ประเ_ภท:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../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/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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ทั่วไป"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "สมุดที่อยู่"
 
-#: ../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/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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "รายละเอียด"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 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:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "คุณสมบัติสมุดที่อยู่"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "กำลังเคลื่อนย้าย..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "กำลังเคลื่อนย้าย `%s':"
@@ -801,35 +776,34 @@ msgstr "ชื่อโฟลเดอร์มี '/' ไม่ได้"
 msgid "A Folder with this name already exists"
 msgstr "มีโฟลเดอร์ชื่อนี้อยู่ก่อนแล้ว"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "สมุดที่อยู่ใ_หม่"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_ลบ"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "บันทึกเป็น VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "คุณ_สมบัติ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "กล่องเลือกแหล่งที่อยู่ติดต่อ"
 
@@ -838,12 +812,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "กำลังเข้าใช้เซิร์ฟเวอร์ LDAP แบบนิรนาม"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "การยืนยันตัวบุคคลล้มเหลว\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "ป้อนรหัสผ่านสำหรับ %s (ผู้ใช้ %s)"
@@ -887,7 +861,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI ของโฟลเดอร์ที่ใช้ล่าสุดในกล่องโต้ตอบเลือกชื่อ"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "ตำแหน่งเส้นกั้นช่องแนวดิ่ง"
 
@@ -916,7 +890,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>การยืนยันตัวบุคคล</b>"
 
@@ -1159,9 +1133,9 @@ msgstr "_วิธีการเข้าระบบ:"
 
 #: ../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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_ชื่อ:"
 
@@ -1174,7 +1148,7 @@ msgid "_Search scope:"
 msgstr "_ขอบเขตการค้นหา:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "เ_ซิร์ฟเวอร์:"
@@ -1194,249 +1168,269 @@ 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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "นาที"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>อีเมล</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>บ้าน</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>การส่งข้อความทันใจ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>งาน</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>เบ็ดเตล็ด</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>อื่นๆ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>โทรศัพท์</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>ที่อยู่เว็บไซต์</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>ที่ทำงาน</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../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-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 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:2417
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "เครื่องมือแก้ไขที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "ชื่อเ_ต็ม..."
 
-#: ../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:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "ชื่อเ_ล่น:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../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/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/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "งาน"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_ที่อยู่:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "วันครบ_รอบ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_ผู้ช่วย:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "วันเ_กิด:"
 
-#: ../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:1707
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_ปฏิทิน:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_หมวด..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_หมวด"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "เ_มือง:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_บริษัท:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_ประเทศ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "แ_ผนก: "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "เ_ก็บด้วยชื่อ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_ว่าง/ไม่ว่าง:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "โ_ฮมเพจ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_ผู้จัดการ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_หมายเหตุ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_สำนักงาน:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_ตู้ไปรษณีย์:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_อาชีพ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_คู่สมรส:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_รัฐ/จังหวัด:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_คำนำหน้าชื่อ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "การสนทนา_ภาพ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_ต้องการรับเมล HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "เว็_บล็อก:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "แ_หล่ง:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_รหัสไปรษณีย์:"
 
 #: ../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/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 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-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../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:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "แก้ไขได้"
 
@@ -2412,7 +2406,7 @@ msgstr "ซิมบับเว"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "ชื่อ"
@@ -2423,7 +2417,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2431,102 +2425,91 @@ msgstr "Jabber"
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-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:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "สถานที่"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "ชื่อผู้ใช้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "บ้าน"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "อื่นๆ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../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:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "สมุดต้นทาง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "สมุดปลายทาง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "เป็นที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "เขตข้อมูลที่เขียนได้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "เขตข้อมูลบังคับ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, 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:2773
 msgid "Please select an image for this contact"
 msgstr "กรุณาเลือกรูปสำหรับที่อยู่ติดต่อนี้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
-msgid "_No image"
-msgstr "ไ_ม่มีรูป"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "ไม่มีรูป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2534,31 +2517,15 @@ msgstr ""
 "ข้อมูลที่อยู่ติดต่อผิดพลาด:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
-#, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' มีรูปแบบที่ไม่ถูกต้อง"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
-#, 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
-#, 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:3110
 msgid "Invalid contact."
 msgstr "ที่อยู่ติดต่อผิดพลาด"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "การเพิ่มที่อยู่ติดต่ออย่างเร็ว"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "แ_ก้ไขเต็มรูปแบบ"
 
@@ -2566,11 +2533,11 @@ msgstr "แ_ก้ไขเต็มรูปแบบ"
 msgid "_Full name"
 msgstr "_ชื่อเต็ม"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "อีเ_มล"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "เ_ลือกสมุดที่อยู่"
 
@@ -2578,7 +2545,7 @@ msgstr "เ_ลือกสมุดที่อยู่"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "คุณแน่ใจหรือไม่ว่า\n"
 "จะลบรายชื่อที่อยู่ติดต่อ (%s)?"
@@ -2595,7 +2562,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "คุณแน่ใจหรือไม่ว่า\n"
 "จะลบที่อยู่ติดต่อ (%s)?"
@@ -2608,108 +2575,107 @@ msgstr ""
 "คุณแน่ใจหรือไม่ว่า\n"
 "ต้องการลบที่อยู่ติดต่อหล่านี้?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "ที่อยู่ _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "เ_มือง:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "ประเ_ทศ:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "ที่อยู่แบบเต็ม"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_รหัสไปรษณีย์:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "ดร."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "ชื่อเต็ม"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "1"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "2"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "3"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "นางสาว"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "นาย"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "นาง"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "น.ส."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_ชื่อ:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_นามสกุล:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "ชื่อ_กลาง:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "คำต่อ_ท้ายชื่อ:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "เพิ่มบัญชี IM"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_ชื่อบัญชี:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_บริการ IM:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "สถาน_ที่:"
 
@@ -2717,61 +2683,61 @@ msgstr "สถาน_ที่:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 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:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "เครื่องมือแก้ไขรายชื่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "แทรกที่อยู่อีเมลจากสมุดที่อยู่"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "สมาชิก"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "ลบที่อยู่อีเมลจากรายชื่อ"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_ซ่อนที่อยู่เมื่อส่งเมลไปที่รายชื่อนี้"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_รายชื่อ:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "เ_ลือก"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_พิมพ์ที่อยู่อีเมล หรือลากที่อยู่ติดต่อมาวางที่รายการด้านล่างนี้:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "สมุด"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "เป็นรายชื่อใหม่"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_สมาชิก"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "สมาชิกรายชื่อผู้ติดต่อ"
 
@@ -2812,18 +2778,25 @@ msgstr ""
 "มีชื่อหรือที่อยู่อีเมลสำหรับที่อยู่ติดต่อนี้ในโฟลเดอร์นี้เรียบร้อยแล้ว\n"
 "คุณยังต้องการจะเพิ่มเข้าไปอีกหรือไม่?"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "ข้อมูลใดๆ มีคำว่า"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "อยู่ในหมวด"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "อีเมลขึ้นต้นด้วย"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "ชื่อขึ้นต้นด้วย"
@@ -2841,9 +2814,9 @@ 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:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "คำค้น"
 
@@ -2857,7 +2830,7 @@ msgstr "เกิดข้อผิดพลาดขณะสร้างช่
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "ข้อมูลโครงสร้าง"
 
@@ -2865,114 +2838,112 @@ msgstr "ข้อมูลโครงสร้าง"
 msgid "Error modifying card"
 msgstr "เกิดข้อผิดพลาดขณะเปลี่ยนแปลงนามบัตร"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "แหล่ง"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "ชนิด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "บันทึกเป็น VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "เ_ปิด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "ที่อยู่ติดต่อใ_หม่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "_รายการที่อยู่ติดต่อใหม่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_บันทึกเป็น VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_ส่งต่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_ส่งต่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "ส่ง_ข้อความไปยังที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "ส่ง_ข้อความไปยังลิสต์"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "ส่ง_ข้อความไปยังที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_พิมพ์"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_คัดลอกไปยังสมุดที่อยู่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "_ย้ายไปยังสมุดที่อยู่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_ตัด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_คัดลอก"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "_แปะ"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "หมวดใดก็ได้"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "พิมพ์นามบัตร"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "ผู้ช่วย"
 
@@ -3001,7 +2972,7 @@ msgid "Car Phone"
 msgstr "โทรศัพท์รถ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3013,7 +2984,7 @@ msgid "Company Phone"
 msgstr "โทรศัพท์บริษัท"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "อีเมล"
@@ -3059,22 +3030,20 @@ msgid "Journal"
 msgstr "บันทึก"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "ผู้จัดการ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "โทรศัพท์มือถือ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "ชื่อเล่น"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "หมายเหตุ"
 
@@ -3083,7 +3052,7 @@ msgid "Office"
 msgstr "ที่ทำงาน"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "องค์กร"
 
@@ -3116,7 +3085,6 @@ msgid "Role"
 msgstr "บทบาท"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "คู่สมรส"
 
@@ -3147,7 +3115,7 @@ msgid "Web Site"
 msgstr "เว็บไซต์"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3158,12 +3126,12 @@ msgstr "เว็บไซต์"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "กว้าง"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3173,12 +3141,12 @@ msgstr "กว้าง"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "สูง"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "มีโฟกัส"
 
@@ -3202,7 +3170,7 @@ msgstr "ความยาวสูงสุดของชื่อเขตข
 msgid "Column Width"
 msgstr "ความกว้างคอลัมน์"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3215,7 +3183,7 @@ msgstr ""
 "ค้นหาที่อยู่ติดต่อ\n"
 "หรือดับเบิลคลิกตรงนี้เพื่อสร้างที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3229,7 +3197,7 @@ msgstr ""
 "\n"
 "ดับเบิลคลิกตรงนี้เพื่อสร้างที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3239,7 +3207,7 @@ msgstr ""
 "\n"
 "ค้นหาที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3249,143 +3217,80 @@ msgstr ""
 "\n"
 "ไม่มีรายการแสดงในนี้"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "ตัวแปลง"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "อีเมลที่ทำงาน"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "อีเมลบ้าน"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "อีเมลอื่นๆ"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "เลือกอยู่"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "มีเคอร์เซอร์"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "เปิดลิงก์ในเ_บราว์เซอร์"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "คัด_ลอกที่อยู่ลิงก์"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "ส่งข้อความใ_หม่ถึง..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "_คัดลอกที่อยู่อีเมล"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(แผนที่)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "แผนที่"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "สมาชิกในรายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "อีเมล"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Department"
-msgstr "แผนก"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-msgid "Profession"
-msgstr "อาชีพ"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "ตำแหน่ง"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-msgid "Video Chat"
-msgstr "การสนทนาภาพ"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "ปฏิทิน"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "ว่าง/ไม่ว่าง"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "การประชุมทางวีดิทัศน์"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "โทรศัพท์"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "โทรสาร"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Home Page"
-msgstr "โฮมเพจ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "ที่ทำงาน"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Web Log"
-msgstr "เว็บล็อก"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "วันเกิด"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "เว็บล็อก"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "วันครบรอบ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "ส่วนบุคคล"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "ตำแหน่งงาน"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "โฮมเพจ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
-msgid "Blog"
-msgstr "เว็บล็อก"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3416,7 +3321,7 @@ msgstr "ไม่ได้กำหนดที่อยู่ติดต่อ
 #. 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "ไม่ได้รับอนุญาต"
 
@@ -3441,7 +3346,7 @@ msgstr "โพรโทคอลไม่สนับสนุน"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "ยกเลิก"
 
@@ -3569,7 +3474,7 @@ 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:695
 msgid "Error adding contact"
 msgstr "เกิดข้อผิดพลาดขณะเพิ่มที่อยู่ติดต่อ"
 
@@ -3586,7 +3491,7 @@ 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:650
 msgid "Error removing contact"
 msgstr "เกิดข้อผิดพลาดขณะลบที่อยู่ติดต่อ"
 
@@ -3605,7 +3510,7 @@ msgstr[1] ""
 "ในการเปิดที่อยู่ติดต่อ %d รายการ จะเปิดในหน้าต่างใหม่ %d หน้าต่าง\n"
 "คุณต้องการให้แสดงที่อยู่ติดต่อทั้งหมดนี้จริงหรือไม่?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3614,69 +3519,69 @@ msgstr ""
 "%s มีอยู่แล้ว\n"
 "คุณต้องการเขียนทับหรือไม่?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ที่อยู่ติดต่อ"
 msgstr[1] "ที่อยู่ติดต่อ"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 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:756
 msgid "Move contact to"
 msgstr "ย้ายที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "คัดลอกที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "ย้ายที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "คัดลอกที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "VCard หลายรายการ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard สำหรับ %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "ข้อมูลที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "ข้อมูลที่อยู่ติดต่อของ %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "กำลังค้นสมุดที่อยู่..."
 
@@ -3766,12 +3671,12 @@ msgstr "เครื่องมือนำเข้า Evolution VCard"
 msgid "Print envelope"
 msgstr "พิมพ์ซองจดหมาย"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "พิมพ์ที่อยู่ติดต่อ"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "พิมพ์ที่อยู่ติดต่อ"
 
@@ -3820,7 +3725,7 @@ msgstr "รูปแบบ"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "หัวกระดาษ"
@@ -3924,9 +3829,9 @@ 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:955
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "ขนาด:"
 
@@ -4138,17 +4043,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบนัดหมายนี้?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบรายการบันทึกนี้?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบการประชุมนี้?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบงานนี้?"
 
@@ -4268,17 +4170,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ปฏิทิน Evolution หยุดทำงานกระทันหัน"
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "บันทึกช่วยจำ Evolution หยุดทำงานกระทันหัน"
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "งาน Evolution หยุดทำงานกระทันหัน"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "ไม่ได้ทำเครื่องหมายที่ปฏิทินเพื่อการใช้งานแบบออฟไลน์"
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "ปฏิทินที่คุณเลือกไว้สามารถอ่านได้เท่านั้น"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "ไม่ได้ทำเครื่องหมายที่รายการบันทึกช่วยจำเพื่อการใช้งานแบบออฟไลน์"
@@ -4345,60 +4247,49 @@ msgstr ""
 "Evolution ทางที่ดีที่สุดคือควรปรับรุ่นเซิร์ฟเวอร์ให้เป็นรุ่นที่สนับสนุน"
 
 #: ../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
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "คุณได้เปลี่ยนแปลงนัดหมายนี้ แต่ยังไม่ได้บันทึก"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr "คุณได้เปลี่ยนแปลงงานนี้ แต่ยังไม่ได้บันทึก"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "คุณได้เปลี่ยนแปลงบันทึีกข้อความนี้ แต่ยังไม่ได้บันทึก"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ปฏิทินของคุณจะใช้งานไม่ได้ จนกว่าจะเริ่มการทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "บันทึกช่วยจำของคุณจะใช้งานไม่ได้ จนกว่าจะเริ่มการทำงานของ Evolution ใหม่"
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ข้อมูลงานของคุณจะใช้งานไม่ได้ จนกว่าจะเริ่มการทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "ไ_ม่สนใจการเปลี่ยนแปลง"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_บันทึก"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "_บันทึกการเปลี่ยนแปลง"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "_ส่ง"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "_ส่งประกาศ"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}"
 
@@ -4415,8 +4306,8 @@ msgstr "แยกเหตุการณ์ที่กินเวลาหล
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "ไม่สามารถเริ่มเซิร์ฟเวอร์ข้อมูล evolution"
 
@@ -4450,12 +4341,12 @@ 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:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "ปฏิทินและงาน"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "ปฏิทิน"
 
@@ -4496,21 +4387,21 @@ msgid "Memo_s"
 msgstr "บันทึก_ช่วยจำ"
 
 #: ../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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "บันทึกช่วยจำ"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "งาน"
@@ -4528,16 +4419,16 @@ msgstr "_งาน"
 msgid "Evolution Calendar alarm notification service"
 msgstr "บริการการประกาศแจ้งเตือนปฏิทิน Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "นาที"
 msgstr[1] "นาที"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4546,7 +4437,7 @@ msgid_plural "hours"
 msgstr[0] "ชั่วโมง"
 msgstr[1] "ชั่วโมง"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "เวลาเริ่ม"
 
@@ -4557,10 +4448,10 @@ msgstr "นัดหมาย"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "สถานที่:"
 
@@ -4570,16 +4461,16 @@ msgstr "ช่วงเ_วลาผัดผ่อน:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "แ_ก้ไข"
 
@@ -4591,31 +4482,32 @@ msgstr "_ผัดผ่อน"
 msgid "location of appointment"
 msgstr "สถานที่นัดหมาย"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "ไม่มีสรุป"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "ไม่มีคำอธิบายรายละเอียดอยู่"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "ไม่มีข้อมูลสถานที่"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "คุณมีการเตือน %d รายการ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4625,7 +4517,7 @@ msgstr ""
 "Evolution ยังไม่สนับสนุนการเตือนความจำปฏิทินด้วยการแจ้งเตือนอีเมล\n"
 "แต่การเตือนความจำนี้ได้กำหนดค่าให้ส่งอีเมล Evolution จะแสดงกล่องข้อความเตือนความจำปกติแทน"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4642,7 +4534,7 @@ msgstr ""
 "\n"
 "คุณแน่ใจหรือไม่ ที่จะเรียกโปรแกรมนี้?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "ไม่ต้องถามเกี่ยวกับโปรแกรมนี้อีกครั้ง"
 
@@ -4741,102 +4633,90 @@ msgid "Default reminder value"
 msgstr "ค่าเตือนความจำปริยาย"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "การไล่ระดับสีในช่องเหตุการณ์"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "ความโปร่งใสของช่องแสดงเหตุการณ์"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "รายชื่อ URL ของเซิร์ฟเวอร์สถานะว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "แบบร่าง URL สถานะว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "การไล่ระดับสีของช่องแสดงเหตุการณ์ในมุมมองปฏิทิน"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "ซ่อนงานที่เสร็จแล้ว"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "ซ่อนหน่วยของงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "ซ่อนค่าของงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "ตำแหน่งของเส้นกั้นช่องแนวนอน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "ชั่วโมงสิ้นสุดวันทำงานในรูปแบบ 24 ชั่วโมง 0 to 23"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ชั่วโมงการเริ่มต้นวันทำงานในรูปแบบ 24 ชั่วโมง 0 to 23"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ช่วงในวันและสัปดาห์ทำงานแสดงเป็นแบบนาที"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "เวลาเตือนล่าสุด"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "รายชื่อของ URL ของเซิร์ฟเวอร์ประกาศสถานะว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "เส้น Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "สีของเส้น Marcus Bains - มุมมองวัน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "สีของเส้น Marcus Bains - แถบเวลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "นาทีที่วันทำงานสิ้นสุด, 0 ถึง 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "นาทีที่วันทำงานเริ่มต้น, 0 ถึง 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "ตำแหน่งของเส้นกั้นช่องแนวนอน ในมุมมองเดือน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "ตำแหน่งเส้นกั้นช่องแนวดิ่ง ในมุมมองเดือน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "จำนวนของหน่วยสำหรับกำหนดการเตือนความจำโดยปริยาย"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "จำนวนของหน่วยสำหรับการกำหนดเมื่อต้องการซ่อนงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "สีของงานที่เลยกำหนด"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4844,7 +4724,7 @@ msgstr ""
 "ตำแหน่งของเส้นกั้นช่องแนวนอน ระหว่างปฏิทินเลือกวันที่กับรายการงาน เมื่อไม่ได้อยู่ในมุมมองรายเดือน "
 "ในหน่วยพิกเซล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4852,20 +4732,13 @@ msgstr ""
 "ตำแหน่งของเส้นกั้นช่องแนวนอน ระหว่างช่องแสดงข้อมูลกับปฏิทินเลือกวันที่ เมื่ออยู่ในมุมมองรายเดือน "
 "ในหน่วยพิกเซล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-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.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "ตำแหน่งของเส้นกั้นช่องแนวดิ่ง ระหว่างช่องรายการงานกับช่องแสดงตัวอย่าง ในหน่วยพิกเซล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4873,7 +4746,7 @@ msgstr ""
 "ตำแหน่งของเส้นกั้นช่องแนวดิ่ง ระหว่างช่องแสดงข้อมูลกับช่องปฏิทินเลือกวันที่ เมื่ออยู่ในมุมมองรายเดือน "
 "ในหน่วยพิกเซล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4881,65 +4754,65 @@ msgstr ""
 "ตำแหน่งของเส้นกั้นช่องแนวดิ่ง ระหว่างช่องแสดงข้อมูลกับช่องปฏิทินเลือกวันที่และรายการงาน "
 "เมื่ออยู่ในมุมมองรายเดือน ในหน่วยพิกเซล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "โปรแกรมที่อนุญาตให้เรียกในการเตือนต่างๆ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "แสดงช่องข้อมูล RSVP ในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "แสดงช่องข้อมูลบทบาทในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "แสดงเวลาสิ้นสุดนัดหมายในมุมมองสัปดาห์และเดือน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "แสดงช่องข้อมูลหมวดหมู่้ในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "แสดงช่องข้อมูลสถานะในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "แสดงช่อง \"แสดงตัวอย่าง\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "แสดงช่อง \"แสดงตัวอย่าง\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "แสดงช่องข้อมูลเขตเวลาในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "แสดงช่องข้อมูลชนิดในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "แสดงสัปดาห์ที่ในปฏิทินเลือกวันที่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "สีของงานที่ถึงกำหนดวันนี้"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "ตำแหน่งเส้นกั้นช่องแนวดิ่ง ในมุมมองงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4948,7 +4821,7 @@ msgstr ""
 "แบบร่าง URL ที่จะใช้เป็นข้อมูลสำรองสำหรับสถานะว่าง/ไม่ว่าง ใช้ %u แทนส่วนผู้ใช้ในที่อยู่เมล และ %"
 "d แทนโดเมน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4956,143 +4829,128 @@ msgstr ""
 "เขตเวลาปริยายที่จะใช้ในวันและเวลาในปฏิทิน โดยกำหนดเป็นตำแหน่งฐานข้อมูลเขตเวลา Oslen "
 "ที่ยังไม่แปลเป็นภาษาท้องถิ่น เช่น \"Asia/Bangkok\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "การจำแนกเวลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "เวลาที่การเตือนครั้งก่อนทำงาน เป็นชนิด time_t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "เขตเวลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-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.in.h:60
 msgid "Twenty four hour time format"
 msgstr "รูปแบบเวลา 24 ชั่วโมง"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "หน่วยสำหรับการเตือนความจำโดยปริยาย \"นาที\", \"ชั่วโมง\" หรือ \"วัน\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "หน่วยของการกำหนดเมื่อจะซ่อนงาน \"นาที\", \"ชั่วโมง\" หรือ \"วัน\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "เริ่มต้นสัปดาห์"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "วันในสัปดาห์เริ่มต้นสัปดาห์จากวันอาทิตย์ (0) ถึงวันเสาร์ (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "กำหนดว่าจะถามยืนยันก่อนลบนัดหมายหรืองานหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "กำหนดว่าจะถามยืนยันเมื่อจะเก็บกวาดนัดหมายและงานที่สั่งลบหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 "กำหนดว่าจะกระชับวันสุดสัปดาห์เมื่อดูข้อมูลรายเดือนหรือไม่ ซึ่งจะแสดงวันเสาร์และวันอาทิตย์ในช่องเดียว"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "กำหนดว่าจะแสดงเวลาสิ้นสุดของเหตุการณ์ในมุมมองสัปดาห์และเดือนหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "กำหนดว่าจะวาดเส้น Marcus Bains (เส้นที่ตำแหน่งเวลาปัจจุบัน) ในปฏิทินหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "กำหนดว่าจะซ่อนงานที่เสร็จแล้วในมุมมองงานหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "กำหนดว่าจะตั้งค่าเตือนความจำปริยายสำหรับนัดหมายหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "กำหนดว่าแสดงช่องข้อมูล RSVP ในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุมหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "กำหนดว่าแสดงช่องข้อมูลหมวดหมู่ในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุมหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "กำหนดว่าแสดงช่องข้อมูลบทบาทในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุมหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "กำหนดว่าแสดงช่องข้อมูลสถานะในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุมหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "กำหนดว่าจะใช้การแสดงเวลาในรูปแบบ 24 ชั่วโมงแทนการใช้ am/pm หรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "กำหนดว่าแสดงช่องข้อมูลเขตเวลาในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุมหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "กำหนดว่าแสดงช่องข้อมูลชนิดในเครื่องมือแก้ไขเหตุการณ์/งาน/การประชุมหรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "กำหนดว่าจะแสดงสัปดาห์ที่ในปฏิทินเลือกวันที่หรือไม่"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "วันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "ชั่วโมงสิ้นสุดวันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "นาทีสิ้นสุดวันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "ชั่วโมงเริ่มต้นวันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "นาทีเริ่มต้นวันทำงาน"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "ปรับเวลาหน้าร้อน"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "สรุปมีคำว่า"
@@ -5101,25 +4959,39 @@ msgstr "สรุปมีคำว่า"
 msgid "Description contains"
 msgstr "คำอธิบายมีคำว่า"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "มีความคิดเห็น"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "สถานที่มีคำว่า"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "ไม่ตรงกัน"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "พิมพ์"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:579
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "ปฏิทิน"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5135,10 +5007,10 @@ msgstr "ลบเหตุการณ์ที่เก่ากว่า"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "วัน"
 
@@ -5146,89 +5018,89 @@ msgstr "วัน"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "ในเว็บ"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "วันเกิด & วันครบรอบปี"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "รายงานอากาศ"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "ปฏิทินใ_หม่"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "การปรับปรุงรุ่นปฏิทินล้มเหลว"
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ไม่สามารถเปิดปฏิทิน '%s' เพื่อการสร้างเหตุการณ์และการประชุม"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ไม่มีปฏิทินที่จะใช้ได้สำหรับการสร้างเหตุการณ์และการประชุม"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "ช่องเลือกแหล่งปฏิทิน"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "นัดหมายใหม่"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_นัดหมาย"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "สร้างนัดหมายใหม่"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "การประชุมใหม่"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "การ_ประชุม"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "สร้างการขอการประชุมใหม่"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "นัดหมายตลอดทั้งวันใหม่"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "นัดหมาย_ตลอดทั้งวัน"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "สร้างการประชุมตลอดทั้งวันใหม่"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "ปฏิทินใหม่"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_ปฏิทิน"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "สร้างปฏิทินใหม่"
 
@@ -5260,11 +5132,11 @@ msgstr "เมธอดไม่สนับสนุนขณะเปิดป
 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:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "แก้ไขการเตือน"
 
@@ -5380,25 +5252,54 @@ msgid "A_dd"
 msgstr "เ_พิ่ม"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "การเตือน"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "แนบแฟ้ม"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "คุณสมบัติเอกสารแนบ"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "คำอธิบาย:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "File name:"
+msgstr "ชื่อแฟ้ม:"
+
+#: ../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:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "ปฏิทินที่เลือกเพื่อใช้แจ้งเตือน"
 
@@ -5423,7 +5324,7 @@ msgid ""
 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:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">การแจ้งเหตุ</span>"
 
@@ -5432,7 +5333,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:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ทั่วไป</span>"
@@ -5449,25 +5350,27 @@ msgstr "<span weight=\"bold\">เวลา</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">สัปดาห์ทำงาน</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "ปรับเวลาหน้า_ร้อน"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "สิ้นสุ_ดวัน:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "แสดง"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "ว่าง/ไม่ว่าง"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "ศุกร์"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5477,13 +5380,13 @@ msgstr ""
 "ชั่วโมง\n"
 "วัน"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "จันทร์"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5501,225 +5404,219 @@ msgstr ""
 "วันเสาร์\n"
 "วันอาทิตย์"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "เลือกสี"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "อ_า."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "เสาร์"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "เลือกปฏิทินสำหรับการแจ้งเตือน"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "เ_ตือนความจำ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "แสดงสัป_ดาห์ที่ในปฏิทิน"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "อาทิตย์"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "_งานที่ถึงกำหนดวันนี้"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "พ_ฤ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "รูปแบบข้อความ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "พฤหัสบดี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "เ_ขตเวลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "รูปแบบเวลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "อังคาร"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "พุธ"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "เริ่มต้น_สัปดาห์ที่:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "วันทำงาน:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ชั่วโมง (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 ชั่วโมง"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_ถามเพื่อการยืนยันขณะลบรายการ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_กระชับวันสุดสัปดาห์ในมุมมองเดือน"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "เริ่มต้น_วัน:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "_ศ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "_ซ่อนงานที่เสร็จแล้วหลังจาก"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_จ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "งานที่เ_ลยกำหนด:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "_ส."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "แ_สดงเวลาสิ้นสุดนัดหมายในมุมมองสัปดาห์และเดือน"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "การ_จำแนกเวลา:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_อ."
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_พ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "ก่อนนัดหมายทุกครั้ง"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "คัดลอ_กเนื้อหาปฏิทินไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "คัดลอกเนื้อหาปฏิทินไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "คัดลอ_กเนื้อหารายการงานไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "คัดลอกเนื้อหารายการงานไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "คัดลอ_กเนื้อหารายการบันทึกช่วยจำไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "คัดลอกเนื้อหารายการบันทึกช่วยจำไว้ที่เครื่องเพื่อการทำงานแบบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_สี:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
 msgstr "รายการงาน"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memo List"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
 msgstr "รายการบันทึกช่วยจำ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "คุณสมบัติปฏิทิน"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "ปฏิทินใหม่"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "คุณสมบัติรายการงาน"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "รายการบันทึกช่วยจำใหม่"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "เพิ่มปฏิทิน"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "เพิ่มรายการงาน"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "เ_พิ่มปฏิทิน"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "เพิ่มรายการ_งาน"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "โ_หลดใหม่:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5774,49 +5671,49 @@ msgstr "%s  คุณไม่ได้แก้ไขข้อมูลใด�
 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:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr "ไปยัง"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr "(เสร็จแล้ว"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "เสร็จแล้ว"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (กำหนดเสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "กำหนดเสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "ข้อความที่แนบมา - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ข้อความที่แนบมา"
 msgstr[1] "ข้อความที่แนบมา %d ข้อความ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_ย้าย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "ยกเลิกการ_ลาก"
 
@@ -5824,7 +5721,7 @@ msgstr "ยกเลิกการ_ลาก"
 msgid "Could not update object"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5836,96 +5733,97 @@ msgid "Hide Attachment _Bar"
 msgstr "ซ่อนแ_ถบเอกสารแนบ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "แสดงแ_ถบเอกสารแนบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_ลบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_คุณสมบัติ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "เ_พิ่มเอกสารแนบ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "แสดงเอกสารแนบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "กดแคร่เว้นวรรคเพื่อซ่อน/แสดงแถบเอกสารแนบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "แก้ไขนัดหมาย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "การประชุม - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "นัดหมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "งานที่ได้รับมอบหมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "งาน - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "รายการบันทึก - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "ไม่มีสรุป"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "เอกสารแนบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ความเปลี่ยนแปลงในรายการนี้อาจถูกละเลยถ้ามีการปรับข้อมูลเข้ามา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "ไม่สามารถใช้รุ่นปัจจุบัน"
 
@@ -5941,10 +5839,6 @@ msgstr "ไม่สามารถเปิดที่ปลายทาง"
 msgid "Destination is read only"
 msgstr "ที่ปลายทางใช้อ่านได้เท่านั้น"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "ไม่สามารถลบเหตุการณ์ได้เนื่องจากข้อผิดพลาด corba"
@@ -6006,128 +5900,139 @@ msgstr "มอบฉันทะให้:"
 msgid "Enter Delegate"
 msgstr "ป้อนผู้รับมอบฉันทะ"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_นัดหมาย"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "การเวียนซ้ำ"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "เหตุการณ์นี้มีการแจ้งเตือน"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "_ปฏิทิน:"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../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 "ผู้_ประสานงาน:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "ผู้_รับฉันทะ"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "ผู้เ_ข้าประชุม"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "เหตุการณ์ที่ไม่บอกวันเริ่มต้น"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "เหตุการณ์ที่ไม่บอกวันสิ้นสุด"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "วันเริ่มต้นไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "วันสิ้นสุดไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "เวลาเริ่มต้นไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "เวลาสิ้นสุดไม่ถูกต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "ผู้ประสานงานที่เลือกไม่มีบัญชีผู้ใช้อีกแล้ว"
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "ต้องมีผู้ประสานงานด้วย"
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "ต้องการผู้เข้าประชุมอย่างน้อยหนึ่งคน"
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "เ_พิ่ม"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ไม่สามารถเปิดปฏิทิน '%s'"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d วันก่อนนัดหมาย"
 msgstr[1] "%d วันก่อนนัดหมาย"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d ชั่วโมงก่อนนัดหมาย"
 msgstr[1] "%d ชั่วโมงก่อนนัดหมาย"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d นาทีก่อนนัดหมาย"
 msgstr[1] "%d นาทีก่อนนัดหมาย"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "ปรับแต่ง"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "ไม่"
 
@@ -6144,33 +6049,38 @@ msgid "15 minutes before appointment"
 msgstr "15 นาทีก่อนนัดหมาย"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "ผู้เข้า_ประชุม..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "ผู้เ_ข้าประชุม..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "ห_มวด..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "เสียงเตือนเลือกเอง"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_คำอธิบาย:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "คำบรรยายเหตุการณ์"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_สถานที่:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "สรุ_ป:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "แ_จ้งเตือน"
 
@@ -6192,6 +6102,14 @@ msgstr "เป็นจำนวน"
 msgid "until"
 msgstr "กระทั่ง"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "ผู้_รับฉันทะ"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "_จาก:"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6238,7 +6156,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "สถานะ"
 
@@ -6259,81 +6177,62 @@ msgid "Organizer"
 msgstr "ผู้ประสานงาน"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "ผู้ประสานงาน:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "บันทึกช่วยจำ"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ไม่สามารถเปิดบันทึกช่วยจำใน '%s'"
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "ถึง"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "วันเ_ริ่มต้น:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "สรุ_ป"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-msgid "T_o:"
-msgstr "_ถึง:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_กลุ่ม:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "เ_นื้อหาบันทึก:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>ตัวเลือกปฏิทิน</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "เพิ่มปฏิทินใหม่"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "กลุ่มปฏิทิน"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "ตำแหน่งปฏิทิน"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "ชื่อปฏิทิน"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>ตัวเลือกรายการงาน</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "เพิ่มรายการงานใหม่"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "กลุ่มรายการงาน"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "ชื่อรายการงาน"
 
@@ -6479,7 +6378,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>"
 
@@ -6544,15 +6443,15 @@ msgstr "<span weight=\"bold\">สถานภาพ</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "เสร็จแล้ว"
 
 #: ../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-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "สูง"
 
@@ -6561,20 +6460,20 @@ msgstr "สูง"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "กำลังดำเนินการ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "ต่ำ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "ปกติ"
 
@@ -6582,7 +6481,7 @@ msgstr "ปกติ"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "ยังไม่เริ่ม"
 
@@ -6595,7 +6494,7 @@ msgid "Stat_us:"
 msgstr "_สถานะ:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "ไม่ได้กำหนด"
 
@@ -6604,7 +6503,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:31
 msgid "_Priority:"
 msgstr "_ระดับความสำคัญ:"
 
@@ -6612,12 +6511,12 @@ msgstr "_ระดับความสำคัญ:"
 msgid "_Web Page:"
 msgstr "เ_ว็บเพจ:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_งาน"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "รายละเอียดงาน"
 
@@ -6630,10 +6529,6 @@ msgstr "วันกำหนดเสร็จงานไม่ถูกต้
 msgid "Unable to open tasks in '%s'."
 msgstr "ไม่สามารถเปิดงานใน '%s'"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "ผู้เ_ข้าประชุม..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "ห_มวด..."
@@ -6642,6 +6537,10 @@ msgstr "ห_มวด..."
 msgid "Or_ganiser:"
 msgstr "ผู้_ประสานงาน:"
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "วันเ_ริ่มต้น:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "เขตเวลา:"
@@ -6650,46 +6549,46 @@ msgstr "เขตเวลา:"
 msgid "_Due date:"
 msgstr "วัน_กำหนดเสร็จ:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>_ปฏิทิน ว่าง/ไม่ว่าง</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>ความถี่ของการประกาศ</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>_ตำแหน่งการประกาศ</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "ตั้งค่าการประกาศการว่าง/ไม่ว่าง"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "ประจำ_วัน"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_สั่งเอง"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_รหัสผ่าน:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "_จำรหัสผ่าน"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_ชื่อผู้ใช้:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "ประจำ_สัปดาห์"
 
@@ -6770,42 +6669,35 @@ 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:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, 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
-msgid "Untitled"
-msgstr "ไม่มีชื่อเรื่อง"
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+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
-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
-msgid "Description:"
-msgstr "คำอธิบาย:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "เว็บเพจ:"
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "ไม่มีชื่อเรื่อง"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "สรุป:"
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "วันเริ่มต้น:"
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "วันกำหนดเสร็จ:"
@@ -6815,7 +6707,7 @@ msgstr "วันกำหนดเสร็จ:"
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "สถานะ:"
 
@@ -6824,17 +6716,17 @@ 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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "เปิดเผย"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "ส่วนตัว"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "เป็นความลับ"
 
@@ -6843,25 +6735,24 @@ msgid "End Date"
 msgstr "วันสิ้นสุด"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "วันเริ่มต้น"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "สรุป"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "ไม่ว่าง"
 
@@ -6875,17 +6766,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ตกลง"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ไม่ตกลง"
@@ -6896,21 +6787,21 @@ msgstr "ไม่ตกลง"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "ไม่รู้จัก"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "เวียนซ้ำ"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "มอบหมาย"
 
@@ -6918,7 +6809,7 @@ msgstr "มอบหมาย"
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "เลือกโฟลเดอร์ที่จะบันทึกเอกสารแนบที่เลือก..."
 
@@ -6927,9 +6818,9 @@ msgstr "เลือกโฟลเดอร์ที่จะบันทึก
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_บันทึกเป็น..."
 
@@ -6947,79 +6838,74 @@ msgstr "_บันทึกสิ่งที่เลือก"
 msgid "Open in %s..."
 msgstr "เปิดใน %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "กำลังลบวัตถุที่เลือก"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "บันทึกเป็น..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "งานใ_หม่"
-
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "เปิด_เว็บเพจ"
 
-#: ../calendar/gui/e-calendar-table.c: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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7027,52 +6913,44 @@ msgstr "เปิด_เว็บเพจ"
 msgid "_Print..."
 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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_ตัด"
 
-#: ../calendar/gui/e-calendar-table.c: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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "แ_ปะ"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_มอบหมายงาน"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "ส่ง_ต่อเป็น iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_ทำเครื่องหมายว่าเสร็จแล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_ทำเครื่องหมายงานที่เลือกว่าเสร็จแล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "_ทำเครื่องหมายว่ายังไม่เสร็จ"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_ทำเครื่องหมายงานที่เลือกว่ายังไม่เสร็จ"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "ลบ_งานที่เลือก"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "คลิกเพื่อเพิ่มงาน"
@@ -7082,7 +6960,7 @@ msgstr "คลิกเพื่อเพิ่มงาน"
 msgid "% Complete"
 msgstr "% ความสมบูรณ์"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "เสร็จแล้ว"
 
@@ -7107,101 +6985,105 @@ msgstr "วันเริ่มต้น"
 msgid "Task sort"
 msgstr "ลำดับงาน"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "กำลังลบรายการ"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "กำลังคัดลอกรายการ"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "นัดหมายใ_หม่"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "เหตุการณ์ทั้งวันใหม่"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "การประชุมใ_หม่"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "งานใ_หม่"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_มุมมองปัจจุบัน"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "เลือก_วันนี้"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "เ_ลือกวัน..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_คัดลอกไปยังปฏิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_ย้ายไปยังปฏิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "มอบหมายประชุมแ_ทน..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_จัดเวลาประชุม..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "ส่ง_ต่อเป็น iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_ตอบกลับ"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "ตอบกลับทั้งห_มด"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "ให้เหตุการณ์นี้เ_คลื่อนย้ายได้"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_ลบเหตุการณ์นี้"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "ลบ_ทุกเหตุการณ์"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ผู้ประสานงาน: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "ผู้ประสานงาน: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "สถานที่: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "เวลา: %s %s"
@@ -7231,7 +7113,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "ความละเอียด %02i นาที"
@@ -7242,22 +7124,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: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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c: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:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c: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:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -7349,12 +7229,10 @@ msgstr "ข้อผิดพลาด iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "บุคคลที่ไม่รู้จัก"
 
@@ -7367,22 +7245,22 @@ msgstr "<br> กรุณาดูข้อมูลข้างล่างน�
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "ตอบรับแล้ว"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "อาจตอบรับ"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "ปฏิเสธ"
 
@@ -7599,7 +7477,7 @@ msgid "Attendee status updated\n"
 msgstr "ปรับข้อมูลผู้เข้าร่วมเรียบร้อยแล้ว\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ไม่สามารถปรับข้อมูลสถานะผู้เข้าร่วมประชุมได้ เนื่องจากรายการหายไปแล้ว"
 
@@ -7646,35 +7524,48 @@ msgid "Send Latest Information"
 msgstr "ส่งข้อมูลล่าสุด"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--ไปยัง--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "จดหมายปฏิทิน"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "วันที่:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "กำลังโหลดปฏิทิน"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "กำลังโหลดปฏิทิน..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "ข้อความจากเซิร์ฟเวอร์"
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "วันสิ้นสุด"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "วันเริ่มต้น"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "ประธาน"
@@ -7693,65 +7584,65 @@ msgid "Resources"
 msgstr "ทรัพยากร"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "ส่วนบุคคล"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "กลุ่ม"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "ทรัพยากร"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "ห้อง"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "ประธาน"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "ผู้ร่วมประชุมที่ต้องเข้า"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "ผู้ร่วมประชุมเสริม"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "ไม่ใช่ผู้ร่วมประชุม"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "ต้องดำเนินการ"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "ไม่แน่"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "ส่งผู้แทนเข้าประชุม"
 
@@ -7760,14 +7651,14 @@ msgstr "ส่งผู้แทนเข้าประชุม"
 msgid "Attendee                          "
 msgstr "ผู้เข้าร่วม                           "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 msgid "In Process"
 msgstr "กำลังดำเนินการ"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Ey"
 
@@ -7775,86 +7666,86 @@ 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:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%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:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Ey"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "ไม่อยู่ที่ทำงาน"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "ไม่มีข้อมูล"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "ผู้เ_ข้าประชุม..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_ตัวเลือก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "แสดง_ชั่วโมงทำการเท่านั้น"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "แสดงภาพขยาย_ออก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_ปรับปรุงข้อมูล ว่าง/ไม่ว่าง "
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "เลือก_อัตโนมัติ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_ทุกคน ทุกทรัพยากร"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "ทุก_คน และทรัพยากรชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "ผู้เข้าประชุมห_ลัก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "ผู้เข้าประชุมหลัก และ_ทรัพยากรชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "เวลาเ_ริ่มต้น:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "เวลา_สิ้นสุด:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "ลบบันทึก_ช่วยจำที่เลือก"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "คลิกเพื่อเพิ่มบันทึกช่วยจำ"
 
@@ -7862,8 +7753,8 @@ msgstr "คลิกเพื่อเพิ่มบันทึกช่วย
 msgid "Memo sort"
 msgstr "การเรียงบันทึกช่วยจำ"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7881,7 +7772,7 @@ msgstr "กำลังโหลดบันทึกช่วยจำ"
 msgid "Opening memos at %s"
 msgstr "กำลังเปิดบันทึกช่วยจำที่ %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "กำลังลบสิ่งที่เลือก..."
 
@@ -7890,72 +7781,66 @@ msgstr "กำลังลบสิ่งที่เลือก..."
 msgid "Enter the password for %s"
 msgstr "ป้อนรหัสผ่านสำหรับ %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "กำลังโหลดงาน"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "กำลังเปิดงานที่ %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "กำลังจบงาน..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "กำลังเก็บกวาด"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "เลือกเขตเวลา"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "กำลังปรับข้อมูลการสืบค้น"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "มุมมอง_กำหนดเอง"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_บันทึกมุมมองที่กำหนดเอง"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_กำหนดมุมมอง..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "กำลังโหลดนัดหมายจาก %s"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "กำลังโหลดงานจาก %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, c-format
-msgid "Loading memos at %s"
-msgstr "กำลังโหลดบันทึกช่วยจำที่ %s"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "กำลังเปิด %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "กำลังเก็บกวาด"
 
@@ -8069,18 +7954,31 @@ msgstr "ข้อมูล iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "คุณต้องเป็นผู้เข้าร่วมในเหตุการณ์"
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "รายการบันทึกช่วยจำให_ม่"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "คัดลอก"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "ลบ"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "คุณสมบัติ..."
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:526
 #, 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
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -8088,56 +7986,44 @@ msgid_plural ", %d selected"
 msgstr[0] " เลือกอยู่ %d รายการ"
 msgstr[1] " เลือกอยู่ %d รายการ"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "การปรับปรุงรุ่นบันทึกช่วยจำล้มเหลว"
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ไม่สามารถเปิดรายการบันทึกช่วยจำ '%s' สำหรับการสร้างเหตุการณ์และการประชุม"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "ไม่มีปฏิทินที่ใช้ได้สำหรับการสร้างบันทึกช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "เครื่องมือเลือกแหล่งบันทึกช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "บันทึกช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
 msgstr "บันทึก_ช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "สร้างบันทึกช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "บันทึกช่วยจำใช้ร่วมชิ้นใหม่"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "บันทึกช่วยจำใช้_ร่วม"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "สร้างบันทึกช่วยจำใช้ร่วมชิ้นใหม่"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "รายการบันทึกช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
 msgstr "_รายการบันทึกช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "สร้างรายการบันทึกช่วยจำใหม่"
 
@@ -8184,240 +8070,240 @@ msgstr "ไม่สามารถถ่ายโอนปฏิทิน `%s'"
 msgid "Unable to migrate tasks `%s'"
 msgstr "ไม่สามารถถ่ายโอนงาน `%s'"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "วันที่ 1"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "วันที่ 2"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "วันที่ 3"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "วันที่ 4"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "วันที่ 5"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "วันที่ 6"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "วันที่ 7"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "วันที่ 8"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "วันที่ 9"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "วันที่ 10"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "วันที่ 11"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "วันที่ 12"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "วันที่ 13"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "วันที่ 14"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "วันที่ 15"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "วันที่ 16"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "วันที่ 17"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "วันที่ 18"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "วันที่ 19"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "วันที่ 20"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "วันที่ 21"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "วันที่ 22"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "วันที่ 23"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "วันที่ 24"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "วันที่ 25"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "วันที่ 26"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "วันที่ 27"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "วันที่ 28"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "วันที่ 29"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "วันที่ 30"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "วันที่ 31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "อา."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "จ."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "อ."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "พ."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "พฤ."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "ศ."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "ส."
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "วันที่เลือก (%a %d %b %Ey)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Ey"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Ey"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "สัปดาห์ที่เลือก (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "เดือนที่เลือก (%b %Ey)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "ปีที่เลือก (%Ey)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "นัดหมาย"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "งาน"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "สรุป: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "สถานะ: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "ระดับความสำคัญ: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "เปอร์เซ็นต์ที่เสร็จ: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "หมวด: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 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
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "ตัวอย่างก่อนพิมพ์"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "รายการพิมพ์"
 
@@ -8474,14 +8360,14 @@ msgid "New task list"
 msgstr "รายการงานใหม่"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
-msgstr "รายการ_งาน"
+msgid "Task l_ist"
+msgstr "รายการงาน"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "สร้างรายการงานใหม่"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8493,11 +8379,11 @@ msgstr ""
 "\n"
 "คุณต้องการลบงานทั้งหมดนี้จริงๆ หรือไม่?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "ไม่ต้องถามอีกครั้ง"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "พิมพ์งาน"
 
@@ -9073,7 +8959,7 @@ msgid "America/Nassau"
 msgstr "อเมริกา/แนสซอ"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "อเมริกา/นิวยอร์ก"
 
@@ -10092,7 +9978,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "แถบเอกสารแนบ"
 
@@ -10100,43 +9986,28 @@ msgstr "แถบเอกสารแนบ"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ไม่สามารถแนบแฟ้ม %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ไม่สามารถแนบแฟ้ม %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 "ชนิด MIME:"
-
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "ที่ที่จะแปะประกาศ"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "เลือกโฟลเดอร์ที่จะแปะประกาศข้อความ"
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "คลิกที่นี่ถ้าต้องการสมุดที่อยู่"
 
@@ -10147,45 +10018,45 @@ msgstr "คลิกที่นี่ถ้าต้องการสมุด
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_ที่อยู่ตอบกลับ:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_จาก:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "เ_รื่อง:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_ถึง:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "ป้อนชื่อผู้รับจดหมาย"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_สำเนาถึง:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ป้อนที่อยู่ที่จะส่งสำเนาจดหมาย"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "สำเนา_ลับถึง:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10194,15 +10065,15 @@ msgstr "ป้อนที่อยู่ที่จะส่งสำเนา
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_ประกาศที่:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "คลิกที่นี่เพื่อเลือกโฟลเดอร์ที่จะประกาศ"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "ประกาศที่:"
 
@@ -10210,67 +10081,67 @@ msgstr "ประกาศที่:"
 msgid "A_ttach"
 msgstr "แ_นบ"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "แทรกเอกสารแนบ"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ไม่สามารถเซ็นกำกับข้อความขาออก: ไม่ได้กำหนดใบรับรองการเซ็นกำกับสำหรับบัญชีนี้"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ไม่สามารถเข้ารหัสลับข้อความขาออก: ไม่ได้กำหนดใบรับรองการเข้ารหัสลับสำหรับบัญชีนี้"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "ซ่อนแ_ถบเอกสารแนบ"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "แสดงแ_ถบเอกสารแนบ"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "ไม่ทราบสาเหตุ"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "ไม่สามารถเปิดแฟ้ม"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "ไม่สามารถดึงข้อความจากเครื่องมือแก้ไข"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "จดหมายไม่มีชื่อเรื่อง"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "เปิดแฟ้ม"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "สร้างโดยอัตโนมัติ"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "ลายเ_ซ็น:"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "เขียนจดหมาย"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10299,7 +10170,7 @@ 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
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "เนื่องจาก &quot;{1}&quot;"
 
@@ -10414,7 +10285,7 @@ msgstr "_บันทึกข้อความ"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10435,7 +10306,6 @@ 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"
@@ -10446,17 +10316,14 @@ 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>"
 
 #: ../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"
@@ -10466,12 +10333,10 @@ msgstr ""
 "เมลถึงคุณขณะที่คุณไม่อยู่สำนักงาน</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 "ขณะนี้ฉันไม่อยู่ที่สำนักงาน"
 
@@ -10480,24 +10345,26 @@ 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 "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>การรับอีเมล</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>การส่งอีเมล:</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10507,37 +10374,37 @@ msgstr ""
 "<small>หน้านี้เปิดโอกาสให้คุณเลือกว่าคุณต้องการจะรับการแจ้งผ่านการแจ้งรับเมื่อข้อความที่คุณส่งถูกเปิดอ่านหรือไม่\n"
 "และเปิดให้คุณระบุสิ่งที่ Evolution ควรจะทำเมื่อมีผู้ร้องขอการแจ้งกลับจากคุณ</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "ส่งการแจ้งรับข้อความเสมอ"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "ถามก่อนส่งการแจ้งรับข้อความ"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "ไม่ส่งการแจ้งรับข้อความ"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "การแจ้งรับข้อความ"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "ร้องขอการแจ้งรับสำหรับทุกข้อความที่ส่ง"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "ถ้าข้อความไม่ได้ส่งไปที่เมลลิงลิสต์และไม่ได้ส่งตรงถึงฉัน"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr "เมื่อคุณได้รับอีเมลที่ร้องขอการแจ้งรับ Evolution ควรทำอย่างไร?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10545,28 +10412,28 @@ msgstr ""
 "แฟ้มชื่อนั้นมีอยู่แล้ว\n"
 "ต้องการเขียนทับหรือไม่?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "เขียนทับหรือไม่?"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "คำเตือนของ Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "ข้อมูล Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "คำถามจาก Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ข้อผิดพลาดภายในไม่ทราบสาเหตุ ขณะมีการร้องขอ '%s'"
@@ -10587,7 +10454,7 @@ msgstr "คุณต้องการเขียนทับใช่หรื
 msgid "File exists &quot;{0}&quot;."
 msgstr "มีแฟ้ม &quot;{0}&quot; อยู่ก่อนแล้ว"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "เ_ขียนทับ"
 
@@ -10661,24 +10528,24 @@ msgstr "%d-%b-%Ey"
 msgid "Select a time to compare against"
 msgstr "เลือกเวลาที่จะใช้เป็นค่าเปรียบเทียบ"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "เลือกแฟ้ม"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "สำคัญ"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "จะทำ"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "ไว้ทีหลัง"
 
@@ -10727,11 +10594,11 @@ msgid "Include threads"
 msgstr "รวมกระทู้ด้วย"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "เข้า"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "ออก"
 
@@ -10827,7 +10694,7 @@ msgstr "ก่อน"
 msgid "months"
 msgstr "เดือน"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "วินาที"
 
@@ -10896,22 +10763,22 @@ msgstr "เครื่องมือควบคุมการตั้งค
 msgid "Evolution Mail preferences control"
 msgstr "เครื่องมือควบคุมการปรับแต่งเมลของ Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../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:531
 msgid "Mail Accounts"
 msgstr "บัญชีเมล"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "ปรับแต่งระบบเมล"
 
@@ -10938,7 +10805,7 @@ msgstr ""
 "และทำเครื่องหมายที่กล่องกาเครื่องหมายเพื่อแสดงการยอมรับ\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "เลือกโฟลเดอร์"
 
@@ -10946,46 +10813,46 @@ msgstr "เลือกโฟลเดอร์"
 msgid "Ask for each message"
 msgstr "ถามสำหรับแต่ละข้อความ"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "ข้อมูลบุคคล"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "การรับอีเมล"
 
-#: ../mail/em-account-editor.c:2014
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "_ตรวจเมลใหม่อัตโนมัติทุก ๆ"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "การส่งอีเมล"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "ค่าปกติ"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "การรักษาความปลอดภัย"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "ตัวเลือกการรับเมล"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "การตรวจสอบเมลใหม่"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "หน้าต่างแก้ไขบัญชี"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "เครื่องมือช่วยตั้งค่าบัญชี Evolution"
 
@@ -11005,22 +10872,22 @@ msgid "[Default]"
 msgstr "[บัญชีหลัก]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "เปิดใช้งาน"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "ชื่อบัญชี"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "โพรโทคอล"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "ไม่มีชื่อ"
 
@@ -11040,14 +10907,14 @@ msgstr "ลายเซ็น"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ข้อความส่งต่อ --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1666
 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:1713
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11096,12 +10963,6 @@ msgstr "วันรับ"
 msgid "Date sent"
 msgstr "วันส่ง"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "ลบ"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "ลบไปแล้ว"
@@ -11190,7 +11051,7 @@ msgstr "ไม่ใช่"
 msgid "is not Flagged"
 msgstr "ไม่ได้ปักธงไว้"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "เมลขยะ"
@@ -11199,7 +11060,7 @@ msgstr "เมลขยะ"
 msgid "Junk Test"
 msgstr "ทดสอบเมลขยะ"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ป้าย"
 
@@ -11243,7 +11104,7 @@ msgstr "เล่นเสียง"
 msgid "Read"
 msgstr "อ่าน"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "ผู้รับ"
 
@@ -11271,11 +11132,11 @@ msgstr "คืนค่าน้อยกว่า"
 msgid "Run Program"
 msgstr "เรียกโปรแกรม"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "คะแนน"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "ผู้ส่ง"
 
@@ -11307,11 +11168,11 @@ msgstr "เริ่มด้วย"
 msgid "Stop Processing"
 msgstr "หยุดประมวลผลต่อ"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "เรื่อง"
@@ -11325,42 +11186,10 @@ msgstr "ยกเลิกสถานะ"
 msgid "<b>Then</b>"
 msgstr "<b>แล้ว</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "_สร้างโฟลเดอร์ค้นหาจากการค้นหา..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "ทุกข้อความ"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "ข้อความที่ยังไม่ได้อ่าน"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "ไม่มีป้าย"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "ข้อความที่อ่านแล้ว"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "ข้อความล่าสุด"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days' Messages"
-msgstr "ข้อความภายใน 5 วันก่อน"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "ข้อความที่มีเอกสารแนบ"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "ข้อความที่ไม่ใช่เมลขยะ"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
@@ -11377,7 +11206,7 @@ msgstr[0] "ข้อความที่ยังไม่ได้อ่าน
 msgstr[1] "ข้อความที่ยังไม่ได้อ่าน:"
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "คุณสมบัติโฟลเดอร์"
 
@@ -11394,7 +11223,7 @@ msgid "Folder _name:"
 msgstr "ชื่อโ_ฟลเดอร์:"
 
 #: ../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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "โฟลเดอร์ค้นหา"
 
@@ -11409,7 +11238,7 @@ msgstr "จดหมายร่าง"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "จดหมายเข้า"
 
@@ -11425,77 +11254,77 @@ msgstr "ส่งแล้ว"
 msgid "Loading..."
 msgstr "กำลังโหลด..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "ลำดับชั้นโฟลเดอร์เมล"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "กำลังย้ายโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "กำลังคัดลอกโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "กำลังย้ายข้อความไปยังโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "กำลังคัดลอกข้อความไปยังโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_คัดลอกไปยังโฟลเดอร์"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_ย้ายไปยังโฟลเดอร์"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "กำลังตรวจโฟลเดอร์ต่างๆ ใน \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_มุมมอง"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "เ_ปิดในหน้าต่างใหม่"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_คัดลอก..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_ย้าย..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "โ_ฟลเดอร์ใหม่..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "เปลี่ยน_ชื่อ..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
 msgid "_Empty Trash"
 msgstr "เ_ทขยะ"
 
@@ -11504,14 +11333,13 @@ msgstr "เ_ทขยะ"
 msgid "Copying `%s' to `%s'"
 msgstr "กำลังคัดลอก `%s' ไปยัง `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "เลือกโฟลเดอร์"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_คัดลอก"
 
@@ -11533,218 +11361,208 @@ msgstr "สร้างโฟลเดอร์"
 msgid "Specify where to create the folder:"
 msgstr "ระบุที่ที่จะสร้างโฟลเดอร์"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_ตอบกลับผู้ส่ง"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "ส่ง_ต่อ"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "แ_ก้ไขเป็นข้อความใหม่..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "ไ_ม่ลบ"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_ย้ายไปยังโฟลเดอร์..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_คัดลอกไปยังโฟลเดอร์..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "ทำเครื่องหมาย_อ่านแล้ว"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "ทำเครื่องหมายว่า_ยังไม่อ่าน"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "ทำเครื่องหมายว่า_สำคัญ"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
 msgstr "ทำเครื่องหมายว่าไ_ม่สำคัญ"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "ทำเครื่องหมายเป็นเมล_ขยะ"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "ทำเครื่องหมายว่าไม่ใช่เม_ลขยะ"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "ทำเครื่องหมายว่าจะ_ตอบกระทู้..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "ไ_ม่ทำอะไร"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "ปักธ_งว่าเสร็จแล้ว"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "ล้_างธง"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "สร้าง_กฎจากข้อความ"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อเ_รื่อง..."
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อผู้_ส่ง"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อผู้_รับ"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "สร้างโฟลเดอร์ค้นหาจากเ_มลลิงลิสต์"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "กรองที่ชื่อเ_รื่อง"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "กรองที่ชื่อผู้_ส่ง"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "กรองที่ชื่อผู้_รับ"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "กรองที่เ_มลลิงลิสต์"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "ปริยาย"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "พิมพ์ข้อความ"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "ดึงข้อความไม่สำเร็จ"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2460
+msgid "_Copy Link Location"
+msgstr "คัด_ลอกที่อยู่ลิงก์"
+
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "สร้างโฟลเดอร์_ค้นหา"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_จากที่อยู่นี้"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "ไ_ปที่อยู่นี้"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "คลิกเพื่อส่งเมลไปยัง %s"
 
-#: ../mail/em-folder-view.c:2860
-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:496
 #, c-format
 msgid "Matches: %d"
 msgstr "หาพบ: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "หา:"
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "ตัว_พิมพ์ใหญ่-เล็กตรงกัน"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "ไม่มีลายเซ็นกำกับ"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ข้อความนี้ไม่มีลายเซ็นกำกับ ไม่มีอะไรประกันได้เลยว่าข้อความนี้เป็นมาจากผู้ส่งจริง"
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "ลายเซ็นถูกต้อง"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "ข้อความนี้มีลายเซ็นกำกับที่ถูกต้อง ซึ่งหมายความว่า ข้อความนี้น่าจะมาจากผู้ส่งจริง"
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "ลายเซ็นไม่ถูกต้อง"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ลายเซ็นกำกับข้อความนี้ตรวจสอบแล้วไม่ผ่าน เป็นไปได้ว่าข้อความอาจถูกแก้ไขระหว่างทาง"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "ลายเซ็นถูกต้อง แต่ไม่สามารถตรวจสอบผู้ส่ง"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "ข้อความนี้มีลายเซ็นกำกับที่ถูกต้อง แต่ไม่สามารถตรวจสอบผู้ส่งข้อความได้"
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "ไม่ได้เข้ารหัส"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "ข้อความนี้ไม่ได้เข้ารหัส เนื้อหาอาจถูกดักอ่านระหว่างทางในอินเทอร์เน็ตได้"
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "เข้ารหัสแบบอ่อน"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11753,21 +11571,21 @@ msgstr ""
 "ข้อความนี้ถูกเข้ารหัส แต่ใช้อัลกอริทึมเข้ารหัสที่อ่อน บุคคลอื่นอาจดักอ่านได้ยากก็จริง "
 "แต่ก็ไม่ใช่เป็นไปไม่ได้ โดยใช้เวลาไม่มากเกินไป"
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "เข้ารหัส"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "ข้อความนี้ถูกเข้ารหัส บุคคลอื่นดักอ่านเนื้อหาได้ยาก"
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "เข้ารหัสแบบแน่นหนา"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11775,72 +11593,72 @@ msgid ""
 msgstr ""
 "ข้อความนี้ถูกเข้ารหัสด้วยอัลกอริทึมเข้ารหัสที่แน่นหนา บุคคลอื่นดักอ่านเนื้อหาได้ยากมาก ด้วยเวลาปกติ"
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_ดูใบรับรอง"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "ใบรับรองนี้เปิดดูไม่ได้"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "เสร็จเมื่อ %d %B %Ey %H:%M"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "เลยกำหนด:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ภายใน %d %B %Ey %H:%M"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "แ_สดงในบรรทัด"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_ซ่อน"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_พอดีความกว้าง"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "แสดงขนาด_จริง"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "เอกสารแนบ"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "เลือกโฟลเดอร์ที่จะบันทึกเอกสารแนบทั้งหมด..."
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_บันทึกรายการที่เลือก..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
 msgstr[0] "เอกสารแ_นบ %d ฉบับ"
 msgstr[1] "เอกสารแ_นบ %d ฉบับ"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_บันทึก"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "บันทึกทั้งห_มด"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "ไม่มีเอกสารแนบ"
 
@@ -11854,88 +11672,94 @@ msgstr "หน้า %d จาก %d"
 msgid "Retrieving `%s'"
 msgstr "กำลังดึง `%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "ลายเซ็นถูกต้องแต่ไม่สามารถตรวจสอบผู้ส่ง"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "ข้อความส่วนภายนอกผิดรูปแบบ"
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "ตัวชี้ไปยังแหล่ง FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ตัวชี้ไปยังแฟ้มในเครื่อง (%s) ใช้ได้สำหรับเครื่อง \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ตัวชี้ไปยังแฟ้มในเครื่อง (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ตัวชี้ไปยังข้อมูลในเครือข่าย (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ตัวชี้ไปยังข้อมูลภายนอกที่ไม่รู้จัก (ชนิด \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "กำลังจัดเรียงข้อความ"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "จาก"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "ที่อยู่ตอบกลับ"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "ถึง"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "สำเนาถึง"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "สำเนาลับถึง"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "โปรแกรมส่งเมล"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "วันที่"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "กลุ่มข่าว"
@@ -11945,7 +11769,7 @@ msgstr "กลุ่มข่าว"
 msgid "%s attachment"
 msgstr "เอกสารแนบ %s"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ไม่สามารถแจงข้อความ S/MIME: ข้อผิดพลาดไม่ทราบสาเหตุ"
 
@@ -11961,11 +11785,11 @@ msgstr "ชนิดการเข้ารหัสที่ไม่สนั
 msgid "Unsupported signature format"
 msgstr "รูปแบบลายเซ็นที่ไม่สนับสนุน"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะตรวจสอบลายเซ็น"
 
@@ -11985,7 +11809,7 @@ msgstr "หนึ่งครั้งต่อสัปดาห์"
 msgid "Once per month"
 msgstr "หนึ่งครั้งต่อเดือน"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11996,47 +11820,47 @@ msgstr ""
 "\n"
 "กรุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ไม่สามารถสร้างโฟลเดอร์ใหม่ `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ไม่สามารถคัดลอกโฟลเดอร์ `%s' ไปยัง `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "ไม่สามารถตรวจหากล่องเมลที่มีอยู่ที่ `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "ไม่สามารถเปิดข้อมูล POP เก่า `%s' ชนิดเก็บไว้ที่เซิร์ฟเวอร์: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "ไม่สามารถสร้างไดเรกทอรีข้อมูล POP3 `%s' ชนิดเก็บไว้ที่เซิร์ฟเวอร์: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "ไม่สามารถคัดลอกข้อมูล POP3 `%s' ชนิดเก็บไว้ที่เซิร์ฟเวอร์: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ไม่สามารถสร้างที่เก็บเมลท้องถิ่น `%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "ไม่สามารถสร้างโฟลเดอร์เมลท้องถิ่น `%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12053,6 +11877,10 @@ msgstr "_ตอบไปยังผู้ส่ง"
 msgid "Reply to _List"
 msgstr "ตอบกลับเข้า_ลิสต์"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "เปิดลิงก์ในเ_บราว์เซอร์"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "ส่งข้อความใ_หม่ไปถึง..."
@@ -12061,49 +11889,49 @@ msgstr "ส่งข้อความใ_หม่ไปถึง..."
 msgid "_Add to Address Book"
 msgstr "เ_พิ่มในสมุดที่อยู่"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:648
 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:869
 msgid "Please select a server."
 msgstr "กรุณาเลือกเซิร์ฟเวอร์"
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "ไม่ได้เลือกเซิร์ฟเวอร์"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "ไม่ต้องแสดงข้อความนี้อีก"
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "ตัวกรองข้อความ"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "ข้อความ"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "บันทึกข้อความ..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "เพิ่มที่อยู่"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "ข้อความจาก %s"
@@ -12112,7 +11940,7 @@ msgstr "ข้อความจาก %s"
 msgid "Search _Folders"
 msgstr "โ_ฟลเดอร์ค้นหา"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "แหล่งสำหรับโฟลเดอร์ค้นหา"
 
@@ -12145,109 +11973,82 @@ msgid "Composer Window default width"
 msgstr "ความกว้างปริยายของหน้าต่างเขียนจดหมาย"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "จำกัดการแสดงรายการที่อยู่ในช่อง ถึง/สำเนาถึง/สำเนาลับถึง"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"จำกัดการแสดงรายการที่อยู่ในช่อง ถึง/สำเนาถึง/สำเนาลับถึง ไม่ให้เกินจำนวนที่ระบุใน "
-"address_count"
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "รหัสอักขระปริยายที่จะใช้เขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "รหัสอักขระปริยายที่จะใช้เขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "รหัสอักขระปริยายที่จะใช้แสดงจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "รหัสอักขระปริยายที่จะใช้แสดงจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "รูปแบบปริยายของการส่งต่อข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "ความสูงปริยายของหน้าต่างเขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "ความสูงปริยายของหน้าต่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "ความสูงปริยายของหน้าต่างบอกรับข้อมูล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "รูปแบบปริยายของการตอบจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "ความกว้างปริยายของหน้าต่างเขียนจดหมาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "ความกว้างปริยายของหน้าต่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "ความกว้างปริยายของหน้าต่างบอกรับข้อมูล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "เน้นคำสะกดผิดขณะพิมพ์"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "เทถังขยะก่อนออก"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "เทขยะในโฟลเดอร์ถังขยะทั้งหมดก่อนออกจาก Evolution"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "เปิดใช้โหมดเคอร์เซอร์ เพื่อให้คุณใช้เคอร์เซอร์ขณะอ่านเมลได้"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "เปิดหรือปิดความสามารถในการค้นแบบพิมพ์ล่วงหน้า"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"เปิดใช้ความสามารถในการค้นหาภายในแถบข้าง เพื่อให้คุณสามารถเริ่มการค้นหาแบบโต้ตอบ "
-"ด้วยการพิมพ์ข้อความ ประโยชน์ก็คือ คุณสามารถหาโฟลเดอร์ในแถบข้างได้โดยเพียงพิมพ์ชื่อโฟลเดอร์ "
-"แล้วแถบเลือกก็จะกระโดดไปยังโฟลเดอร์นั้นโดยอัตโนมัติขณะพิมพ์"
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "เปิด/ปิดการใช้เคอร์เซอร์"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "ความสูงของช่องรายการข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "ความสูงของช่องรายการข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12255,13 +12056,7 @@ msgstr ""
 "ถ้าผู้ใช้พยายามเปิดข้อความตั้งแต่ 10 ข้อความขึ้นไปพร้อมกันทีเดียว จะถามผู้ใช้ก่อน "
 "ว่าต้องการเปิดจริงหรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-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.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12271,27 +12066,23 @@ msgstr ""
 "ที่ปรากฏในรายชื่อนี้ จะถูกค้นหาองค์ประกอบ bonobo สำหรับแสดง จากฐานข้อมูลชนิด mime ของ "
 "GNOME"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "เปิด/ปิดการถามเมื่อผู้ใช้ทำเครื่องหมายข้อความหลายรายการ"
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "เวลาเทขยะครั้งสุดท้าย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "รายชื่อป้ายและสีที่ใช้"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "รายชื่อบัญชีเมล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12299,11 +12090,11 @@ msgstr ""
 "รายชื่อบัญชีที่องค์ประกอบเมลของ Evolution รู้จัก  รายชื่อนี้เป็นสตริงเก็บชื่อไดเรกทอรีย่อยเทียบกับ /"
 "apps/evolution/mail/accounts"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "รายชื่อข้อมูลส่วนหัวกำหนดเอง พร้อมกำหนดว่าเปิดใช้หรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12311,19 +12102,19 @@ msgstr ""
 "รายชื่อของป้ายที่ใช้ในองค์ประกอบเมลของ Evolution  รายชื่อนี้เป็นรายการของสตริงในรูป ชื่อ:สี "
 "โดยแทนสีด้วยรูปแบบฐานสิบหกแบบ HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "รายการชนิด mime ที่จะตรวจหาองค์ประกอบ bonobo สำหรับแสดง"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "โหลดรูปภาพในข้อความ HTML ผ่าน http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12333,196 +12124,178 @@ msgstr ""
 "ไม่ต้องโหลดรูปภาพผ่านเครือข่าย, 1 = โหลดรูปภาพในเมลจากผู้ติดต่อ, 2 = "
 "โหลดรูปภาพผ่านเครือข่ายเสมอ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "บันทึกปฏิบัติการการกรองข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "บันทึกปฏิบัติการการกรองข้อความลงในแฟ้มบันทึกปฏิบัติการ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "แฟ้มบันทึกปฏิบัติการที่จะบันทึกปฏิบัติการการกรองข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "แฟ้มบันทึกปฏิบัติการที่จะบันทึกปฏิบัติการการกรองข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "ทำเครื่องหมายว่าอ่านแล้วหลังระยะเวลาที่กำหนด"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "ทำเครื่องหมายว่าอ่านแล้วหลังระยะเวลาที่กำหนด"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "เน้นการอ้างคำพูดในตัวอย่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "เน้นการอ้างคำพูดในตัวอย่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "ความสูงปริยายของหน้าต่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "ความกว้างปริยายของหน้าต่างข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "รูปแบบการแสดงข้อความ (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "จำนวนวันที่น้อยที่สุดระหว่างการเทขยะก่อนออกแต่ละครั้ง"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "เวลาที่น้อยที่สุดระหว่างการเทขยะก่อนออกแต่ละครั้ง เป็นวัน"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "แฟ้มเสียงแจ้งเมลใหม่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "ชนิดของการแจ้งเมลใหม่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "จำนวนรายการที่อยู่ที่จะแสดงในช่อง ถึง/สำเนาถึง/สำเนาลับถึง"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "ถามเมื่อหัวเรื่องข้อความว่างเปล่า"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ถามผู้ใช้เมื่อผู้ใช้พยายามเก็บกวาดโฟลเดอร์"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ถามผู้ใช้เมื่อผู้ใช้พยายามส่งข้อความที่ไม่มีหัวเรื่อง"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "ถามเมื่อผู้ใช้สั่งเก็บกวาด"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "ถามเมื่อผู้ใช้ระบุแต่สำเนาลับ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ถามก่อนถ้าผู้ใช้พยายามเปิดข้อความตั้งแต่ 10 ข้อความขึ้นไปพร้อมกัน"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "ถามเมื่อผู้ใช้พยายามส่งเมลในรูป HTML ไปยังผู้รับที่อาจไม่ต้องการรับเมลในรูป HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ถามเมื่อผู้ใช้พยายามส่งข้อความโดยไม่มีผู้รับในรายการ \"ถึง\" หรือ \"สำเนาถึง\" เลย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ถามเมื่อผู้ใช้พยายามส่ง HTML โดยที่ผู้รับไม่ต้องการ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "ถามเมื่อผู้ใช้ทำเครื่องหมายข้อความหลายรายการ"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "ตรวจรู้ลิงก์ในข้อความและแทนที่ให้"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "ตรวจรู้หน้าแสดงอารมณ์ในข้อความและแทนที่ด้วยรูปภาพให้"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "ตรวจความเป็นขยะในจดหมายเข้าทุกฉบับ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "ส่งเมลในรูป HTML โดยปริยาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "ส่งเมลในรูป HTML โดยปริยาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "แสดงภาพเคลื่อนไหว"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "แสดงภาพที่มีการเคลื่อนไหวโดยเคลื่อนไหวภาพ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "แสดงข้อความที่ลบแล้วในรายการข้อความด้วย โดยแสดงแบบขีดฆ่า"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 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.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "แฟ้มเสียงที่จะเล่นเมื่อมีเมลเข้ามาใหม่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "ระบุชนิดของการแจ้งเมลใหม่ที่ผู้ใช้ต้องการใช้"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "ตรวจตัวสะกดขณะพิมพ์"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "ความสูงปริยายของหน้าต่างบอกรับข้อมูล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "ความกว้างปริยายของหน้าต่างบอกรับข้อมูล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "แบบอักษรเทอร์มินัล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "เวลาเทขยะครั้งสุดท้าย เป็นวันนับจากจุดเริ่มนับเวลายูนิกซ์"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "แบบอักษรเทอร์มินัลสำหรับแสดงข้อความเมล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "แบบอักษรความกว้างไม่คงที่สำหรับแสดงข้อความเมล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12533,111 +12306,99 @@ msgstr ""
 "พร้อมกำหนดด้วยว่าจะแสดงหรือไม่ รูปแบบของโครงสร้าง XML คือ &lt;header enabled&gt; "
 "โดยกำหนด enabled ถ้าต้องการให้แสดง header ในมุมมองเมล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-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:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "เรียงกระทู้ในรายการข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "เรียงกระทู้ในรายการข้อความ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "เรียงกระทู้ในรายการข้อความตามหัวเรื่อง"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "กำหนดเวลาที่จะทำเครื่องหมายข้อความว่าอ่านแล้ว"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "กำหนดเวลาที่จะทำเครื่องหมายข้อความว่าอ่านแล้ว"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "สตริง UID ของบัญชีปริยาย"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "ใช้ดีมอนและไคลเอนต์ของ Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "ใช้ดีมอนและไคลเอนต์ของ Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "ใช้แบบอักษรกำหนดเอง"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "ใช้แบบอักษรกำหนดเองสำหรับแสดงผลเมล"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "ทดสอบสแปมแบบไม่ใช้เครือข่ายเท่านั้น"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ทดสอบสแปมแบบไม่ใช้เครือข่ายเท่านั้น (ไม่ใช้ DNS)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "เรียงช่องหน้าต่างแบบวางข้างกันในแนวนอน"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "แบบอักษรความกว้างไม่คงที่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "เมนู มุมมอง/สำเนาลับ กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "เมนู มุมมอง/สำเนาลับ กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "เมนู มุมมอง/สำเนาถึง กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "เมนู มุมมอง/สำเนาถึง กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "เมนู มุมมอง/จาก กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "เมนู มุมมอง/จาก กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "เมนู มุมมอง/ประกาศที่ กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "เมนู มุมมอง/ประกาศที่ กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "เมนู มุมมอง/ที่อยู่ตอบกลับ กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "เมนู มุมมอง/ที่อยู่ตอบกลับ กาอยู่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12645,14 +12406,6 @@ msgstr ""
 "กำหนดว่าจะถอยกลับไปใช้การเรียงกระทู้ข้อความโดยอาศัยหัวเรื่องเมื่อข้อความไม่มีข้อมูลส่วนหัว In-"
 "Reply-To หรือ Reference หรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "ความกว้างของช่องรายการข้อความ"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "ความกว้างของช่องรายการข้อความ"
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "กำลังขำเข้าข้อมูล Elm"
@@ -12684,15 +12437,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "เครื่องมือนำเข้าโฟลเดอร์ในรูปแบบ mailbox ของ Berkeley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "กำลังนำเข้า `%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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "กรุณารอสักครู่"
 
@@ -12869,31 +12622,31 @@ msgid_plural ", %d unread"
 msgstr[0] "ยังไม่อ่าน %d"
 msgstr[1] "ยังไม่อ่าน %d"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "ข้อความเมลใหม่"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "ข้อความเ_มล"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "เขียนเมลฉบับใหม่"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "โฟลเดอร์เมลใหม่"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "โ_ฟลเดอร์เมล"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "สร้างโฟลเดอร์เมลใหม่"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ปรับรุ่นค่าตั้งหรือโฟลเดอร์เมลไม่สำเร็จ"
 
@@ -12921,220 +12674,226 @@ msgstr "จะ_ทำ"
 msgid "_Later"
 msgstr "ไว้ทีห_ลัง"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_ตรวจสอบหาชนิดที่สนับสนุน"
 
-#: ../mail/mail-config.glade.h:3
+#: ../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>Sig_natures</b>"
 msgstr "<b>_ลายเซ็น</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_ภาษา</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 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:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">ข้อมูลบัญชีผู้ใช้</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 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
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">ข้อมูล_หัวจดหมายที่แสดง</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">ตัวเลือกการกรอง</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">ป้ายและสี</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">การโหลดรูปภาพ</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">การแสดงข้อความ</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">ตัวอักษรข้อความ</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">การแจ้งรับข้อความ</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../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:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">ตัวเลือก</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">แบบอักษรสำหรับพิมพ์</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">ข้อมูลจำเป็น</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME นิรภัย (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">ระบบนิรภัย</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">จดหมายออกและจดหมายร่าง</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</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 mail"
 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 mail"
 msgstr "เข้ารหัสถึง_ข้าพเจ้าเสมอเมื่อส่งจดหมายเข้ารหัส"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "แนบข้อความเดิม"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "แทรกรูปแสดง_อารมณ์โดยอัตโนมัติ"
 
-#: ../mail/mail-config.glade.h:46
+#: ../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 "Beep w_hen new mail arrives"
 msgstr "ส่งเสียง_ปิ๊บเมื่อมีเมลมา"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "ชุด_อักขระ:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_ตรวจสอบชนิดที่สนับสนุน"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "ตรวจสอบจดหมายเ_ข้าว่าเป็นเมลขยะหรือไม่"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "ตรวจตัวสะกดขณะ_พิมพ์"
 
-#: ../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 "_ล้าง"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "ล้า_ง"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_สีสำหรับคำที่สะกดผิด:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "สี"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "ถามก่อนเก็บกวา_ดโฟลเดอร์"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13149,134 +12908,134 @@ msgstr ""
 "\n"
 "กด \"เริ่มใช้\" เพื่อบันทึกการตั้งค่าของคุณ"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_ปริยาย"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "ร_หัสอักขระปริยาย:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "เ_ซ็นลายเซ็นดิจิทัลกำกับข้อความออก (โดยปกติ)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "ไม่อ้างคำพูดเดิม"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "เสร็จแล้ว"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "โ_ฟลเดอร์จดหมายร่าง:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "เ_ปิดใช้งาน"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "บัญชีอีเมล"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "ที่อยู่อีเ_มล:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "เท_ถังขยะก่อนออก"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "ใบรับรองการเข้าร_หัส:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "เ_ข้ารหัสข้อความออก (โดยปกติ)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "แบบอักษรความกว้าง_คงที่:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "ความกว้าง_คงที่:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "คุณสมบัติแบบอักษร"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "จัดรูปแบบข้อความเป็น _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "ชื่อเ_ต็ม:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "เมล HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "ส่วนหัว"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "เน้นการอ้าง_คำพูดด้วยสี"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "_ทดสอบโฮสต์ระยะไกลด้วย"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "ในข้อความ"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "ตารางภาษา"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "การกำหนดค่าเมล"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "ตารางข้อมูลส่วนหัวของเมล"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "ตำแหน่งกล่องเมล"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "การเขียนข้อความ"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "หมายเหตุ: คุณจะไม่ถูกถามรหัสผ่านจนกว่าจะเชื่อมต่อเป็นครั้งแรก"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "_องค์กร:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "ชื่อ_กุญแจ PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "เล่นแฟ้มเ_สียงเมื่อมีเมลเข้ามาใหม่"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13284,7 +13043,7 @@ msgstr ""
 "กรุณาป้อนชื่อที่บรรยายบัญชีนี้ในช่องว่างข้างล่าง\n"
 "ชื่อนี้จะใช้เพื่อการแสดงผลเท่านั้น"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13292,7 +13051,7 @@ msgstr ""
 "กรุณาป้อนข้อมูลเกี่ยวกับวิธีการส่งเมลของคุณ ถ้าไม่มั่นใจให้ลองถามผู้ดูแลระบบ "
 "หรือผู้ให้บริการอินเทอร์เน็ตของคุณ"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13301,42 +13060,38 @@ msgstr ""
 "กรุณาป้อนข้อมูลชื่อและที่อยู่อีเมลของคุณด้านล่างนี้ ส่วนในช่อง \"ข้อมูลเสริม\" นั้น "
 "คุณไม่จำเป็นต้องเติมข้อมูล เว้นเสียแต่ว่าคุณอยากจะให้ข้อมูลนั้นปรากฏอยู่ในอีเมลที่คุณส่ง"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "กรุณาเลือกตัวเลือกในกลุ่มข้างล่างนี้"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ถามก่อนส่งข้อความที่มีแต่ผู้รับสำเนา_ลับล้วนๆ"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "อ้างคำพูดเดิม"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "อ้างคำพูด"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_จำรหัสผ่าน"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_ที่อยู่ตอบกลับ:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "จำ_รหัสผ่าน"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "เ_ลือก..."
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_end message receipts:"
-msgstr "_ส่งการแจ้งรับข้อความ:"
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "แบบอักษร_มาตรฐาน:"
@@ -13365,57 +13120,61 @@ msgstr "เลือกแบบอักษรความกว้างไม
 msgid "Select sound file"
 msgstr "เลือกแฟ้มเสียง"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "ส่งการแจ้งรับข้อความ:"
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "การส่งเมล"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "โ_ฟลเดอร์ข้อความออก:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "เซิร์ฟเวอร์ต้องการการ_ยืนยันตัวบุคคล"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "_ชนิดเซิร์ฟเวอร์:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "ใบ_รับรองลายเซ็น:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_ลายเซ็น:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "ลายเซ็น"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "ตารางลายเซ็น"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_ระบุชื่อแฟ้ม:"
 
-#: ../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 "_ชนิด:"
 
-#: ../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"
@@ -13424,7 +13183,7 @@ msgstr ""
 "ผลลัพธ์ของสคริปต์นี้จะถูกใช้เป็นลายเซ็นของคุณ\n"
 "ชื่อที่คุณกำหนด จะใช้เพื่อแสดงเมื่ออ้างอิงถึงเท่านั้น"
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13432,15 +13191,15 @@ msgstr ""
 "กรุณาป้อนชื่อที่คุณต้องการใช้เรียกบัญชีนี้\n"
 "ตัวอย่างเช่น: \"งาน\" หรือ \"ส่วนบุคคล\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "_ชื่อผู้ใช้:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "ความกว้างไ_ม่คงที่:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13450,71 +13209,67 @@ msgstr ""
 "\n"
 "คลิก \"ถัดไป\" เพื่อเริ่ม "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "เ_พิ่มลายเซ็น"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "โหลดรูปภาพจากอินเทอร์เน็ตเ_สมอ"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "ไ_ม่ต้องเตือนเมื่อมีเมลเข้ามา"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ไ_ม่ต้องเซ็นกำกับการร้องขอเกี่ยวกับการประชุม (เพื่อความเข้ากันได้กับ Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "รูปแบบการส่งเมล_ต่อ:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "โ_หลดรูปภาพเฉพาะในเมลที่มาจากผู้ติดต่อ"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_กำหนดให้เป็นบัญชีหลัก"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "ทำเครื่องหมายข้อความว่า_อ่านแล้วหลังจาก"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "ไ_ม่โหลดรูปภาพจากอินเทอร์เน็ต"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_พาธ:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../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:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ถามก่อนส่งข้อความที่ไม่มี_หัวข้อเรื่อง"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "รูปแบบการตอ_บ:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_สคริปต์:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Show image animations"
 msgstr "แ_สดงภาพเคลื่อนไหว"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_จำกัดที่อยู่ส่วนหัว ถึง / สำเนาถึง / สำเนาลับถึง ไม่เกิน"
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "ใ_ช้การเชื่อมต่อแบบนิรภัย:"
@@ -13523,24 +13278,14 @@ msgstr "ใ_ช้การเชื่อมต่อแบบนิรภั�
 msgid "_Use the same fonts as other applications"
 msgstr "ใ_ช้แบบอักษรเหมือนโปรแกรมอื่นๆ"
 
-# in "_Shrink To / Cc / Bcc headers to ... addresses"
-# -> "_จำกัดที่อยู่ส่วนหัว ถึง / สำเนาถึง / สำเนาลับถึง ไม่เกิน ... รายการ"
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "รายการ"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr " "
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "คำอธิบาย"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>แหล่งสำหรับโฟลเดอร์ค้นหา</b>"
@@ -13554,63 +13299,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">การเข้ารหัส</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "โฟลเดอร์ระยะไกลที่ใช้งานอยู่ทั้งหมด"
-
-#: ../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
 msgid "Case _sensitive"
 msgstr "ตัวพิมพ์ใหญ่-เ_ล็กตรงกัน"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "เ_สร็จแล้ว"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "_หา:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 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:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "ปักธงเพื่อตามกระทู้"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "การบอกรับข้อมูลของโฟลเดอร์"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "ข้อตกลงสัญญาอนุญาต"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "ไม่ได้เลือก"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "เ_ซิร์ฟเวอร์:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "ข้อมูลระบบรักษาความปลอดภัย"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "เจาะจงโฟลเดอร์"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13618,42 +13347,67 @@ msgstr ""
 "ข้อความต่อไปนี้ คือข้อความที่คุณเลือกไว้เพื่อติดตามกระทู้\n"
 "กรุณาเลือกปฏิบัติการติดตามกระทู้จากเมนู \"ธง\""
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_ยอมรับสัญญาอนุญาต"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "กระทำ_ภายใน:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_ธง:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Subscribe"
+msgstr "_บอกรับข้อมูล"
+
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_กาที่นี่เพื่อยอมรับข้อตกลงในสัญญาอนุญาต"
 
+#: ../mail/mail-dialogs.glade.h:24
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "เ_ลิกบอกรับ"
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "เจาะจงโฟลเดอร์"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "รวมโฟลเดอร์ระยะไกลที่ใช้งานอยู่ทั้งหมด"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "รวมโฟลเดอร์ในเครื่องและโฟลเดอร์ระยะไกลที่ใช้อยู่ทั้งหมด"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "รวมโฟลเดอร์ในเครื่องทั้งหมด"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "กำลัง ping %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "กำลังกรองโฟลเดอร์"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "กำลังดึงเมล"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ไม่สามารถใช้ตัวกรองกรองเมลออกได้: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13662,114 +13416,123 @@ msgstr ""
 "ไม่สามารถเพิ่มข้อมูลต่อท้าย %s ได้: %s\n"
 "จะเพิ่มต่อท้ายโฟลเดอร์ `ส่งแล้ว' ในเครื่องแทน"
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ไม่สามารถเพิ่มข้อมูลต่อท้ายโฟลเดอร์ `ส่งแล้ว' ในเครื่องได้: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "กำลังส่ง %d ข้อความ จาก %d ข้อความ"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ไม่สามารถส่ง %d ข้อความ จาก %d ข้อความ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "ยกเลิก"
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "เสร็จแล้ว"
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "กำลังบันทึกข้อความไปยังโฟลเดอร์"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "กำลังย้ายข้อความไปยัง %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "กำลังคัดลอกข้อความไปยัง %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "ข้อความส่งต่อ"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "กำลังเปิดโฟลเดอร์ %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "กำลังลบโฟลเดอร์ %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "กำลังเก็บข้อมูลของโฟลเดอร์ '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "กำลังเก็บกวาดและเก็บข้อมูลของบัญชี '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "กำลังเก็บข้อมูลของบัญชี '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "กำลังโหลดโฟลเดอร์ใหม่"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "กำลังเก็บกวาดโฟลเดอร์"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "กำลังเทขยะใน '%s' ทิ้ง"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr ""
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "กำลังดึงข้อความ %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "กำลังดึง %d ข้อความ"
 msgstr[1] "กำลังดึง %d ข้อความ"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "กำลังบันทึก %d ข้อความ"
 msgstr[1] "กำลังบันทึก %d ข้อความ"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"ไม่สามารถสร้างแฟ้มผลลัพธ์: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13778,11 +13541,11 @@ msgstr ""
 "เกิดข้อผิดพลาดขณะบันทึกข้อความไปยัง: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "กำลังบันทึกเอกสารแนบ"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13791,69 +13554,60 @@ msgstr ""
 "ไม่สามารถสร้างแฟ้มผลลัพธ์: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ไม่สามารถเขียนข้อมูล: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "กำลังตัดการเชื่อมต่อจาก %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "กำลังเชื่อมต่อใหม่ไปยัง %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "กำลังตรวจสอบบริการ"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "กำลังยกเลิก..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "รับ & ส่งเมล"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "ยกเ_ลิกทั้งหมด"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "กำลังอัพเดต..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "กำลังรอ..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "กำลังตรวจสอบเมลใหม่"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "ป้อนวลีรหัสผ่านสำหรับ %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "ป้อนวลีรหัสผ่าน"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ป้อนรหัสผ่านสำหรับ %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "ป้อนรหัสผ่าน"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "ผู้ใช้ยกเลิกปฏิบัติการ"
 
@@ -13866,7 +13620,7 @@ msgid "Enter a name for this signature."
 msgstr "กรุณาป้อนชื่อสำหรับลายเซ็นนี้"
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "ชื่อ:"
 
@@ -13909,11 +13663,11 @@ msgstr "กำลังอัพเดตโฟลเดอร์ค้นหา
 msgid "Updating Search Folders for '%s'"
 msgstr "กำลังอัพเดตโฟลเดอร์ค้นหาสำหรับ '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "แก้ไขโฟลเดอร์ค้นหา"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "สร้างโฟลเดอร์ค้นหาใหม่"
 
@@ -13927,132 +13681,132 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"quit.\n"
 msgstr ""
 "มีโฟลเดอร์ซึ่งมีข้อมูลอยู่ที่ &quot;{1}&quot; อยู่ก่อนแล้ว\n"
 "\n"
-"คุณสามารถข้ามโฟลเดอร์นี้ไป เขียนทับ หรือเขียนต่อท้ายข้อมูลเดิมหรือเลิกทำก็ได้"
+"คุณสามารถข้ามโฟลเดอร์นี้ไป เขียนทับ หรือเขียนต่อท้ายข้อมูลเดิมหรือเลิกทำก็ได้\n"
 
-#: ../mail/mail.error.xml.h:5
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
 msgstr "&quot;{1}&quot; ร้องขอการแจ้งรับข้อความ จะแจ้งกลับไปยัง {0} หรือไม่?"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr "มีลายเซ็นชื่อ &quot;{0}&quot; อยู่แล้ว กรุณาใช้ชื่ออื่น"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 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 "คุณแน่ใจหรือไม่ ว่าต้องการลบบัญชีนี้ พร้อมทั้งตัวแทนทั้งหมด?"
+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 "คุณแน่ใจหรือไม่ ว่าต้องการงดใช้บัญชีนี้ พร้อมทั้งลบตัวแทนทั้งหมด?"
+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?"
 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;{0}&quot; ทิ้งอย่างถาวร?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "คุณแน่ใจหรือไม่ ว่าต้องการส่งข้อความในรูปแบบ 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 "คุณแน่ใจหรือไม่ ว่าต้องการส่งข้อความที่มีแต่ผู้รับสำเนาลับล้วนๆ?"
 
-#: ../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
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "เพราะ &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "เพราะ &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "ลายเซ็นเปล่า"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "ไม่สามารถเพิ่มโฟลเดอร์ค้นหา &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ไม่สามารถคัดลอกโฟลเดอร์ &quot;{0}&quot; ไปยัง &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "ไม่สามารถสร้างโฟลเดอร์ &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "ไม่สามารถสร้างไดเรกทอรีบันทึกชั่วคราว"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "ไม่สามารถสร้างไดเรกทอรีบันทึก เนื่องจาก &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "ไม่สามารถลบโฟลเดอร์ &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "ไม่สามารถลบโฟลเดอร์ระบบ &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "ไม่สามารถแก้ไขโฟลเดอร์ค้นหา &quot;{0}&quot; เพราะไม่มีโฟลเดอร์ที่ว่า"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ไม่สามารถย้ายโฟลเดอร์ &quot;{0}&quot; ไปยัง &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14061,31 +13815,31 @@ msgstr ""
 "ไม่สามารถอ่านแฟ้มสัญญาอนุญาต &quot;{0}&quot; เนื่องจากปัญหาเกี่ยวกับการติดตั้ง "
 "คุณจะไม่สามารถใช้แบ็กเอนด์นี้ได้ จนกว่าคุณจะยอมรับเงื่อนไขสัญญาอนุญาตนี้"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ไม่สามารถเปลี่ยนชื่อ &quot;{0}&quot; เป็น &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "ไม่สามารถเปลี่ยนชื่อหรือย้ายโฟลเดอร์ระบบ &quot;{0}&quot; ได้"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "ไม่สามารถบันทึกความเปลี่ยนแปลงในบัญชี"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "ไม่สามารถบันทึกในไดเรกทอรี &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "ไม่สามารถบันทึกลงแฟ้ม &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "ไม่สามารถกำหนดสคริปต์ลายเซ็น &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14094,111 +13848,111 @@ msgstr ""
 "อย่าลืมว่ารหัสผ่านส่วนใหญ่แยกความแตกต่างระหว่างตัวพิมพ์ใหญ่-เล็ก "
 "บางทีปุ่มล็อคแคร่ของคุณอาจจะถูกกดค้างอยู่"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "ไม่สามารถบันทึกแฟ้มลายเซ็นได้"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "ลบ &quot;{0}&quot; หรือไม่?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "ลบบัญชีหรือไม่?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Discard changes?"
 msgstr "ละเลยการเปลี่ยนแปลงหรือไม่?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "ไม่ลบ"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "ไม่ปิดใช้งาน"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "คุณต้องการทำปฏิบัติการนี้กับโฟลเดอร์ย่อยต่างๆ ด้วยหรือไม่?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "คุณต้องการทำเครื่องหมายทุกข้อความว่าอ่านแล้วหรือไม่?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "คุณต้องการบันทึกการเปลี่ยนแปลงของคุณหรือไม่?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "ป้อนรหัสผ่าน"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "เกิดข้อผิดพลาดระหว่างอ่านข้อกำหนดตัวกรอง"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "เกิดข้อผิดพลาดระหว่างกระทำปฏิบัติการ"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "เกิดข้อผิดพลาดขณะ{0}"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "แฟ้มมีอยู่แต่ไม่สามารถเขียนทับได้"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "แฟ้มมีอยู่แต่ไม่ใช่แฟ้มปกติ"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ถ้าดำเนินการต่อไป คุณจะไม่สามารถเรียกข้อความเหล่านี้คืนมาได้อีก"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "ถ้าคุณลบโฟลเดอร์ เนื้อหาทั้งหมดในโฟลเดอร์และโฟลเดอร์ย่อยจะถูกลบทิ้งอย่างถาวร"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "ถ้าคุณดำเนินการต่อไป ข้อมูลบัญชีตัวแทนทั้งหมดจะถูกลบทิ้งอย่างถาวร"
+msgstr "ถ้าคุณดำเนินการต่อไป ข้อมูลบัญชีพร็อกซีทั้งหมดจะถูกลบทิ้งอย่างถาวร"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
-"ถ้าคุณดำเนินการต่อไป ข้อมูลบัญชีผู้ใช้และตัวแทนทั้งหมด\n"
+"ถ้าคุณดำเนินการต่อไป ข้อมูลบัญชีผู้ใช้และพร็อกซีทั้งหมด\n"
 "จะถูกลบทิ้งอย่างถาวร"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ถ้าคุณดำเนินการต่อไป ข้อมูลบัญชีผู้ใช้จะถูกลบทิ้งอย่างถาวร"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "ถ้าคุณหยุด ข้อความเหล่านี้จะไม่ถูกส่งไป จนกว่า Evolution จะเริ่มทำงานใหม่อีก"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "ไม่สนใจ"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "การยืนยันตัวบุคคลไม่ถูกต้อง"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "ปรับข้อมูลตัวกรองเมลโดยอัตโนมัติแล้ว"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14209,17 +13963,13 @@ msgstr ""
 "ซึ่งข้อมูลนี้จะแสดงผู้รับทั้งหมดของข้อความอยู่ดี คุณสามารถเลี่ยงการแสดงข้อมูลดังกล่าวได้ "
 "โดยเพิ่มผู้รับในช่อง ถึง: หรือ สำเนา: อย่างน้อยหนึ่งคน"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 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 "ทำเครื่องหมายว่า_อ่านแล้ว"
+msgid "Mark all messages as read in the selected folder"
+msgstr "ทำเครื่องหมายว่าทุกข้อความอ่านแล้วในโฟลเดอร์ที่เลือก"
 
 #: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
@@ -14302,8 +14052,8 @@ msgstr "ลายเซ็นมีอยู่แล้ว"
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 "Evolution จำเป็นต้องใช้โฟลเดอร์ระบบ จึงจะทำงานได้อย่างถูกต้อง จึงไม่สามารถเปลี่ยนชื่อ ย้าย "
 "หรือลบได้"
@@ -14352,10 +14102,22 @@ msgstr ""
 "และได้ปรับข้อมูลใหม่แล้ว"
 
 #: ../mail/mail.error.xml.h:104
+msgid ""
+"The message was sent via the &quot;sendmail&quot; external application. "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
+msgstr ""
+"ได้ส่งข้อความผ่าน &quot;sendmail&quot; ซึ่งเป็นโปรแกรมภายนอกแล้ว ปรากฏว่า sendmail "
+"รายงานข้อผิดพลาดดังนี้: สถานะ 67: ไม่ได้ส่งเมล\n"
+"ข้อความดังกล่าวถูกเก็บไว้ที่กล่องจดหมายออก กรุณาตรวจสอบข้อผิดพลาดได้ในข้อความดังกล่าว "
+"แล้วลองส่งใหม่"
+
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "สคริปต์ต้องมีอยู่ และต้องสามารถเรียกทำงานได้"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14363,77 +14125,77 @@ msgstr ""
 "โฟลเดอร์ดังกล่าวอาจถูกเพิ่มเข้ามาโดยนัย\n"
 "กรุณาไปที่เครื่องมือแก้ไขโฟลเดอร์ค้นหาเพื่อเพิ่มโฟลเดอร์ดังกล่าวอย่างชัดแจ้ง หากต้องการ"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:109
 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:110
 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:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "เซิร์ฟเวอร์นี้ไม่สนับสนุนการยืนยันตัวบุคคลวิธีนี้ และอาจไม่สนับสนุนการยืนยันตัวบุคคลวิธีใดเลย"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "ลายเซ็นนี้มีการเปลี่ยนแปลง แต่ยังไม่ได้บันทึก"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:113
 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:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์ GroupWise"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 "ไม่สามารถเปิดโฟลเดอร์จดหมายร่างสำหรับบัญชีนี้ได้ จะใช้โฟลเดอร์จดหมายร่างของระบบแทนหรือไม่?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "ไม่สามารถอ่านแฟ้มสัญญาอนุญาต"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "ใช้โฟลเดอร์_ปริยาย"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "ใช้โฟลเดอร์จดหมายร่างปริยายหรือไม่?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr "คุณเติมข้อมูลบังคับไม่ครบ"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "คุณมีข้อความที่ยังไม่ได้ส่ง คุณต้องการออกจากโปรแกรมหรือไม่?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "คุณไม่สามารถสร้างสองบัญชีด้วยชื่อเดียวกันได้"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "คุณต้องตั้งชื่อโฟลเดอร์ค้นหานี้ด้วย"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "คุณต้องระบุโฟลเดอร์"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14443,99 +14205,99 @@ msgstr ""
 "อาจจะโดยเลือกเป็นรายโฟลเดอร์ และ/หรือ โดยเลือกโฟลเดอร์ในเครื่องทั้งหมด "
 "โฟลเดอร์ในเครือข่ายทั้งหมด หรือทั้งสองอย่าง"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "การลงบันทึกเข้าใช้เซิร์ฟเวอร์ &quot;{0}&quot; ของคุณในชื่อ &quot;{0}&quot; ล้มเหลว"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+msgstr "ข้อความหัวข้อ &quot;{0}&quot; ของคุณยังไม่ได้ส่ง"
+
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "เ_พิ่มต่อท้าย"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "ไ_ม่สนใจการเปลี่ยนแปลง"
 
-#: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "ไ_ม่ต้องทำเครื่องหมายว่าอ่านแล้ว"
-
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "เ_ก็บกวาด"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "เ_ปิดข้อความ"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "ยังไม่อ่าน"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "อ่านแล้ว"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "ตอบแล้ว"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "ข้อความยังไม่อ่านหลายฉบับ"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "ข้อความหลายฉบับ"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "ต่ำที่สุด"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "ต่ำกว่า"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "สูงกว่า"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "สูงที่สุด"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "วันนี้ %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "เมื่อวาน %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Ey"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "ข้อความ"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "กำลังสร้างรายการข้อความ"
 
@@ -14555,15 +14317,15 @@ msgstr "ปักธง"
 msgid "Follow Up Flag"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:10
-msgid "Received"
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "ข้อความที่ส่ง"
+#: ../mail/message-list.etspec.h:9
+msgid "Received"
+msgstr ""
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "ขนาด"
@@ -14712,10 +14474,6 @@ msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "เพิ่มรายการในสมุดที่อยู่โดย_อัตโนมัติเมื่อตอบเมล"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "เลือกสมุดที่อยู่สำหรับที่อยู่ติดต่ออัตโนมัติ"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "ที่อยู่ติดต่อสำหรับข้อความทันใจ"
@@ -14726,10 +14484,6 @@ msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "ปรับข้อมูลที่อยู่ติดต่อและรูปภาพกับรายการของ gaim เป็นระยะ"
 
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "เลือกสมุดที่อยู่สำหรับคู่สนทนาของ Gaim"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -14835,6 +14589,10 @@ msgid ""
 "things to the clipboard."
 msgstr "ปลั๊กอินทดสอบ ซึ่งสาธิตปลั๊กอินแบบผุดเมนู ให้คุณคัดลอกสิ่งต่างๆ ลงคลิปบอร์ด"
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "_คัดลอกที่อยู่อีเมล"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "เครื่องมือคัดลอก"
@@ -14944,7 +14702,7 @@ msgid "Change the password for Exchange account"
 msgstr "เปลี่ยนรหัสผ่านสำหรับบัญชี Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
@@ -14976,24 +14734,24 @@ msgstr "ขนาดของโฟลเดอร์"
 msgid "Exchange Settings"
 msgstr "ค่าตั้ง Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "ยื_นยันตัวบุคคล"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "ชนิดของการยืนยันตัวบุคคล"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "_ตรวจสอบชนิดที่สนับสนุน"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-calendar.c:193
+#: ../plugins/exchange-operations/exchange-contacts.c:167
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15014,31 +14772,29 @@ msgstr "รหัสผ่านปัจจุบันไม่ตรงกั
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "รหัสผ่านทั้งสองอันไม่ตรงกัน กรุณาป้อนรหัสผ่านใหม่"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "ยืนยันรหัสผ่าน:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "รหัสผ่านปัจจุบัน"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
 msgstr "รหัสผ่านใหม่:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr "รหัสผ่านของคุณได้หมดอายุลงแล้ว กรุณาเปลี่ยนรหัสผ่านทันที"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, 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
 msgid "Custom"
 msgstr "กำหนดเอง"
 
@@ -15158,7 +14914,7 @@ msgstr "ชื่อโฟลเดอร์"
 msgid "Folder Size"
 msgstr "ขนาดของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "บอกรับข้อมูลจากโฟลเดอร์ผู้ใช้อื่น"
@@ -15173,14 +14929,14 @@ msgstr "ลำดับชั้นโฟลเดอร์ Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "เลิกบอกรับข้อมูลโฟลเดอร์..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "เลิกบอกรับข้อมูลจากโฟลเดอร์ \"%s\" จริงหรือไม่?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "เลิกบอกรับข้อมูลจาก \"%s\""
@@ -15213,66 +14969,62 @@ msgstr "เพิ่มผู้ใช้:"
 msgid "Add User"
 msgstr "เพิ่มผู้ใช้"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>การกำหนดสิทธิ์</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "ห้ามลบ"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "ห้ามแก้ไข"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "สร้างรายการ"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "สร้างโฟลเดอร์ย่อย"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "ลบรายการใดๆ"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "ลบรายการของตนเอง"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "แก้ไขรายการใดๆ"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "แก้ไขรายการของตนเอง"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "ที่อยู่ติดต่อในโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "เจ้าของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "มองเห็นโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "อ่านรายการ"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "บทบาท:"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "ไม่ ไม่ต้องเปลี่ยนสถานะ"
-
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 msgid "Select User"
 msgstr "เลือกผู้ใช้"
@@ -15308,26 +15060,21 @@ msgid "Cannot display folders."
 msgstr "ไม่สามารถแสดงโฟลเดอร์"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-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."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"การเปลี่ยนแปลงค่าตั้งในบัญชี Exchange \"{0}\" จะมีผลหลังจากที่ Evolution "
-"เริ่มทำงานใหม่เท่านั้น"
+"การเปลี่ยนแปลงค่าตั้งในบัญชี Exchange จะมีผลหลังจากที่คุณออกจาก Evolution และเข้าใหม่"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "ไม่สามารถยืนยันตัวบุคคลกับเซิร์ฟเวอร์"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "ไม่สามารถเปลี่ยนรหัสผ่าน"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15337,55 +15084,55 @@ msgstr ""
 "ไม่ทราบสาเหตุ กรุณาตรวจสอบ URL, ชื่อผู้ใช้ \n"
 "และรหัสผ่าน แล้วลองใหม่"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์ Exchange"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์ {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "ไม่สามารถพิจารณาสิทธิ์ในโฟลเดอร์ของผู้รับมอบฉันทะ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "ไม่พบระบบแหล่งเก็บในเว็บของ Exchange"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "หาตำแหน่งเซิร์ฟเวอร์ {0} ไม่พบ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "ไม่สามารถอ่านค่าการกำหนดสิทธิ์ของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "ไม่สามารถอ่านค่าการกำหนดสิทธิ์ของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "ไม่สามารถอ่านสถานะการไม่อยู่ที่ทำงาน"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "ไม่สามารถอัพเดตการกำหนดสิทธิ์ของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "ไม่สามารถอัพเดตสถานะการไม่อยู่ที่ทำงาน"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 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:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15409,98 +15156,90 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "ไม่สามารถปรับข้อมูลการมอบฉันทะ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "มีโฟลเดอร์อยู่แล้ว"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "ไม่มีโฟลเดอร์ที่อ้าง"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "โฟลเดอร์ออฟไลน์อยู่"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "ข้อผิดพลาดทั่วไป"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-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:38
 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:39
 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:40
 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:41
 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:42
 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:43
 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:44
 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:45
 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:46
 msgid "Password successfully changed."
 msgstr "เปลี่ยนรหัสผ่านสำเร็จแล้ว"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Sever name is correct."
-msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
-msgid "Please restart Evolution for changes to take effect"
-msgstr "กรุณาเริ่ม Evolution ใหม่ เพื่อให้การเปลี่ยนแปลงมีผล"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "กรุณาเริ่ม Evolution ใหม่"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "กรุณาเลือกผู้ใช้"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "เซิร์ฟเวอร์ปฏิเสธรหัสผ่านเพราะเดาง่ายเกินไป"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "บัญชี Exchange จะถูกปิดเมื่อคุณออกจาก Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed 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:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "เซิร์ฟเวอร์ Exchange เข้ากันไม่ได้กับปลั๊กอินเชื่อมต่อ Exchange"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15508,7 +15247,7 @@ msgstr ""
 "เซิร์ฟเวอร์ใช้ Exchange 5.5 ในขณะที่ปลั๊กอินเชื่อมต่อ Exchange \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:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15521,63 +15260,63 @@ msgstr ""
 "\n"
 "หรือคุณอาจแค่ป้อนรหัสผ่านผิดเท่านั้นเอง"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "กรุณาลองตั้งรหัสผ่านใหม่"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "ไม่สามารถเพิ่มผู้ใช้ในรายการควบคุมการเข้าถึง:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "ไม่สามารถแก้ไขการมอบฉันทะ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 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:65
 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:66
 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:67
 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:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "คุณใช้โควตาสำหรับเก็บเมลในเซิร์ฟเวอร์นี้ใกล้จะเต็มแล้ว"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "คุณไม่สามารถมอบฉันทะการประชุมให้ตัวเองได้"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "คุณได้ใช้เนื้อที่เก็บเมลในเซิร์ฟเวอร์นี้เกินโควตาที่กำหนดแล้ว"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "คุณกำหนดค่าบัญชี Exchange ได้เพียงบัญชีเดียวเท่านั้น"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "การใช้งานของคุณขณะนี้คือ: {0} KB  กรุณาเคลียร์เนื้อที่โดยลบเมลบางส่วน"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "การใช้งานของคุณขณะนี้คือ: {0} KB  คุณจะไม่สามารถรับหรือส่งเมลได้"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15585,19 +15324,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:75
 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:77
 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:78
 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:79
 msgid "{0} is already in the list"
 msgstr "{0} อยู่ในรายชื่ออยู่แล้ว"
 
@@ -15622,17 +15361,7 @@ msgstr "ช่วยเลิกบอกรับข้อมูลโฟลเ
 msgid "Unsubscribe Folders"
 msgstr "เลิกบอกรับข้อมูลโฟลเดอร์"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "เ_ลิกบอกรับ"
-
-#: ../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
-msgid "Notes"
-msgstr "บันทึกข้อความ"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr ""
 
@@ -15677,21 +15406,13 @@ msgstr "_เปิดใช้งาน"
 msgid "_Junk List"
 msgstr "รายการเมล_ขยะ"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
-msgid "Message retracted successfully"
-msgstr ""
-
-#: ../plugins/groupwise-features/mail-retract.c:60
-msgid "Retract Mail"
-msgstr ""
-
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "ตัวเลือกของการส่ง"
 
@@ -15707,40 +15428,40 @@ msgstr "การใช้งาน Groupwise"
 msgid "Accept Tentatively"
 msgstr "อาจตอบรับ"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>ผู้ใช้:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 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
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_ที่อยู่ติดต่อ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "_กำหนดข้อความแจ้งเหตุ"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "ไ_ม่ให้ใช้ร่วม"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "ให้ใช่_ร่วมโดย ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "การใ_ช้ร่วม"
 
@@ -15791,7 +15512,7 @@ msgstr "เ_ขียน"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
-msgstr "ตัวแทน"
+msgstr "พร็อกซี"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
@@ -15799,7 +15520,7 @@ msgstr "<b>ชื่อบัญชี</b>"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 msgid "Proxy Login"
-msgstr "ลงบันทึกเข้าใช้ในฐานะตัวแทน"
+msgstr "ลงบันทึกเข้าใช้พร็อกซี"
 
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:263
@@ -15809,20 +15530,17 @@ msgstr "ลงบันทึกเข้าใช้ในฐานะตัว
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sป้อนรหัสผ่านสำหรับ %s (ผู้ใช้ %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
-msgstr "ลงบันทึกเข้าใช้ในฐานะ_ตัวแทน..."
+msgstr "ลงบันทึกเข้าใช้_พร็อกซี..."
 
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "แท็บตัวแทนจะใช้ได้ก็ต่อเมื่อบัญชีออนไลน์อยู่"
+msgstr "แท็บพร็อกซีจะใช้ได้ก็ต่อเมื่อบัญชีออนไลน์"
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "แท็บตัวแทนจะใช้ได้ก็ต่อเมื่อบัญชีเปิดใช้"
+msgstr "แท็บพร็อกซีจะใช้ได้ก็ต่อเมื่อบัญชีเปิดใช้"
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
@@ -15873,12 +15591,12 @@ msgid "Select Calendar"
 msgstr "เลือกปฏิทิน"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_นำเข้า"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "รูปแบบ iCalendar (.ics)"
 
@@ -15930,126 +15648,126 @@ msgstr "ไม่สามารถเปิดปฏิทิน/รายก�
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "ไม่สามารถเปิดปฏิทิน/รายการที่จะทำของ Evolution เพื่อส่งออกข้อมูล"
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "ไม่สามารถเปิดปฏิทิน '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "มีนัดหมายในปฏิทิน '%s' ชนกับการประชุมนี้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "พบนัดหมายในปฏิทิน '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "ไม่พบปฏิทินใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "ไม่พบการประชุมนี้ในปฏิทินใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "ไม่พบงานนี้ในรายการงานใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "กำลังค้นหานัดหมายนี้ที่บันทึกไว้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "ไม่สามารถแจงรายการได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ไม่สามารถส่งรายการไปยังปฏิทิน '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ส่งไปยังปฏิทิน '%s' ว่าตอบรับ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ส่งไปยังปฏิทิน '%s' ว่าอาจตอบรับ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ส่งไปยังปฏิทิน '%s' ว่าปฏิเสธ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ส่งไปยังปฏิทิน '%s' ว่ายกเลิก"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ผู้ประสานงานได้ลบผู้รับมอบฉันทะ %s ออก"
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ส่งประกาศการยกเลิกไปยังผู้รับมอบฉันทะแล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ไม่สามารถส่งประกาศการยกเลิกไปยังผู้รับมอบฉันทะ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ไม่สามารถปรับข้อมูลสถานะผู้เข้าร่วมประชุมได้ เนื่องจากสถานะเป็นค่าที่ใช้ไม่ได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ไม่สามารถปรับข้อมูลผู้เข้าร่วม %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "ปรับข้อมูลผู้เข้าร่วมเรียบร้อยแล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "ปฏิทินใช้การไม่ได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ข้อความอ้างว่ามีปฏิทิน แต่ตัวปฏิทินไม่ใช่ iCalendar ที่ใช้การได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "รายการในปฏิทินไม่ถูกต้อง"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "ข้อความมีปฏิทินมาด้วย แต่ตัวปฏิทินไม่มีข้อมูลเหตุการณ์ งาน หรือสถานะว่าง/ไม่ว่างใดๆ เลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "ปฏิทินที่แนบมามีรายการหลายรายการ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16057,422 +15775,384 @@ msgstr "เพื่อจะดำเนินงานรายการทั
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_ลบข้อความหลังจากทำแล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "การค้นหาการชนกัน"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "เลือกปฏิทินที่จะค้นหาการประชุมที่ชนกัน"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "วันนี้"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "วันนี้ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "วันนี้ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:202
 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:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "พรุ่งนี้"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "พรุ่งนี้ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 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:228
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "พรุ่งนี้ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "พรุ่งนี้ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 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:284
+#: ../plugins/itip-formatter/itip-view.c:282
 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:288
+#: ../plugins/itip-formatter/itip-view.c:286
 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:293
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 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:303
+#: ../plugins/itip-formatter/itip-view.c:301
 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:308
+#: ../plugins/itip-formatter/itip-view.c:306
 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:312
+#: ../plugins/itip-formatter/itip-view.c:310
 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:317
+#: ../plugins/itip-formatter/itip-view.c:315
 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:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Ey %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> ได้แจ้งผ่าน %s ประกาศข้อมูลการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ได้ประกาศข้อมูลการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ได้มอบฉันทะการประชุมต่อไปนี้ให้กับคุณ:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> แจ้งผ่าน %s ขอให้คุณเข้าร่วมการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ขอให้คุณเข้าร่วมการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> แจ้งผ่าน %s ขอเพิ่มเติมข้อมูลในการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ขอเพิ่มเติมข้อมูลในการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ต้องการข้อมูลล่าสุดของการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ได้ส่งคำตอบสำหรับการประชุมกลับมาดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> แจ้งผ่าน %s ขอยกเลิกการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ได้ยกเลิกการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ได้เสนอขอเปลี่ยนแปลงการประชุมดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> ได้เสนอผ่าน %s ขอเปลี่ยนแปลงการประชุมดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ได้ปฏิเสธการเปลี่ยนแปลงการประชุมต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ได้แจ้งผ่าน %s ประกาศงานต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ได้ประกาศงานต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, 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:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ได้แจ้งผ่าน %s ขอมอบหมายงานให้กับคุณ:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ได้มอบหมายงานให้กับคุณ:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> แจ้งผ่าน %s ขอเพิ่มเติมข้อมูลในงานต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ขอเพิ่มเติมข้อมูลในงานต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> ต้องการข้อมูลล่าสุดของงานที่มีการมอบหมายต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ได้ส่งคำตอบสำหรับงานที่มีการมอบหมายกลับมาดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> ได้แจ้งผ่าน %s ยกเลิกงานที่มีการมอบหมายต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ได้ยกเลิกงานที่มีการมอบหมายต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ได้เสนอเปลี่ยนแปลงงานที่มีการมอบหมายดังนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, 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:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ได้ปฏิเสธการมอบหมายงานต่อไปนี้:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> ได้แจ้งผ่าน %s ประกาศบันทึกช่วยจำต่อไปนี้:"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> ได้ประกาศบันทึกช่วยจำต่อไปนี้:"
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, 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:491
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> ขอเพิ่มเติมข้อมูลในบันทึกช่วยจำต่อไปนี้:"
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, 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:497
-#, 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:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "_เปิดปฏิทิน"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "_ปฏิเสธ"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "ตอบ_รับ"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "_ปฏิเสธทั้งหมด"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "_ปฏิเสธ"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "ตอบรับไ_ม่ยืนยันทั้งหมด"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "ตอบรับไ_ม่ยืนยัน"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "ตอบ_รับทั้งหมด"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "_ส่งข้อมูล"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "_ปรับข้อมูลสถานะผู้เข้าร่วมประชุม"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "_ปรับข้อมูล"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "เวลาเริ่ม:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "เวลาสิ้นสุด:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "หมายเหตุ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "ส่งการ_ปรับข้อมูลไปยังผู้ร่วมประชุม"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "ใช้กับ_ทุกรอบที่เวียนซ้ำ"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "_งาน :"
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "บันทึกช่วยจำ :"
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "แสดงส่วนข้อมูล text/calendar ในข้อความ"
@@ -16484,7 +16164,7 @@ msgstr "ปลั๊กอินจัดแสดง Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; ได้มอบฉันทะการประชุม คุณต้องการเพิ่มผู้รับมอบฉันทะ &quot;{1}&quot; "
 "หรือไม่?"
@@ -16500,7 +16180,7 @@ msgstr "คำตอบนี้ไม่ได้มาจากผู้ร่
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
-msgstr "_ออกจากการเข้าระบบในฐานะตัวแทน"
+msgstr "เลิกใช้_พร็อกซี"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
 msgid "Allows disabling of accounts."
@@ -16571,14 +16251,17 @@ msgid "Convert the selected message to a new task"
 msgstr "แปลงข้อความที่เลือกเป็นงานชิ้นใหม่"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "ติดต่อเ_จ้าของลิสต์"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
 msgstr "ดู_กรุข้อความเก่าของลิสต์"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "ดูข้อมูล_วิธีใช้ของลิสต์"
 
@@ -16598,14 +16281,17 @@ msgid ""
 msgstr "ปฏิบัติการสำหรับคำสั่งปกติของเมลลิงลิสต์ (สมัครสมาชิก, ยกเลิกการสมัคร, ...)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_ส่งข้อความเข้าลิสต์"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "ส_มัครเข้าลิสต์"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "ยกเ_ลิกการสมัครเข้าลิสต์"
 
@@ -16686,27 +16372,15 @@ msgstr "แ_ก้ไขข้อความ"
 msgid "_Send message"
 msgstr "_ส่งข้อความ"
 
-#: ../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 "ติดต่อเจ้าของเมลลิงลิสต์ที่เป็นต้นตอของข้อความนี้"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "ดู_กรุข้อความเก่าของลิสต์"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-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 "ดูกรุข้อความเก่าของลิสต์ที่เป็นต้นตอของข้อความนี้"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ดูข้อมูลเกี่ยวกับวิธีใช้ของลิสต์ที่เป็นต้นตอของข้อความนี้"
 
@@ -16722,24 +16396,12 @@ msgstr "สมัครเป็นสมาชิกของเมลลิง
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "ยกเลิกการสมัครเป็นสมาชิกของเมลลิงลิสต์ที่เป็นต้นตอของข้อความนี้"
 
-#: ../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/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "ทำเครื่องหมายอ่านแล้วทั้งหมด"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "ทำเครื่องหมายทุก_ข้อความว่าอ่านแล้ว"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -16997,16 +16659,16 @@ msgstr "บันทึกเอกสารแนบ ..."
 msgid "Save all attachments"
 msgstr "บันทึกเอกสารแนบทั้งหมด"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "เลือกชื่อต้นสำหรับการบันทึก"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "ชนิด MIME"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "บันทึก"
 
@@ -17116,7 +16778,7 @@ msgid "RDF format (.rdf)"
 msgstr "รูปแบบ RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "เลือกแฟ้มปลายทาง"
 
@@ -17164,19 +16826,19 @@ msgstr ""
 "\n"
 "กรุณากดปุ่ม \"ถัดไป\" เพื่อทำงานต่อ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "กรุณาเลือกข้อมูลที่คุณต้องการนำเข้า:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, 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:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "กำลังนำเข้าข้อมูล"
 
@@ -17230,65 +16892,57 @@ msgid "Default window height"
 msgstr "ความสูงหน้าต่างโดยปริยาย"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-msgid "Default window state"
-msgstr "สถานะของหน้าต่างโดยปริยาย"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "ความกว้างของหน้าต่างโดยปริยาย"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID หรือชื่อเล่นขององค์ประกอบที่จะแสดงโดยปริยายเมื่อเริ่มโปรแกรม"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "รุ่นล่าสุดของการปรับรุ่นค่าตั้ง"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "ค่าตั้งเครื่องพิมพ์"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Sidebar is visible"
 msgstr "แสดงแถบข้าง"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "ข้ามกล่องโต้ตอบเตือนสถานะกำลังพัฒนา"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "เริ่มในโหมดออฟไลน์"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "แสดงแถบสถานะ"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "รุ่นของค่าตั้งของ Evolution ในรูปแบบ รุ่นใหญ่.รุ่นย่อย.ระดับค่าตั้ง (เช่น \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "ความสูงปริยายของหน้าต่างหลัก เป็นพิกเซล"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "ความกว้างปริยายของหน้าต่างหลัก เป็นพิกเซล"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "ความกว้างปริยายของแถบข้าง เป็นพิกเซล"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17296,7 +16950,7 @@ msgstr ""
 "รุ่นล่าสุดของการปรับรุ่นค่าตั้งของ Evolution ในรูปแบบ รุ่นใหญ่.รุ่นย่อย.ระดับค่าตั้ง (เช่น \"2.6.0"
 "\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17305,44 +16959,36 @@ msgstr ""
 "รูปแบบของปุ่มหน้าต่าง สามารถเป็น \"text\", \"icons\", \"both\" หรือ \"toolbar\" "
 "ถ้ากำหนดเป็น \"toolbar\" รูปแบบของปุ่มจะกำหนดโดยค่าตั้งแถบเครื่องมือของ GNOME"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "แสดงแถบเครื่องมือ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "กำหนดว่า Evolution จะเริ่มทำงานในโหมดออฟไลน์แทนโหมดออนไลน์หรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether or not the window should be maximized."
-msgstr "กำหนดว่าจะแสดงหน้าต่างขยายเต็มจอหรือไม่"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether the sidebar should be visible."
 msgstr "กำหนดว่าจะแสดงแถบข้างหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "กำหนดว่าจะแสดงแถบสถานะหรือไม่"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "กำหนดว่าจะแสดงแถบเครื่องมือหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "กำหนดว่าจะข้ามกล่องโต้ตอบเตือนเมื่อใช้ Evolution รุ่นกำลังพัฒนาหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "กำหนดว่าจะแสดงปุ่มต่างๆ ในหน้าต่างหรือไม่"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "รูปแบบของปุ่มหน้าต่าง"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "แสดงปุ่มหน้าต่าง"
 
@@ -17363,11 +17009,11 @@ msgstr "คลิก \"ตกลง\" เพื่อปิดการเชื
 msgid "(Untitled)"
 msgstr "(ไม่มีชื่อ)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "เลือกชนิดของการนำเข้าที่จะทำ:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17379,11 +17025,11 @@ msgstr ""
 "\n"
 "คุณสามารถเลือก \"อัตโนมัติ\" ได้ ถ้าคุณไม่ทราบ แล้ว Evolution จะพยายามตรวจสอบเอง"
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "เลือกปลายทางของการนำเข้านี้"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17394,23 +17040,23 @@ msgstr ""
 "Pine, Netscape, Elm, iCalendar แต่ไม่พบค่าตั้งที่สามารถนำเข้าได้เลย\n"
 "ถ้าคุณต้องการลองใหม่อีกครั้ง กรุณาคลิกปุ่ม \"ย้อนกลับ\"\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "ชื่อแ_ฟ้ม:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "เลือกแฟ้ม"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_ชนิดแฟ้ม:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "นำเข้าข้อมูลและค่าตั้งจากโปรแกรมเ_ก่า"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "นำเข้าแฟ้มแฟ้มเ_ดียว"
 
@@ -17471,7 +17117,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "ทำงานออ_นไลน์"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "ทำงานออ_ฟไลน์"
 
@@ -17479,57 +17125,52 @@ msgstr "ทำงานออ_ฟไลน์"
 msgid "Work Offline"
 msgstr "ทำงานออฟไลน์"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution กำลังออนไลน์อยู่ คุณกดปุ่มนี้ได้เพื่อให้ออฟไลน์"
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution กำลังเปลี่ยนการทำงานเป็นออฟไลน์"
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution กำลังออฟไลน์อยู่ คุณกดปุ่มนี้ได้เพื่อให้ออนไลน์"
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "เปลี่ยนไปที่%s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "ข้อผิดพลาดไม่ทราบสาเหตุของระบบ"
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "อาร์กิวเมนต์ผิดพลาด"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "ไม่สามารถลงทะเบียนกับ OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 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:685
 msgid "New"
 msgstr "สร้างใหม่"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " ใหม่ "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "การทดสอบใหม่"
@@ -17581,7 +17222,7 @@ msgstr ""
 "เข้าสู่ Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17615,7 +17256,7 @@ msgstr ""
 "เราหวังว่าคุณจะพึงพอใจกับผลของการทำงานอย่างหนักของเรา\n"
 "และเรากำลังรอคอยการร่วมสมทบของคุณอย่างใจจดใจจ่อ!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17623,39 +17264,35 @@ msgstr ""
 "ขอขอบคุณ\n"
 "ทีมงาน Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "ไม่ต้องบอกฉันอีก"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "เรียก Evolution โดยเปิดใช้องค์ประกอบที่กำหนด"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "เริ่มทำงานในโหมดออนไลน์"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "บังคับปิดองค์ประกอบทั้งหมดของ Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "บังคับปรับรุ่นข้อมูลใหม่จาก Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "ส่งข้อความดีบั๊กของทุกองค์ประกอบลงแฟ้ม"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "ปิดการโหลดปลั๊กอินใดๆ"
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolution: โปรแกรมจัดการข้อมูลส่วนบุคคลและไคลเอนต์อีเมล"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18070,7 +17707,7 @@ msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr ""
 
@@ -18302,12 +17939,6 @@ 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-tasks.xml.h:2
-msgid "Copy"
-msgstr "คัดลอก"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "คัดลอกที่อยู่ติดต่อที่เลือกไปยังโฟลเดอร์อื่น..."
@@ -18404,12 +18035,12 @@ msgstr "บันทึกที่อยู่ติดต่อที่เล
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "บันทึกที่อยู่ติดต่อของโฟลเดอร์ที่เลือกในรูป VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "เลือกทั้งหมด"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "เลือกทั้ง_หมด"
@@ -18479,7 +18110,7 @@ msgstr "_ย้ายที่อยู่ติดต่อไปยัง..."
 msgid "_Move Folder Contacts To"
 msgstr "_ย้ายที่อยู่ติดต่อในโฟลเดอร์ไปยัง"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "สร้างใ_หม่"
 
@@ -18540,7 +18171,6 @@ msgid "Month"
 msgstr "เดือน"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "ถัดไป"
 
@@ -18549,7 +18179,7 @@ msgid "Previews the calendar to be printed"
 msgstr "แสดงตัวอย่างปฏิทินก่อนพิมพ์"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
@@ -18637,11 +18267,11 @@ msgstr "ตัดส่วนที่เลือกเข้าคลิปบ
 msgid "Paste from clipboard"
 msgstr "แปะจากคลิปบอร์ด"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "แปะข้อความจากคลิปบอร์ด"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "เลือกเนื้อความทั้งหมด"
 
@@ -18676,31 +18306,30 @@ msgstr "คลิกที่นี่เพื่อดูวิธีใช้
 msgid "Close"
 msgstr "ปิด"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "แ_ทรก"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "การแ_นบแฟ้ม..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "ปิ_ด"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "แ_ฟ้ม"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_วิธีใช้"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "แ_ทรก"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_ตัวเลือก"
@@ -18798,11 +18427,6 @@ msgstr "เลือกแสดงเวลาเป็นว่าง/ไม�
 msgid "_Alarms"
 msgstr "การเ_ตือน"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_หมวด"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18868,73 +18492,53 @@ msgid "F_older"
 msgstr "โ_ฟลเดอร์"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "_ตัวอย่างข้อความ"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "ย้ายโฟลเดอร์ที่เลือกไปยังโฟลเดอร์อื่น"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h: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 "โ_ฟลเดอร์ค้นหา"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "แสดง_ตัวอย่างข้อความ"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "แสดงตัวอย่างข้อความใต้รายการข้อความด้วย"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "แสดงตัวอย่างข้อความข้างๆ รายการข้อความด้วย"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "แสดงหน้าต่างแสดงตัวอย่างข้อความ"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "บอกรับหรือเลิกบอกรับข้อมูลจากเซิร์ฟเวอร์ภายนอกให้กับโฟลเดอร์"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "มุมมองแ_บบฉบับ"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_คัดลอกโฟลเดอร์ไปยัง..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "ตัว_กรองข้อความ"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "_ย้ายโฟลเดอร์ไปยัง..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "ใ_หม่..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_ตัวอย่าง"
-
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "การ_บอกรับข้อมูล"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "มุมมองแนว_ตั้ง"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "เปลี่ยนชื่อของโฟลเดอร์นี้"
@@ -19492,10 +19096,6 @@ msgid "_Unread"
 msgstr "_ยังไม่ได้อ่าน"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_ขยาย"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_ขยายเข้า"
 
@@ -19503,7 +19103,7 @@ msgstr "_ขยายเข้า"
 msgid "Close this window"
 msgstr "ปิดหน้าต่างนี้"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "แถบเครื่องมือหลัก"
 
@@ -19578,6 +19178,11 @@ msgstr "รับการแจ้งเมื่อข้อความขอ
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "แ_ทรก"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "เปิดแฟ้ม"
@@ -19906,51 +19511,43 @@ msgstr "ไ_อคอนและข้อความ"
 msgid "Import data from other programs"
 msgstr "นำเข้าข้อมูลจากโปรแกรมอื่น"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "การ_จัดเรียง"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "_หน้าต่างใหม่"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "_ปรับแต่ง"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "รับ / ส่ง"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "_รับ / ส่ง"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "ส่งข้อความที่อยู่ในคิวและดึงข้อความใหม่"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "ตั้งค่าการติดต่อกับ PDA"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "แสดงข้อมูลเกี่ยวกับ Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "แสดงแถบ_ข้าง"
+msgid "Side _Bar"
+msgstr "แถบ_ข้าง"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "แสดงแถบ_สถานะ"
+msgid "Status _Bar"
+msgstr "แถบ_สถานะ"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "แสดงแ_ถบเครื่องมือ"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "แสดงข้อมูลเกี่ยวกับ Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "ส่งรายงานจุดบกพร่อง"
 
@@ -19958,71 +19555,75 @@ msgstr "ส่งรายงานจุดบกพร่อง"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "ส่ง_รายงานจุดบกพร่อง"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ส่งรายงานข้อผิดพลาดด้วยเครื่องมือรายงานบั๊ก"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "เปิด/ปิดสถานะการทำงานออฟไลน์"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "แ_ถบเครื่องมือ"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "_รูปแบบแถบเครื่องมือ"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "ซ่อน/แสดงแถบข้าง"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "ซ่อน/แสดงแถบสถานะ"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "เ_กี่ยวกับ"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_ปิดหน้าต่าง"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "_ทิ้งรหัสผ่าน"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_ซ่อนปุ่ม"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "ไ_อคอนเท่านั้น"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "เอกสาร_อ้างอิงด่วน"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "_ออก"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "รูปแบบของ_ปุ่มเลือก"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "_ตัวเลือกการ sync..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "_ข้อความเท่านั้น"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_หน้าต่าง"
 
@@ -20059,34 +19660,26 @@ msgid "_Work Week View"
 msgstr "มุมมอง_สัปดาห์ทำงาน"
 
 #: ../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 "เป็นโฟลเดอร์จดหมาย_ออก"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "ตาม_สถานะ"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "ตาม_ผู้ส่ง"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "ตามเ_รื่อง"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "ตามธงการ_ติดตามกระทู้"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "มุมมองแนว_นอน"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_ข้อความ"
 
@@ -20102,32 +19695,28 @@ 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>เขตเวลา</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>การ_เลือก</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "เลือกเขตเวลา"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "กล่องคอมโบเขตเวลา"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20162,7 +19751,7 @@ msgid "_Edit..."
 msgstr "แ_ก้ไข..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1839
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20176,11 +19765,11 @@ msgstr ""
 msgid "Save Current View"
 msgstr "บันทึกมุมมองปัจจุบัน"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "_สร้างมุมมองใหม่"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "ใช้แ_ทนมุมมองที่มีอยู่"
 
@@ -20215,22 +19804,18 @@ msgstr "โรงงาน"
 msgid "Define New View"
 msgstr "กำหนดมุมมองใหม่"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "ชื่อของมุมมองใหม่:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "ชนิดของมุมมอง"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 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
@@ -20239,7 +19824,6 @@ msgstr "จอพพศสอ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1093
-#: ../widgets/misc/e-calendar-item.c:1746
 msgid "%B %Y"
 msgstr "%B %Ey"
 
@@ -20249,8 +19833,8 @@ 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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "สีเติม"
 
@@ -20259,16 +19843,16 @@ msgstr "สีเติม"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "สีเติมของ 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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr ""
 
@@ -20307,11 +19891,11 @@ msgid "Minimum Width"
 msgstr "ความกว้างต่ำสุด"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "การเว้นช่องว่าง"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "ขณะนี้"
 
@@ -20439,129 +20023,105 @@ msgstr "กล่องคอมโบเพื่อเลือกเวลา
 msgid "Time"
 msgstr "เวลา"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "_ขณะนี้"
-
-#: ../widgets/misc/e-dateedit.c:467
-msgid "_Today"
-msgstr "_วันนี้"
-
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "ขยายอยู่"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "ระบุว่าวิดเจ็ตยุบ-ขยายขยายอยู่หรือไม่"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "ข้อความที่ป้ายของวิดเจ็ตยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "ใช้ตัวขีดเส้นใต้"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "ถ้าเลือก อักขระขีดเส้นใต้ในข้อความจะระบุว่าอักขระถัดไปจะใช้เป็นรหัสปุ่มลัด"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "ช่องว่างระหว่างป้ายและวิดเจ็ต"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "วิดเจ็ตป้าย"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "วิดเจ็ตที่จะใช้แสดงผลแทนป้ายปกติของวิดเจ็ตยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "ขนาดที่ขยายขึ้น"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "ขนาดของลูกศรที่ขยายขึ้น"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "การค้นหาขั้นสูง"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "บันทึกการค้นหา"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "การ_ค้นหา"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "การค้นหา"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "บันทึกการค้นหา"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_บันทึกการค้นหา..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "แ_ก้ไขการค้นหาที่บันทึกไว้..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "_ค้นหาขั้นสูง..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "ทุกบัญชี"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "บัญชีปัจจุบัน"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "โฟลเดอร์ปัจจุบัน"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "ข้อความปัจจุบัน"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 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."
@@ -20593,52 +20153,52 @@ msgstr ""
 msgid "Column width"
 msgstr "ความกว้างคอลัมน์"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "ค้นหา"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_ค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_หาเดี๋ยวนี้"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_ล้าง"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "ชนิดการค้นหา"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "ข้อความ"
 
-#. 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:911
-msgid "Show: "
-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:927
-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:939
-msgid " i_n "
-msgstr " ใ_น "
-
-#: ../widgets/misc/e-selection-model-array.c:547
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "หาเ_ดี๋ยวนี้"
+
+#: ../widgets/misc/e-selection-model-array.c:546
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "แถวเคอร์เซอร์"
 
-#: ../widgets/misc/e-selection-model-array.c:554
+#: ../widgets/misc/e-selection-model-array.c:553
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "คอลัมน์เคอร์เซอร์"
@@ -20680,8 +20240,8 @@ msgid "A_uto-delete sent item"
 msgstr "_ลบรายการส่งโดยอัตโนมัติ"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "ประเภท"
+msgid "C_lassification"
+msgstr "_ประเภท"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -20705,29 +20265,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
-"ปกติ\n"
+"เปิดเผย\n"
 "ส่วนตัว\n"
-"ปกปิด\n"
-"ลับ\n"
-"ลับสุดยอด\n"
-"ดูแล้วทำลาย"
+"เป็นความลับ\n"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "_ต้องการการตอบกลับ"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "การติดตาม_สถานะ"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -20739,51 +20293,51 @@ msgstr ""
 "ปกติ\n"
 "ต่ำ"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "เมื่อ_ยอมรับ:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "เ_มื่อเสร็จสมบูรณ์:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "เมื่อ_ปฏิเสธ:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "_ภายใน"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_หลังจาก:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_ข้อมูลทั้งหมด"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_หน่วงการส่งข้อความ"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_ถึงแล้ว"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "_กำหนดวันหมดอายุ"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_จนกระทั่ง:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "เ_มื่อสะดวก"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "เมื่อ_เปิดแล้ว:"
 
@@ -20801,19 +20355,19 @@ msgstr "%s (เสร็จแล้ว %d%%)"
 msgid "Click here to go to URL"
 msgstr "คลิกที่นี่เพื่อไปยัง URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr ""
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "สิ่งที่จัดอยู่ใน_หมวดนี้:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "_หมวดที่มี:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "หมวด"
 
@@ -20837,23 +20391,23 @@ msgstr "คอลัมน์ที่โฟกัส"
 msgid "Unselected Column"
 msgstr "คอลัมน์ที่ไม่ได้เลือก"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "คอลัมน์ขีดฆ่า"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "คอลัมน์ขีดเส้นใต้"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "คอลัมน์ตัวหนา"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "คอลัมน์สี"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "คอลัมน์สีพื้น"
 
@@ -20868,7 +20422,6 @@ msgstr "เขตข้อมูลที่_มี:"
 
 #: ../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
 msgid "Ascending"
 msgstr "หน้าไปหลัง"
 
@@ -20879,7 +20432,6 @@ 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 "Descending"
 msgstr "หลังมาหน้า"
 
@@ -20977,14 +20529,14 @@ msgstr "แ_สดงเขตข้อมูลต่อไปนี้ตา�
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1804
 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-header-item.c:1818
 msgid "Full Header"
 msgstr "ข้อมูลส่วนหัวเต็ม"
 
@@ -21004,19 +20556,25 @@ msgstr ""
 "การเพิ่มคอลัมน์ในตาราง ทำได้โดยลากไปวาง\n"
 "ที่ตำแหน่งที่คุณต้องการให้แสดง"
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d รายการ)"
-msgstr[1] "%s : %s (%d รายการ)"
+msgstr "%s : %s (%d รายการ)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d รายการ)"
+
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d รายการ)"
-msgstr[1] "%s (%d รายการ)"
+msgstr "%s (%d รายการ)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d รายการ)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21096,69 +20654,65 @@ msgstr "ความสูงเท่ากันทุกแถว"
 msgid "Frozen"
 msgstr "แช่แข็ง"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "ปรับแต่งมุมมองปัจจุบัน"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "เรียงจากหน้าไปหลัง"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "เรียงจากหลังมาหน้า"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "ไม่เรียง"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "จัดกลุ่มตามเขตข้อมูลนี้"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "จัดกลุ่มตามกล่อง"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "ลบคอลัมน์นี้"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "เพิ่มคอลัมน์..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "การจัดชิดขอบ"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "ปรับความกว้างพอดี"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "จัดรูปแบบคอลัมน์"
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "ปรับแต่งมุมมองปัจจุบัน..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "เรียงตาม"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "ชุดแบบอักษร"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "ข้อมูลของการเรียงลำดับ"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1846
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21210,7 +20764,7 @@ msgid "This should test the minicard canvas item"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr ""
 
@@ -21223,57 +20777,57 @@ msgid "GDKFont"
 msgstr "แบบอักษร GDK"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "การจัดชิดขอบ"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "ตัดบรรทัด"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "ตัดที่อักขระ"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "จำนวนบรรทัดสูงสุด"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "แทรกอักขระขึ้นบรรทัดใหม่ได้"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "วาดขอบ"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "วาดพื้นหลัง"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "วาดปุ่ม"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "ตำแหน่งเคอร์เซอร์"
 
@@ -21281,170 +20835,62 @@ msgstr "ตำแหน่งเคอร์เซอร์"
 msgid "Emulate label resize"
 msgstr "จำลองการปรับขนาดฉลาก"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "วิธีป้อนข้อความ"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "หนา"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "ขีดฆ่า"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "ความกว้างข้อความ"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "ความสูงข้อความ"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "work"
-#~ msgstr "ที่ทำงาน"
-
-#~ msgid "personal"
-#~ msgstr "ส่วนบุคคล"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "ปฏิทินที่คุณเลือกไว้สามารถอ่านได้เท่านั้น"
-
-#~ msgid "Memo:"
-#~ msgstr "บันทึกช่วยจำ:"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_บอกรับข้อมูล"
-
-#~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "ทำเครื่องหมายว่าทุกข้อความอ่านแล้วในโฟลเดอร์ที่เลือก"
-
-#~ msgid "C_lassification"
-#~ msgstr "_ประเภท"
-
-#~ msgid ""
-#~ "Public\n"
-#~ "Private\n"
-#~ "Confidential\n"
-#~ msgstr ""
-#~ "เปิดเผย\n"
-#~ "ส่วนตัว\n"
-#~ "เป็นความลับ\n"
-
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s : %s (%d รายการ)"
-
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d รายการ)"
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "_ปฏิทิน:"
-
-#~ msgid "_Memo"
-#~ msgstr "บันทึก_ช่วยจำ"
-
-#~ msgid "      "
-#~ msgstr "      "
-
-#~ msgid "Category is"
-#~ msgstr "อยู่ในหมวด"
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "date-end"
-#~ msgstr "วันสิ้นสุด"
-
-#~ msgid "date-start"
-#~ msgstr "วันเริ่มต้น"
-
-#~ msgid "Search Type"
-#~ msgstr "ชนิดการค้นหา"
-
-#~ msgid "Find No_w"
-#~ msgstr "หาเ_ดี๋ยวนี้"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "การประชุมทางวีดิทัศน์"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "_สถานที่:"
-
-#~ msgid "Dele_gatees"
-#~ msgstr "ผู้_รับฉันทะ"
-
-#~ msgid "From:"
-#~ 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 "วันแรก"
 
@@ -21563,6 +21009,9 @@ msgstr ""
 #~ msgid "Attachment Button"
 #~ msgstr "ปุ่มเอกสารแนบ"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "ซ่อน/แสดงแถบเอกสารแนบ"
+
 #~ msgid "Filters"
 #~ msgstr "ตัวกรองข้อความ"
 
diff --git a/po/vi.po b/po/vi.po
index ea9f796873..70f293aaf8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3,24 +3,23 @@
 # Nguyễn Thái Ngọc Duy <pclouds@gmx.net>, 2002-2004.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2006.
 # 
-#: ../shell/e-user-creatable-items-handler.c:701
 msgid ""
-""
-msgstr "Project-Id-Version: evolution 1.4 Gnome HEAD\n"
+msgstr ""
+"Project-Id-Version: evolution 1.4 Gnome HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-23 14:00+0200\n"
-"PO-Revision-Date: 2006-06-24 21:34+0930\n"
+"POT-Creation-Date: 2006-05-25 04:39+0200\n"
+"PO-Revision-Date: 2006-06-24 22:34+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.6a11\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "Sổ địa chỉ Evolution"
 
@@ -34,11 +33,11 @@ msgstr "Liên lạc mới"
 msgid "New Contact List"
 msgstr "Danh sách liên lạc mới"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "thư mục sổ địa chỉ hiện thời %s có %d thẻ"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "thư mục sổ địa chỉ hiện thời có %d thẻ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -57,32 +56,32 @@ msgstr "Liên lạc: "
 msgid "evolution minicard"
 msgstr "thẻ tí tị evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Nó có bảo động."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Nó có nhiều lần."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Nó là cuộc họp."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Sự kiện lịch: tóm tắt là %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Sự kiện lịch: chưa có tóm tắt."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "sự kiện xem lịch"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Bắt tiêu điểm"
 
@@ -154,10 +153,9 @@ msgstr "%A %d %b %Y"
 #.specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711
+#: ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -188,10 +186,9 @@ msgstr "%d %b %Y"
 #.change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -321,19 +318,12 @@ msgstr "Dùng mặc định"
 msgid "Popup Menu"
 msgstr "Trình đơn bật lên"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Hiện/ẩn thanh đính kèm"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "bật"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
-msgstr "Một liên lạc với địa chỉ này đã có. Bạn có muốn thêm một thẻ mới với cùng "
+msgstr ""
+"Một liên lạc với địa chỉ này đã có. Bạn có muốn thêm một thẻ mới với cùng "
 "địa chỉ bằng mọi giá không?"
 
 #: ../addressbook/addressbook.error.xml.h:2
@@ -353,7 +343,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 "Hãy kiểm tra để bảo đảm mật khẩu của bạn được gõ chính xác và bạn sử dụng "
+msgstr ""
+"Hãy kiểm tra để bảo đảm mật khẩu của bạn được gõ chính xác và bạn sử dụng "
 "phương thức đăng nhập được hỗ trợ. Lưu ý rằng nhiều mật khẩu phân biệt chữ "
 "hoa, chữ thường; và hãy chắc đã tắt phím Caps Lock của bạn."
 
@@ -370,7 +361,8 @@ msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr "Hiện thời bạn có thể truy cập chỉ Sổ Địa Chỉ hệ thống Groupwise từ "
+msgstr ""
+"Hiện thời bạn có thể truy cập chỉ Sổ Địa Chỉ hệ thống Groupwise từ "
 "Evolution. Hãy chạy một lần ứng dụng khách thư Groupwise khác, để lấy các "
 "thư mục GroupWise Frequent Contacts (liên lạc thường) và GroupWise Personal "
 "Contacts (liên lạc cá nhân)."
@@ -405,7 +397,8 @@ msgstr "Phiên bản máy phục vụ"
 
 #: ../addressbook/addressbook.error.xml.h:16
 msgid "Some features may not work properly with your current server"
-msgstr "Có lẽ một số tính năng sẽ không hoạt động với máy phục vụ hiện thời của bạn."
+msgstr ""
+"Có lẽ một số tính năng sẽ không hoạt động với máy phục vụ hiện thời của bạn."
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "The Evolution addressbook has quit unexpectedly."
@@ -421,7 +414,8 @@ msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
-msgstr "Máy phục vụ LDAP này có lẽ dùng phiên bản LDAP cũ mà không hỗ trợ tính năng "
+msgstr ""
+"Máy phục vụ LDAP này có lẽ dùng phiên bản LDAP cũ mà không hỗ trợ tính năng "
 "này hoặc bị cấu hình sai. Hãy hỏi quản trị hệ thống về những cơ sở tìm kiếm "
 "được hỗ trợ."
 
@@ -441,7 +435,8 @@ msgstr "Máy phục vụ sổ địa chỉ này không đề nghị cơ sở tì
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
-msgstr "Không thể tiếp cận máy phục vụ sổ địa chỉ này, hoặc tên máy phục vụ đã gõ "
+msgstr ""
+"Không thể tiếp cận máy phục vụ sổ địa chỉ này, hoặc tên máy phục vụ đã gõ "
 "sai, hoặc bị ngắt kết nối."
 
 #: ../addressbook/addressbook.error.xml.h:24
@@ -468,7 +463,8 @@ msgstr "Bạn có muốn lưu các thay đổi chứ?"
 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 "Bạn đang cố di chuyển liên lạc từ sổ địa chỉ này sang sổ địa chỉ khác nhưng "
+msgstr ""
+"Bạn đang cố di chuyển liên lạc từ sổ địa chỉ này sang sổ địa chỉ khác nhưng "
 "mà không thể gỡ bỏ nó khỏi nguồn. Như thế thì bạn có muốn tạo một bản sao "
 "thay vào đó không?"
 
@@ -477,7 +473,8 @@ msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
-msgstr "Bạn đang kết nối đến một máy phục vụ Groupwise không được hỗ trợ thì có lẽ "
+msgstr ""
+"Bạn đang kết nối đến một máy phục vụ Groupwise không được hỗ trợ thì có lẽ "
 "sẽ gặp khó khăn sử dụng trình Evolution. Để được kết quả tốt nhất, bạn nên "
 "nâng cấp máy phục vụ lên một phiên bản được hỗ trợ."
 
@@ -490,7 +487,8 @@ msgstr "Bạn đã chỉnh sửa liên lạc này, thì có muốn lưu các tha
 #: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "Các liên lạc của bạn cho « {0} » không thể sử dụng cho tới khi khởi chạy lại "
+msgstr ""
+"Các liên lạc của bạn cho « {0} » không thể sử dụng cho tới khi khởi chạy lại "
 "Evolution."
 
 #: ../addressbook/addressbook.error.xml.h:33
@@ -506,7 +504,7 @@ msgid "_Discard"
 msgstr "_Hủy"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -546,10 +544,10 @@ msgstr "Cấu hình tự động gỡ xong ở đây"
 
 #.Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247
 #: ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Liên lạc"
 
@@ -617,7 +615,7 @@ msgstr "Trên máy này"
 #: ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198
 #: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1054
 #: ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Cá nhân"
@@ -645,7 +643,7 @@ msgid "Create a new contact list"
 msgstr "Tạo một danh sách liên lạc mới"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Sổ địa chỉ mới"
 
@@ -661,76 +659,76 @@ msgstr "Tạo một sổ địa chỉ mới"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Việc nâng cấp thiết lập Sổ địa chỉ hoặc thư mục bị lỗi."
 
-#: ../addressbook/gui/component/addressbook-config.c:331
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Cơ sở"
 
-#: ../addressbook/gui/component/addressbook-config.c:532
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Kiểu :"
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Sao chép nội dung sổ về máy để phục vụ các thao tác ngoại tuyến"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../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:2015
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Chung"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Thông tin máy phục vụ"
 
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Xác thực"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Chi tiết"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Tìm kiếm"
 
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Tải về"
 
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Thuộc tính Sổ địa chỉ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
 #: ../calendar/gui/migration.c:153
-#: ../mail/em-migrate.c:1202
+#: ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Đang nâng cấp..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:200
-#: ../mail/em-migrate.c:1243
+#: ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Đang nâng cấp « %s »"
@@ -749,7 +747,8 @@ msgid ""
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "Địa chỉ và cây thư mục liên lạc Evolution đã thay đổi so với Evolution 1.x.\n"
+msgstr ""
+"Địa chỉ và cây thư mục liên lạc Evolution đã thay đổi so với Evolution 1.x.\n"
 "\n"
 "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
 
@@ -758,7 +757,8 @@ msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "Định dạng của liên lạc hộp thư chung đã thay đổi.\n"
+msgstr ""
+"Định dạng của liên lạc hộp thư chung đã thay đổi.\n"
 "\n"
 "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
 
@@ -767,7 +767,8 @@ msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "Cách Evolution lưu một phần số điện thoại đã thay đổi.\n"
+msgstr ""
+"Cách Evolution lưu một phần số điện thoại đã thay đổi.\n"
 "\n"
 "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
 
@@ -776,7 +777,8 @@ msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr "Các tập tin bản ghi thay đổi và bản đồ đều của Evolution Palm Sync (trình "
+msgstr ""
+"Các tập tin bản ghi thay đổi và bản đồ đều của Evolution Palm Sync (trình "
 "đồng bộ hoá máy tính cầm tay chạy hệ thống Palm) đã thay.\n"
 "\n"
 "Hãy kiên nhẫn trong khi Evolution chuyển đổi dữ liệu Pilot Sync..."
@@ -801,21 +803,21 @@ msgstr "Tên thư mục không thể chứa ký tự sổ chéo."
 msgid "A Folder with this name already exists"
 msgstr "Thư mục tên này đã có"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "Sổ địa chỉ _mới"
 
 #.FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1279
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617
+#: ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/memos-component.c:452
 #: ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30
@@ -824,18 +826,18 @@ msgstr "Sổ địa chỉ _mới"
 msgid "_Delete"
 msgstr "_Xoá bỏ"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Lưu dạng vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/memos-component.c:453
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "Tài _sản..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Bộ chọn nguồn liên lạc"
 
@@ -844,7 +846,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Truy cập vô danh tới máy phục vụ LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Việc xác thực bị lỗi.\n"
 
@@ -860,19 +862,23 @@ msgstr "Độ dài tự động gõ xong"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "XML EFolderList (danh sách thư mục điện) cho danh sách các địa chỉ Mạng sẽ gõ xong."
+msgstr ""
+"XML EFolderList (danh sách thư mục điện) cho danh sách các địa chỉ Mạng sẽ "
+"gõ xong."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "XML EFolderList (danh sách thư mục điện) cho danh sách các địa chỉ Mạng sẽ "
+msgstr ""
+"XML EFolderList (danh sách thư mục điện) cho danh sách các địa chỉ Mạng sẽ "
 "gõ xong."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
-msgstr "Vị trí của ô cửa sổ dọc giữa ô xem thẻ và ô xem danh sách và ô cửa "
-"sổ xem thử, theo điểm ảnh."
+msgstr ""
+"Vị trí của ô cửa sổ dọc giữa ô xem thẻ và ô xem danh sách và ô cửa sổ xem "
+"thử, theo điểm ảnh."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
@@ -893,7 +899,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Địa chỉ Mạng cho thư mục đã dùng cuối cùng trong hộp thoại chọn tên."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Vị trí ô cửa sổ dọc"
 
@@ -974,7 +980,8 @@ msgstr "Địa chỉ thư"
 #: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution sẽ dùng địa chỉ thư điện tử này để xác thực bạn với máy phục vụ."
+msgstr ""
+"Evolution sẽ dùng địa chỉ thư điện tử này để xác thực bạn với máy phục vụ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1029,21 +1036,24 @@ 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 "Bộ lọc tìm kiếm là kiểu đối tượng cần tìm kiếm. Nếu nó chưa được sửa đổi, "
+msgstr ""
+"Bộ lọc tìm kiếm là kiểu đối tượng cần tìm kiếm. Nếu nó chưa được sửa đổi, "
 "mặc định là hạng đối tượng kiểu « person » (người) sẽ được tìm kiếm."
 
 #: ../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 "Chọn tùy chọn này nghĩa là Evolution sẽ chỉ kết nối tới máy phục vụ LDAP của "
+msgstr ""
+"Chọn tùy chọn này nghĩa là Evolution sẽ chỉ kết nối tới máy phục vụ LDAP của "
 "bạn nếu máy phục vụ LDAP ấy hỗ trợ 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 "Chọn tùy chọn này nghĩa là Evolution sẽ chỉ kết nối tới máy phục vụ LDAP của "
+msgstr ""
+"Chọn tùy chọn này nghĩa là Evolution sẽ chỉ kết nối tới máy phục vụ LDAP của "
 "bạn nếu máy phục vụ LDAP ấy hỗ trợ TLS."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
@@ -1051,7 +1061,8 @@ msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
-msgstr "Chọn tùy chọn này nghĩa là máy phục vụ của bạn không hỗ trợ SSL, cũng không "
+msgstr ""
+"Chọn tùy chọn này nghĩa là máy phục vụ của bạn không hỗ trợ SSL, cũng không "
 "hỗ trợ TLS. Như thế thì kết nối của bạn không an toàn, có thể bị lỗ hổng bảo "
 "mật."
 
@@ -1076,7 +1087,8 @@ msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
-msgstr "Cơ sở tìm là tên phân biệt (TP) của mục nhập nơi bắt đầu tìm kiếm. Nếu bạn "
+msgstr ""
+"Cơ sở tìm là tên phân biệt (TP) của mục nhập nơi bắt đầu tìm kiếm. Nếu bạn "
 "bỏ trống chỗ này, tìm kiếm sẽ được bắt đầu từ gốc cây thư mục."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
@@ -1085,7 +1097,8 @@ msgid ""
 "the directory tree. A search scope of \"sub\" will include all entries below "
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
-msgstr "Phạm vi tìm cho biết độ sâu tìm kiếm đi xuống trong cây thư mục. Phạm vi tìm "
+msgstr ""
+"Phạm vi tìm cho biết độ sâu tìm kiếm đi xuống trong cây thư mục. Phạm vi tìm "
 "kiếm «con» sẽ bao gồm mọi mục dưới cơ sở tìm. Phạm vi tìm kiếm «một» sẽ chỉ "
 "tìm những mục nằm một mức độ dưới trong cơ sở tìm thôi."
 
@@ -1093,7 +1106,8 @@ msgstr "Phạm vi tìm cho biết độ sâu tìm kiếm đi xuống trong cây
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr "Đây là tên đầy đủ của máy phục vụ LDAP. Ví dụ:\n"
+msgstr ""
+"Đây là tên đầy đủ của máy phục vụ LDAP. Ví dụ:\n"
 "ldap.côngtytôi.com.vn"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
@@ -1107,14 +1121,16 @@ msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
-msgstr "Đây là cách Evolution dùng để xác thực bạn. Chú ý rằng đặt cái này là\n"
+msgstr ""
+"Đây là cách Evolution dùng để xác thực bạn. Chú ý rằng đặt cái này là\n"
 "« Địa chỉ thư » yêu cầu truy cập vô danh tới máy phục vụ 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 "Đây là tên máy phục vụ xuất hiện trong danh sách thư mục Evolution. Chỉ được "
+msgstr ""
+"Đây là tên máy phục vụ xuất hiện trong danh sách thư mục Evolution. Chỉ được "
 "dùng với mục đích hiển thị thôi."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
@@ -1122,7 +1138,8 @@ msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
-msgstr "Đây là số hiệu cổng của máy phục vụ LDAP mà Evolution sẽ cố kết nối đến nó. "
+msgstr ""
+"Đây là số hiệu cổng của máy phục vụ LDAP mà Evolution sẽ cố kết nối đến nó. "
 "Một danh sách các cổng chuẩn đã được cung cấp. Hãy hỏi quản trị hệ thống của "
 "bạn để biết dùng cổng nào."
 
@@ -1205,10 +1222,12 @@ msgstr "phút"
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
 #: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
@@ -1259,13 +1278,13 @@ msgstr "<b>Chỗ làm</b>"
 # Name: don't translate / Tên: đừng dịch
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1274,7 +1293,7 @@ msgstr "Liên lạc"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2410
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Bộ sửa liên lạc"
 
@@ -1317,7 +1336,7 @@ msgstr "Điện thoại"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Chỗ làm"
@@ -1340,13 +1359,16 @@ msgid "_Birthday:"
 msgstr "Ngày _sinh:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "_Lịch:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "_Loại..."
+#: ../ui/evolution-event-editor.xml.h:27
+#: ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Loại"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1433,8 +1455,8 @@ msgid "_Zip/Postal Code:"
 msgstr "Mã _bưu điện:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Địa chỉ"
 
@@ -1442,15 +1464,15 @@ msgstr "Địa chỉ"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../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:1835
+#: ../widgets/table/e-cell-text.c:1777
 #: ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313
 #: ../widgets/text/e-text.c:3607
@@ -1932,7 +1954,7 @@ msgstr "Cu-ouai-th"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Kyrgyzstan"
-msgstr "Cơ-chi-x-tăng"
+msgstr "Cơ-chi-x-tănh"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
@@ -2276,7 +2298,7 @@ msgstr "Xan Pi-e và Mi-quê-lon"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
-msgstr "Xu-đăng"
+msgstr "Xu-đănh"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
@@ -2348,7 +2370,7 @@ msgstr "Thổ-nhĩ-kỳ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turkmenistan"
-msgstr "Thua-khợ-me-ni-x-tăng"
+msgstr "Thua-khợ-me-ni-x-tănh"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
@@ -2430,7 +2452,7 @@ msgstr "Dim-ba-bu-ê"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Tên"
@@ -2441,7 +2463,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2451,7 +2473,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2481,17 +2503,17 @@ msgid "Other"
 msgstr "Khác"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2520,51 +2542,52 @@ msgid "Changed"
 msgstr "Đã đổi"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2405
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Bộ sửa liên lạc — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2783
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Hãy chọn ảnh cho liên lạc này"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2784
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Không ảnh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "Dữ liệu liên lạc không hợp lệ:\n"
+msgstr ""
+"Dữ liệu liên lạc không hợp lệ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "« %s » có dạng thức không hợp lệ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s« %s » có dạng thức không hợp lệ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s« %s » là rỗng"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Liên lạc không hợp lệ."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "Thêm nhanh liên lạc"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "_Sửa đầy"
 
@@ -2572,11 +2595,11 @@ msgstr "_Sửa đầy"
 msgid "_Full name"
 msgstr "_Họ tên"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "_Thư"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "Chọn _Sổ địa chỉ"
 
@@ -2584,30 +2607,34 @@ msgstr "Chọn _Sổ địa chỉ"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr "Bạn có chắc muốn xoá bỏ\n"
+"to delete contact list (%s) ?"
+msgstr ""
+"Bạn có chắc muốn xoá bỏ\n"
 "danh sách liên lạc (%s) không?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
-msgstr "Bạn có chắc muốn xoá bỏ\n"
+msgstr ""
+"Bạn có chắc muốn xoá bỏ\n"
 "những danh sách liên lạc này không?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr "Bạn có chắc muốn xoá bỏ\n"
+"to delete contact (%s) ?"
+msgstr ""
+"Bạn có chắc muốn xoá bỏ\n"
 "liên lạc (%s) không?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
-msgstr "Bạn có chắc muốn xoá bỏ\n"
+msgstr ""
+"Bạn có chắc muốn xoá bỏ\n"
 "những liên lạc này không?"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
@@ -2708,7 +2735,6 @@ msgid "_IM Service:"
 msgstr "Dịch vụ t_in nhắn:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2724,7 +2750,7 @@ msgid "Add an email to the List"
 msgstr "Thêm một địa chỉ thư điện tử vào danh sách"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:878
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Bộ sửa danh sách liên lạc"
 
@@ -2756,24 +2782,24 @@ msgstr "_Chọn"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Nhập địa chỉ _thư hoặc kéo liên lạc vào danh sách dưới đây:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
 #: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Sổ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Là danh sách mới"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "Thành _viên"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:754
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Thành viên danh sách"
 
@@ -2794,7 +2820,8 @@ msgstr "Phát hiện liên lạc trùng"
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
-msgstr "Tên hoặc địa chỉ thư điện tử đã thay đổi của liên lạc này\n"
+msgstr ""
+"Tên hoặc địa chỉ thư điện tử đã thay đổi của liên lạc này\n"
 "đã có trong thư mục này. Bạn có muốn thêm nữa không?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2809,7 +2836,8 @@ msgstr "Liên lạc gốc:"
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
-msgstr "Tên hoặc địa chỉ thư điện từ của liên lạc này đã có\n"
+msgstr ""
+"Tên hoặc địa chỉ thư điện từ của liên lạc này đã có\n"
 "trong thư mục này. Bạn có muốn thêm nữa nữa?"
 
 #.We attach subitems below
@@ -2849,7 +2877,7 @@ msgstr[0] "%d liên lạc"
 #: ../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:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Truy vấn"
 
@@ -2887,16 +2915,16 @@ msgid "Type"
 msgstr "Kiểu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:834
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2069
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Lưu dạng vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1259
-#: ../calendar/gui/e-calendar-view.c:1698
-#: ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595
+#: ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Mở"
@@ -2954,19 +2982,19 @@ msgstr "Cắ_t"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1267
-#: ../calendar/gui/e-calendar-view.c:1705
-#: ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/memos-component.c:451
 #: ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3125
-#: ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1107
-#: ../mail/message-list.c:1873
+#: ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724
 #: ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
@@ -2978,13 +3006,13 @@ msgid "P_aste"
 msgstr "_Dán"
 
 #.All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
 #: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Loại nào"
 
 #.FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1804
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "In các thẻ"
 
@@ -3029,7 +3057,7 @@ msgid "Company Phone"
 msgstr "Điện thoại công ty"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Thư điện tử"
@@ -3079,7 +3107,7 @@ msgid "Manager"
 msgstr "Quản lý"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Điện thoại di động"
 
@@ -3088,7 +3116,7 @@ msgid "Nickname"
 msgstr "Tên hiệu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Ghi chú"
 
@@ -3097,7 +3125,7 @@ msgid "Office"
 msgstr "Văn phòng"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Tổ chức"
 
@@ -3223,7 +3251,7 @@ msgstr "Độ dài tên trường tối đa"
 msgid "Column Width"
 msgstr "Rộng cột"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3236,38 +3264,41 @@ msgstr "\n"
 "\n"
 "hay nhấp đúp vào đây để tạo liên lạc mới."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
-msgstr "\n"
+msgstr ""
+"\n"
 "\n"
 "Không có mục nào để xem trong khung nhìn này.\n"
 "\n"
 "Nhấp đúp vào đây để tạo liên lạc mới."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "\n"
+msgstr ""
+"\n"
 "\n"
 "Tìm kiếm liên lạc."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
-msgstr "\n"
+msgstr ""
+"\n"
 "\n"
 "Không có mục nào để xem trong khung nhìn này."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Bộ tiếp hợp"
 
@@ -3279,90 +3310,68 @@ msgstr "Đã chọn"
 msgid "Has Cursor"
 msgstr "Có con trỏ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163
-#: ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Mở liên kết bằng trình duyệt"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2492
-msgid "_Copy Link Location"
-msgstr "_Chép địa chỉ liên kết"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Gửi thư mới cho ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Chép địa chỉ _thư"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(bản đồ)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "bản đồ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Thành viên danh sách"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Thư điện từ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Vị trí"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Trò chuyện ảnh động"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Hội thảo ảnh động"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Điện thư"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "chỗ làm"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Trang chủ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
 msgstr "Nhật ký Mạng"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "cá nhân"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Tên nghề"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Trang chủ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Nhật ký Mạng"
-
 #.E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3393,7 +3402,7 @@ msgstr "Chưa định nghĩa Tự lien lạc"
 #.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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Không đủ quyền truy cập"
 
@@ -3418,8 +3427,8 @@ msgstr "Chưa hỗ trợ giao thức này"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463
-#: ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462
+#: ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Bị thôi"
 
@@ -3470,7 +3479,8 @@ 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 "Chưa có mở được sổ địa chỉ này. Hoặc vì sổ này không có dấu cho phép sử dụng "
+msgstr ""
+"Chưa có mở được sổ địa chỉ này. Hoặc vì sổ này không có dấu cho phép sử dụng "
 "khi ngoại tuyến, hoặc chưa tải nó về để sử dụng ngoại tuyến. Hãy tải sổ địa "
 "chỉ ấy một lần trong chế độ trực tuyến, để tải nội dung nó về."
 
@@ -3479,14 +3489,16 @@ msgstr "Chưa có mở được sổ địa chỉ này. Hoặc vì sổ này kh�
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
-msgstr "Không thể mở sổ địa chỉ này. Vui lòng kiểm tra lại có đường dẫn « %s » và "
+msgstr ""
+"Không thể mở sổ địa chỉ này. Vui lòng kiểm tra lại có đường dẫn « %s » và "
 "bạn có quyền truy cập vào nó."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:112
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
-msgstr "Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã gõ sai địa chỉ "
+msgstr ""
+"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã gõ sai địa chỉ "
 "Mạng, hoặc là do máy phục vụ LDAP không thể truy cập."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
@@ -3494,14 +3506,16 @@ 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 "Phiên bản Evolution này không được biên dịch để hỗ trợ LDAP. Nếu bạn muốn "
+msgstr ""
+"Phiên bản Evolution này không được biên dịch để hỗ trợ LDAP. Nếu bạn muốn "
 "dùng LDAP trong Evolution, bạn phải cài đặt gói Evolution hỗ trợ LDAP."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
-msgstr "Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã gõ sai địa chỉ "
+msgstr ""
+"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã gõ sai địa chỉ "
 "Mạng ấy, hoặc là do máy phục vụ không thể truy cập."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
@@ -3510,7 +3524,8 @@ msgid ""
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
-msgstr "Quá nhiều thẻ khớp với truy vấn này, nhiều hơn cấu hình\n"
+msgstr ""
+"Quá nhiều thẻ khớp với truy vấn này, nhiều hơn cấu hình\n"
 "của máy phục vụ có thể trả gửi, hoặc cấu hình của Evolution\n"
 "có thể hiển thị. Bạn hãy tìm kiếm chính xác hơn hoặc tăng giới hạn\n"
 "kết quả trong Sở thích máy phục vụ thư mục cho sổ địa chỉ này."
@@ -3521,7 +3536,8 @@ msgid ""
 "you have configured for this addressbook.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
-msgstr "Thời gian thực hiện truy vấn này vượt quá giới hạn máy phục vụ\n"
+msgstr ""
+"Thời gian thực hiện truy vấn này vượt quá giới hạn máy phục vụ\n"
 "hoặc giới hạn do bạn cấu hình cho sổ địa chỉ này.\n"
 "Vui lòng tìm kiếm chính xác hơn hoặc tăng giới hạn thời gian trong\n"
 "Sở thích máy phục vụ thư mục cho sổ địa chỉ này."
@@ -3543,7 +3559,7 @@ msgid "Error adding list"
 msgstr "Gặp lỗi khi thêm danh sách"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:700
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Gặp lỗi khi thêm liên lạc"
 
@@ -3560,7 +3576,7 @@ msgid "Error removing list"
 msgstr "Gặp lỗi khi gỡ bỏ danh sách"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:655
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Gặp lỗi khi gỡ bỏ liên lạc"
 
@@ -3569,9 +3585,11 @@ msgstr "Gặp lỗi khi gỡ bỏ liên lạc"
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
-msgid_plural "Opening %d contacts will open %d new windows as well.\n"
+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] "Việc mở %d liên lạc sẽ mở %d cửa sổ mới cùng lúc.\n"
+msgstr[0] ""
+"Việc mở %d liên lạc sẽ mở %d cửa sổ mới cùng lúc.\n"
 "Bạn có thật sự muốn hiển thị các liên lạc này không?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:321
@@ -3579,7 +3597,8 @@ msgstr[0] "Việc mở %d liên lạc sẽ mở %d cửa sổ mới cùng lúc.\
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
-msgstr "%s đã có.\n"
+msgstr ""
+"%s đã có.\n"
 "Bạn có muốn ghi đè lên nó không?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:325
@@ -3589,62 +3608,62 @@ msgstr "Ghi đè"
 #.more than one, finding the total number of contacts might
 #.* hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:372
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "liên lạc"
 
 # Filename: do not translate/ tên tập tin: đừng dịch
 #.This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Chọn Sổ địa chỉ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:601
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "danh sách"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Chuyển liên lạc sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:763
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Chép liên lạc sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Chuyển các liên lạc sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Chép các liên lạc sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:994
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Nhiều VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:997
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard cho %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1038
-#: ../addressbook/gui/widgets/eab-gui-util.c:1056
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Thông tin lien lạc"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1058
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Thông tin lien lạc cho %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "Đang truy vấn Sổ địa chỉ..."
 
@@ -3735,12 +3754,12 @@ msgstr "Bộ nhập vCard Evolution"
 msgid "Print envelope"
 msgstr "In phong bì"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "In các liên lạc"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "In liên lạc"
 
@@ -3789,7 +3808,7 @@ msgstr "Dạng thức"
 #: ../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-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Đầu trang"
@@ -3893,7 +3912,7 @@ msgstr "Bóng"
 
 #.FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -3973,7 +3992,8 @@ msgstr "Liệt kê các thư mục sổ địa chỉ cục bộ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
-msgstr "Hiển thị mọi thẻ kiểu tập tin vCard (thẻ ảo) hoặc .csv (định giới bằng dấu "
+msgstr ""
+"Hiển thị mọi thẻ kiểu tập tin vCard (thẻ ảo) hoặc .csv (định giới bằng dấu "
 "phẩy)"
 
 # Format name: do not translate/ tên dạng thức: đừng dịch
@@ -3988,7 +4008,8 @@ msgstr "Xuất theo chế độ không đồng bộ"
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "Số thẻ trong một tập tin kết xuất riêng lẻ trong chế độ không đồng bộ: kích "
+msgstr ""
+"Số thẻ trong một tập tin kết xuất riêng lẻ trong chế độ không đồng bộ: kích "
 "cỡ mặc định là 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
@@ -3998,7 +4019,8 @@ msgstr "SỐ"
 #: ../addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
-msgstr "Lỗi đối số dòng lệnh, hãy dùng tùy chọn « --help » (trợ giúp) để xem cách sử "
+msgstr ""
+"Lỗi đối số dòng lệnh, hãy dùng tùy chọn « --help » (trợ giúp) để xem cách sử "
 "dụng đúng."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -4033,14 +4055,16 @@ msgstr "Chưa cung cấp tên tập tin."
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
-msgstr "Việc thêm một Tóm tắt có nghĩa vào cuộc hẹn bạn sẽ cho người nhận biết ý "
+msgstr ""
+"Việc thêm một Tóm tắt có nghĩa vào cuộc hẹn bạn sẽ cho người nhận biết ý "
 "kiến về lý do của cuộc hẹn này."
 
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
-msgstr "Việc thêm một Tóm tắt có nghĩa vào tác vụ bạn sẽ cho người nhận biết ý kiến "
+msgstr ""
+"Việc thêm một Tóm tắt có nghĩa vào tác vụ bạn sẽ cho người nhận biết ý kiến "
 "về lý do của tác vụ này."
 
 #: ../calendar/calendar.error.xml.h:3
@@ -4113,17 +4137,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Bạn có chắc muốn xoá bỏ cuộc hẹn này không?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Bạn có chắc muốn xoá bỏ mục nhật ký này không?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Bạn có chắc muốn xoá bỏ cuộc họp này không?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Bạn có chắc muốn xoá bỏ tác vụ này không?"
 
@@ -4171,13 +4192,15 @@ msgstr "Không thể tải bộ sửa."
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "Lời mời thư điện từ sẽ được gửi cho mọi người dự và cho phép họ chấp nhận "
+msgstr ""
+"Lời mời thư điện từ sẽ được gửi cho mọi người dự và cho phép họ chấp nhận "
 "tác vụ."
 
 #: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Lời mời thư điện tử sẽ được gửi cho mọi người dự và cho phép họ trả lời."
+msgstr ""
+"Lời mời thư điện tử sẽ được gửi cho mọi người dự và cho phép họ trả lời."
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
@@ -4195,53 +4218,61 @@ msgstr "Gặp lỗi khi tải danh sách tác vụ"
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
-msgstr "Nếu bạn không gửi thông báo hủy bỏ, những người dự khác có thể sẽ không biết "
+msgstr ""
+"Nếu bạn không gửi thông báo hủy bỏ, những người dự khác có thể sẽ không biết "
 "nhật ký đã được xoá bỏ."
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "Nếu bạn không gửi thông báo hủy bỏ, những người dự khác có thể sẽ không biết "
+msgstr ""
+"Nếu bạn không gửi thông báo hủy bỏ, những người dự khác có thể sẽ không biết "
 "cuộc họp đã được hủy bỏ."
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "Nếu bạn không gửi thông báo hủy bỏ, những người dự khác có thể sẽ không biết "
+msgstr ""
+"Nếu bạn không gửi thông báo hủy bỏ, những người dự khác có thể sẽ không biết "
 "tác vụ đã được xoá bỏ."
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
-msgstr "Gửi thông tin cập nhật cho phép những người dự khác cập nhật lại lịch của họ."
+msgstr ""
+"Gửi thông tin cập nhật cho phép những người dự khác cập nhật lại lịch của họ."
 
 #: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr "Gửi thông tin cập nhật cho phép những người dự khác cập nhật danh sách tác "
+msgstr ""
+"Gửi thông tin cập nhật cho phép những người dự khác cập nhật danh sách tác "
 "vụ của họ."
 
 #: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
-msgstr "Hiện thời đang tải về một số đính kèm. Khi lưu cuộc hẹn này, sẽ cũng mất các "
+msgstr ""
+"Hiện thời đang tải về một số đính kèm. Khi lưu cuộc hẹn này, sẽ cũng mất các "
 "đính kèm này."
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
-msgstr "Hiện thời đang tải về một số đính kèm. Khi lưu tác vụ này, sẽ cũng mất các "
+msgstr ""
+"Hiện thời đang tải về một số đính kèm. Khi lưu tác vụ này, sẽ cũng mất các "
 "đính kèm này."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
-msgstr "Có lẽ một số tính năng sẽ không hoạt động với máy phục vụ hiện thời của bạn."
+msgstr ""
+"Có lẽ một số tính năng sẽ không hoạt động với máy phục vụ hiện thời của bạn."
 
 #: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
@@ -4309,7 +4340,8 @@ msgstr "Bạn có muốn gửi tác vụ này cho những người dự không?"
 
 #: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "Bạn có muốn gửi thông tin cuộc họp đã cập nhật cho những người dự không?"
+msgstr ""
+"Bạn có muốn gửi thông tin cuộc họp đã cập nhật cho những người dự không?"
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
@@ -4320,7 +4352,8 @@ msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
-msgstr "Bạn đang kết nối đến một máy phục vụ Groupwise không được hỗ trợ thì có lẽ "
+msgstr ""
+"Bạn đang kết nối đến một máy phục vụ Groupwise không được hỗ trợ thì có lẽ "
 "sẽ gặp khó khăn sử dụng trình Evolution. Để được kết quả tốt nhất, bạn nên "
 "nâng cấp trình phục vụ lên một phiên bản được hỗ trợ."
 
@@ -4338,11 +4371,13 @@ msgstr "Bạn đã sửa đổi ghi nhớ này, nhưng chưa lưu lại."
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Các lịch của bạn sẽ không sẵn sàng cho đến khi bạn khởi động lại Evolution."
+msgstr ""
+"Các lịch của bạn sẽ không sẵn sàng cho đến khi bạn khởi động lại Evolution."
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Các tác vụ của bạn sẽ không sẵn sàng cho đến khi bạn khởi động lại Evolution."
+msgstr ""
+"Các tác vụ của bạn sẽ không sẵn sàng cho đến khi bạn khởi động lại Evolution."
 
 #: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
@@ -4388,8 +4423,8 @@ msgstr "Tách sự kiện đa ngày:"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Không thể khởi động evolution-data-server (máy phục vụ dữ liệu)."
 
@@ -4423,12 +4458,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Không thể ghi khối ứng dụng ToDo (cần làm) của pilot."
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2006
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Tác vụ và Lịch"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Lịch"
 
@@ -4478,15 +4513,15 @@ msgid "Memos"
 msgstr "Ghi nhớ"
 
 #: ../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/print.c:1840
+#: ../calendar/gui/e-calendar-table.c:525
+#: ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828
 #: ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/exchange-operations/exchange-folder.c:592
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4506,12 +4541,12 @@ msgstr "_Tác vụ"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Dịch vụ báo động lịch Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "phút"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4523,7 +4558,7 @@ msgid "hours"
 msgid_plural "hours"
 msgstr[0] "giờ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Thời điểm đầu:"
 
@@ -4534,10 +4569,10 @@ msgstr "Cuộc hẹn"
 
 #.Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Địa điểm:"
 
@@ -4554,14 +4589,14 @@ msgstr "_Thời gian ngủ:"
 #: ../ui/evolution-addressbook.xml.h:51
 #: ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:14
-#: ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../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:40
 msgid "_Edit"
 msgstr "_Sửa"
 
@@ -4573,42 +4608,44 @@ msgstr "_Ngủ"
 msgid "location of appointment"
 msgstr "địa điểm cuộc hẹn"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Không có tóm tắt"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Không có thông tin về địa điểm."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Bạn có %d bảo động"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#.FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
-msgstr "Evolution chưa hỗ trợ bộ nhắc nhở lịch thông qua\n"
+msgstr ""
+"Evolution chưa hỗ trợ bộ nhắc nhở lịch thông qua\n"
 "thư điện tử, nhưng mà bộ nhắc nhở này đã được\n"
 "cấu hình để gửi thư. Thay vào đó, Evolution\n"
 "sẽ hiển thị một hộp thoại nhắc nhở thông thường."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4617,14 +4654,15 @@ msgid ""
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
-msgstr "Lịch Evolution sắp nhắc nhở bạn. Bộ nhắc nhở này được cấu hình để chạy những "
+msgstr ""
+"Lịch Evolution sắp nhắc nhở bạn. Bộ nhắc nhở này được cấu hình để chạy những "
 "chương trình sau:\n"
 "\n"
 "        %s\n"
 "\n"
 "Bạn có chắc muốn chạy chương trình này không?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Đừng hỏi tôi về chương trình này lần nữa."
 
@@ -4692,7 +4730,8 @@ msgstr "Lịch cần chạy báo động cho chúng"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "Màu cần vẽ Dòng Marcus Bains trong thanh Thời gian (bỏ rỗng để chọn mặc định)"
+msgstr ""
+"Màu cần vẽ Dòng Marcus Bains trong thanh Thời gian (bỏ rỗng để chọn mặc định)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -4723,339 +4762,337 @@ msgid "Default reminder value"
 msgstr "Giá trị nhắc nhở mặc định"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Dốc sự kiện"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Độ trong suốt sự kiện"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Địa chỉ Mạng của máy phục vụ Rảnh/Bận"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Địa chỉ Mạng mẫu Rảnh/Bận"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Dốc của các sự kiện trong ô xem lịch."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Ẩn mọi tác vụ hoàn tất"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Ẩn đơn vị tác vụ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Ẩn giá trị tác vụ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Ví trị ô cửa sổ ngang"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Giờ kết thúc ngày làm việc, có dạng 24 giờ (0-23)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Giờ bắt đầu ngày làm việc, có dạng 24 giờ (0-23)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Hộp thời gian được hiển thị trong ô xem Ngày/Tuần làm việc, theo phút"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Giờ báo động cuối cùng"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
-msgstr "Danh sách các địa chỉ Mạng kiểu máy phục vụ để xuất bản thông tin Rảnh/Bận."
+msgstr ""
+"Danh sách các địa chỉ Mạng kiểu máy phục vụ để xuất bản thông tin Rảnh/Bận."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Dòng Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Màu Dòng Marcus Bains — Xem ngày"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Màu Dòng Marcus Bains — Thanh thời gian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Phút kết thúc ngày làm việc, 0-59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Phút bắt đầu ngày làm việc, 0-59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Vị trí của ô cửa sổ ngang trong ô xem tháng"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Vị trí của ô cửa sổ dọc trong ô xem tháng"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Tổng số đơn vị để quyết định lúc nào nhắc nhở mặc định."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Tổng số đơn vị để quyết định lúc nào nên ẩn cộng việc."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Màu của tác vụ quá hạn"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
-msgstr "Ví trị của ô cửa sổ ngang, giữa lịch duyệt ngày và danh sách tác vụ khi "
+msgstr ""
+"Ví trị của ô cửa sổ ngang, giữa lịch duyệt ngày và danh sách tác vụ khi "
 "không phải trong ô xem tháng, theo điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr "Ví trị của ô cửa sổ ngang, giữa ô xem và lịch duyệt ngày và danh sách "
-"tác vụ khi trong ô xem tháng, theo điểm ảnh."
+msgstr ""
+"Ví trị của ô cửa sổ ngang, giữa ô xem và lịch duyệt ngày và danh sách tác vụ "
+"khi trong ô xem tháng, theo điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
-msgstr "Vị trí của ô cửa sổ dọc, giữa danh sách tác vụ và ô xem cộng việc, theo "
-"điểm ảnh."
+msgstr ""
+"Vị trí của ô cửa sổ dọc, giữa danh sách tác vụ và ô xem cộng việc, theo điểm "
+"ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr "Ví trị của ô cửa sổ dọc, giữa ô xem và lịch duyệt ngày và danh sách công "
+msgstr ""
+"Ví trị của ô cửa sổ dọc, giữa ô xem và lịch duyệt ngày và danh sách công "
 "việc khi trong ô xem tháng, theo điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
-msgstr "Ví trị của ô cửa sổ ngang, giữa lịch duyệt ngày và danh sách tác vụ khi "
+msgstr ""
+"Ví trị của ô cửa sổ ngang, giữa lịch duyệt ngày và danh sách tác vụ khi "
 "không phải trong ô xem tháng, theo điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Chương trình mà bảo động có thể chạy."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Hiện trường RSVP trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Hiện trường Vai trò trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Hiện thời điểm kết thúc cuộc hẹn trong ô xem tuần và tháng đều"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Hiện trường Hạng trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Hiển thị báo động trong khay thông báo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Hiện trường Trạng thái trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Hiện ô « Xem thử »"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Hiện ô « Xem thử »"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Hiện trường Múi giờ trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Hiện trường Kiểu trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Hiện số thứ tự tuần trong bộ duyệt ngày"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Màu của tác vụ hết hạn vào hôm nay"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Ví trị ô cửa sổ dọc tác vụ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
-msgstr "Mẫu địa chỉ Mạng cần dùng là dữ liệu Rảnh/Bận phục hồi: « %u » được thay thế "
+msgstr ""
+"Mẫu địa chỉ Mạng cần dùng là dữ liệu Rảnh/Bận phục hồi: « %u » được thay thế "
 "bằng phần người dùng của địa chỉ thư, và « %d » được thay thế bằng miền của "
 "địa chỉ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
-msgstr "Múi giờ mặc định cần dùng cho ngày và giờ trong lịch, là ví trị cơ sở dữ "
+msgstr ""
+"Múi giờ mặc định cần dùng cho ngày và giờ trong lịch, là ví trị cơ sở dữ "
 "liệu kiểu Olsen chưa dịch như «Asia/Hanoi» (Châu Á/Hà nội)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Chia thời gian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Giờ đã bảo động cuối cùng, theo time_t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Múi giờ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr "Độ trong suốt của sự kiện trong ô xem lịch (giá trị giữa 0 và 10, đục theo "
-"mặc định)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Định dạng thời gian 24 giờ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Đơn vị cho bộ nhắc nhở mặc định: « phút », « giờ » hay « ngày »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Đơn vị để quyết định lúc nào ẩn cộng việc: « phút », « giờ » hay « ngày »."
+msgstr ""
+"Đơn vị để quyết định lúc nào ẩn cộng việc: « phút », « giờ » hay « ngày »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Tuần bắt đầu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Hôm bắt đầu tuần, từ Chủ Nhật (0) đến Thứ Bảy (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Có nên dùng khay thông báo để hiển thị báo động hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Có nên hỏi xác nhận khi xoá bỏ cuộc hẹn hay tác vụ hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Có nên hỏi xác nhận khi xoá hắn cuộc hẹn và tác vụ hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
-msgstr "Có nên nén những ngày cuối tuần trong ô xem tháng, mà hiển thị hai ngày "
-"Thứ Bảy và Chủ Nhật đều là cùng cách của một ngày tuần."
+msgstr ""
+"Có nên nén những ngày cuối tuần trong ô xem tháng, mà hiển thị hai ngày Thứ "
+"Bảy và Chủ Nhật đều là cùng cách của một ngày tuần."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "Có nên hiển thị thời điểm kết thúc sự kiện trong ô xem tuần và tháng đều "
-"hay không."
+msgstr ""
+"Có nên hiển thị thời điểm kết thúc sự kiện trong ô xem tuần và tháng đều hay "
+"không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "Có nên vẽ Dòng Marcus Bains (dòng tại giờ hiện có) trong lịch hay không."
+msgstr ""
+"Có nên vẽ Dòng Marcus Bains (dòng tại giờ hiện có) trong lịch hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Có nên ẩn mọi tác vụ đã hoàn tất trong ô xem tác vụ hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Có nên lập bộ nhắc nhở mặc định cho mọi cuộc hẹn hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Có nên hiển thị trường RSVP trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
+msgstr ""
+"Có nên hiển thị trường RSVP trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Có nên hiển thị trường loại trong bộ sửa cuộc họp/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Có nên hiển thị trường Vai trò trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
+msgstr ""
+"Có nên hiển thị trường Vai trò trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Có nên hiển thị trường trạng thái trong bộ sửa cuộc họp/tác vụ/dữ kiện hay "
+msgstr ""
+"Có nên hiển thị trường trạng thái trong bộ sửa cuộc họp/tác vụ/dữ kiện hay "
 "không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "Có nên hiển thị giờ dạng 24-giờ thay vào dùng am/pm (buổi sáng/buổi chiều-"
+msgstr ""
+"Có nên hiển thị giờ dạng 24-giờ thay vào dùng am/pm (buổi sáng/buổi chiều-"
 "tối) hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Có nên hiển thị trường múi giờ trong bộ sửa cuộc họp/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Có nên hiển thị trường kiểu trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
+msgstr ""
+"Có nên hiển thị trường kiểu trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Có nên hiển thị số thứ tự tuần trong bộ duyệt ngày hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Ngày làm việc"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Giờ kết thúc ngày làm việc"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Phút kết thúc ngày làm việc"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Giờ bắt đầu ngày làm việc"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Phút bắt đầu ngày làm việc"
 
@@ -5080,7 +5117,7 @@ msgid "Unmatched"
 msgstr "Không khớp"
 
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75
@@ -5091,9 +5128,9 @@ msgstr "In"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
@@ -5108,7 +5145,8 @@ msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr "Thao tác này sẽ xoá bỏ hoàn toàn mọi sự kiện trước khoảng thời gian được "
+msgstr ""
+"Thao tác này sẽ xoá bỏ hoàn toàn mọi sự kiện trước khoảng thời gian được "
 "chọn. Nếu bạn tiếp tục thì sẽ không thể phục hồi những tác vụ này."
 
 #: ../calendar/gui/calendar-commands.c:354
@@ -5162,59 +5200,59 @@ msgstr "Lỗi cập nhật lịch."
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Không thể mở lịch « %s » để tạo sự kiện và cuộc họp."
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Không có lịch nào sẵn sàng để tạo sự kiện và cuộc họp."
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Bộ chọn nguồn lịch"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "Cuộc _hẹn"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "Cuộc họ_p"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Tạo yêu cầu cuộc họp mới"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Cuộc hẹn ngu_yên ngày"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn nguyên ngày mới"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Lịch mới"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_Lịch"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Tạo lịch mới"
 
@@ -5247,7 +5285,7 @@ msgid "Permission denied to open the calendar"
 msgstr "Không đủ quyền truy cập để mở lịch"
 
 #: ../calendar/gui/comp-editor-factory.c:439
-#: ../shell/e-shell.c:1272
+#: ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Lỗi lạ"
 
@@ -5373,18 +5411,48 @@ msgstr "_Thêm"
 msgid "Alarms"
 msgstr "Báo động"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
-msgid "_Suggest automatic display of attachment"
-msgstr "Đề nghị _hiển thị tự động đồ đính kèm"
+#: ../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 "Đề nghị tự động hiển thị đính kèm"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Đính kèm tập tin"
 
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Thuộc tính đính kèm"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "Mô tả:"
+
+#: ../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 "Tên tập tin:"
+
+#: ../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 "Kiểu MIME:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Các Lịch đã chọn cho Báo động"
@@ -5396,7 +5464,8 @@ msgid ""
 "15 minutes\n"
 "10 minutes\n"
 "05 minutes"
-msgstr "60 phút\n"
+msgstr ""
+"60 phút\n"
 "30 phút\n"
 "15 phút\n"
 "10 phút\n"
@@ -5406,7 +5475,8 @@ msgstr "60 phút\n"
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>« %u » và « %d » sẽ được thay thế bằng người dùng và miền riêng từng từ "
+msgstr ""
+"<i>« %u » và « %d » sẽ được thay thế bằng người dùng và miền riêng từng từ "
 "địa chỉ thư.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
@@ -5445,7 +5515,7 @@ msgid "Display"
 msgstr "Hiển thị"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Rảnh/Bận"
@@ -5461,7 +5531,8 @@ msgid ""
 "Minutes\n"
 "Hours\n"
 "Days"
-msgstr "Phút\n"
+msgstr ""
+"Phút\n"
 "Giờ\n"
 "Ngày"
 
@@ -5480,7 +5551,8 @@ msgid ""
 "Friday\n"
 "Saturday\n"
 "Sunday"
-msgstr "Thứ Hai\n"
+msgstr ""
+"Thứ Hai\n"
 "Thứ Ba\n"
 "Thứ Tư\n"
 "Thứ Năm\n"
@@ -5494,187 +5566,181 @@ msgstr "Thứ Hai\n"
 msgid "Pick a color"
 msgstr "Chọn màu"
 
-#.Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "_CN"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "Chọn những lịch cần dùng tính năng báo động"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "_Hiện bộ nhắc nhở"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Hiệ_n số thứ tự tuần trong bộ duyệt ngày"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Chủ Nhật"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "Tác vụ hết hạn vào hôm n_ay:"
 
-#.Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "T_5"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Mẫu :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Múi _giờ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Dạng thức giờ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
 #.A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "Tuần _bắt đầu :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Ngày làm việc:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 giờ (AM/PM: sáng/chiều)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 giờ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Hỏi xác thực khi xó_a bỏ mục"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "Nén các ngày _cuối tuần trong ô xem tháng"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Ngày bắt đầu :"
 
-#.Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "T_6"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "Ẩn tác vụ _hoàn thành sau (khi)"
 
-#.Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "T_2"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "Tác vụ _quá hạn:"
 
-#.Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "T_7"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Hiện thời điểm kết thúc cuộc hẹn trong ô xem tuần và tháng đều"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "_Chia thời gian:"
 
-#.Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "T_3"
 
-#.Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "T_4"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "trước mỗi cuộc hẹn"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Chép nội dung lịch cục bộ để hoạt động ngoại tu_yến"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Chép nội dung lịch cục bộ để hoạt động ngoại tuyến"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Chép nội dung danh sách tác vụ cục bộ để hoạt động ngoại tu_yến"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Chép nội dung danh sách tác vụ cục bộ để hoạt động ngoại tuyến"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Chép nội dung danh sách ghi nhớ cục bộ để hoạt động ngoại tu_yến"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Chép nội dung danh sách ghi nhớ cục bộ để hoạt động ngoại tuyến"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Màu :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Danh sách tác vụ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Danh sách Ghi nhớ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Tài sản Lịch"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Lịch mới"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Thuộc tính Danh sách Tác vụ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Danh sách Ghi nhớ Mới"
 
@@ -5728,7 +5794,8 @@ msgstr "Mục nhật ký này bị xoá bỏ."
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Bạn đã tạo ra một vài thay đổi. Bỏ qua những thay đổi này và đóng bộ "
+msgstr ""
+"%s  Bạn đã tạo ra một vài thay đổi. Bỏ qua những thay đổi này và đóng bộ "
 "biên soạn sao không?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:79
@@ -5751,7 +5818,8 @@ msgstr "Mục nhật ký này đã được thay đổi."
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Bạn đã tạo ra vài thay đổi. Bỏ qua những thay đổi này và cập nhật bộ "
+msgstr ""
+"%s  Bạn đã tạo ra vài thay đổi. Bỏ qua những thay đổi này và cập nhật bộ "
 "biên soạn không?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
@@ -5765,32 +5833,32 @@ msgid "Validation error: %s"
 msgstr "Lỗi hợp lệ hoá: %s"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2280
+#: ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " tới "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2284
+#: ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Hoàn tất "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2286
+#: ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Hoàn tất "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2291
+#: ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Đến hạn "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2293
+#: ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Đến hạn "
 
 #: ../calendar/gui/dialogs/comp-editor.c:207
-#: ../composer/e-msg-composer.c:2861
+#: ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Thư đính kèm - %s"
@@ -5798,26 +5866,26 @@ msgstr "Thư đính kèm - %s"
 #.translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
 #: ../calendar/gui/dialogs/comp-editor.c:382
-#: ../composer/e-msg-composer.c:2866
-#: ../composer/e-msg-composer.c:3062
+#: ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d thư đính kèm"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446
-#: ../composer/e-msg-composer.c:3126
-#: ../mail/em-folder-tree.c:987
+#: ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1003
-#: ../mail/message-list.c:1874
+#: ../mail/em-folder-view.c:973
+#: ../mail/message-list.c:1725
 msgid "_Move"
-msgstr "Chu_yển"
+msgstr "_Chuyển"
 
 #: ../calendar/gui/dialogs/comp-editor.c:448
-#: ../composer/e-msg-composer.c:3128
-#: ../mail/em-folder-tree.c:989
-#: ../mail/message-list.c:1876
+#: ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982
+#: ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Thôi _kéo"
 
@@ -5826,7 +5894,7 @@ msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng"
 
 #: ../calendar/gui/dialogs/comp-editor.c:945
-#: ../composer/e-msg-composer.c:2490
+#: ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5837,100 +5905,101 @@ msgid "Hide Attachment _Bar"
 msgstr "Ẩn thanh đính _kèm"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Hiện thanh đính _kèm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3624
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Gỡ bỏ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3625
-#: ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620
+#: ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "Tài _sản"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3627
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Thêm đồ đính kèm..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Hiện các đồ đính kèm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Bấm phím dài để bật/tắt thanh đính kèm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cuộc họp - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tác vụ đã gán - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tác vụ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555
-#: ../widgets/misc/e-attachment-bar.c:365
+#: ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535
+#: ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "đính kèm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến vào."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Không thể dùng phiên bản hiện thời."
 
@@ -5946,10 +6015,6 @@ msgstr "Không thể mở đích."
 msgid "Destination is read only"
 msgstr "Đích chỉ cho phép đọc thôi."
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Xoá bỏ mục này ra hộp thư của mọi người nhận khác không?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Không thể xoá bỏ sự kiện này vi găp lỗi kiểu CORBA."
@@ -6011,17 +6076,17 @@ msgstr "Ủy nhiệm cho:"
 msgid "Enter Delegate"
 msgstr "Nhập người ủy nhiệm"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Cuộc _hẹn"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Định kỳ"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Nó có bảo động."
 
@@ -6031,7 +6096,7 @@ msgid "Cale_ndar:"
 msgstr "_Lịch:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6045,86 +6110,93 @@ msgstr "Người ủ_y nhiệm"
 msgid "Atte_ndees"
 msgstr "Người _dự"
 
-#: ../calendar/gui/dialogs/event-page.c:1083
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Sự kiện không có ngày bắt đầu"
 
-#: ../calendar/gui/dialogs/event-page.c:1086
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Sự kiện không có ngày kết thúc"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Ngày bắt đầu sai"
 
-#: ../calendar/gui/dialogs/event-page.c:1264
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Ngày kết thúc sai"
 
-#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Thời điểm đầu sai"
 
-#: ../calendar/gui/dialogs/event-page.c:1294
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Thời điểm kết thúc sai"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Bộ tổ chức đã chọn không còn có tài khoản lại."
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Cần một bộ tổ chức."
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Cần ít nhất một người dự."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Thêm "
 
-#: ../calendar/gui/dialogs/event-page.c:2618
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Không thể mở lịch « %s »."
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d ngày trước cuộc hẹn"
 
-#: ../calendar/gui/dialogs/event-page.c:2929
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d giờ trước cuộc hẹn"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d phút trước cuộc hẹn"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Tùy chỉnh"
 
 #.an empty string is the same as 'None'
+#.Put the "None" and "UTC" entries at the top of the combo's list.
+#.When "None" is selected we want the field to be cleared.
 #.Note that we don't show this here, since by default a 'None' date
 #.is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
 #: ../calendar/gui/e-itip-control.c:1099
-#: ../composer/e-msg-composer.c:2282
+#: ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889
 #: ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388
@@ -6133,7 +6205,8 @@ msgstr "Tùy chỉnh"
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1703
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249
 #: ../widgets/misc/e-dateedit.c:475
 #: ../widgets/misc/e-dateedit.c:1505
@@ -6176,12 +6249,16 @@ msgstr "_Mô tả:"
 msgid "Event Description"
 msgstr "Mô tả sự kiện"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "Địa đ_iểm:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Tó_m tắt:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Báo động"
 
@@ -6203,6 +6280,14 @@ msgstr "trong"
 msgid "until"
 msgstr "tới khi"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "Người ủ_y nhiệm"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Từ :"
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6250,7 +6335,7 @@ msgstr "Trả lời trước"
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Trạng thái"
 
@@ -6276,7 +6361,7 @@ msgid "Organizer:"
 msgstr "Tổ chức:"
 
 #: ../calendar/gui/dialogs/memo-editor.c:219
-#: ../calendar/gui/print.c:2321
+#: ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Ghi nhớ"
 
@@ -6491,7 +6576,7 @@ msgstr "Mỗi"
 #.'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 "C_uộc hẹn này lặp lại"
+msgstr "Cuộc hẹn này _lặp lại"
 
 #.TRANSLATORS: Entire string is for example:
 #.'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
@@ -6538,19 +6623,19 @@ msgstr "<span weight=\"bold\">Trạng thái</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462
+#: ../calendar/gui/e-calendar-table.c:461
 #: ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Hoàn tất"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:386
+#: ../mail/message-list.c:1012
 msgid "High"
 msgstr "Cao"
 
@@ -6559,23 +6644,23 @@ msgstr "Cao"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461
-#: ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460
+#: ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Đang tiến hành"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389
-#: ../mail/message-list.c:1027
+#: ../calendar/gui/e-calendar-table.c:388
+#: ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Thấp"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919
-#: ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:918
+#: ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Chuẩn"
 
@@ -6583,8 +6668,8 @@ msgstr "Chuẩn"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460
-#: ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459
+#: ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Chưa bắt đầu"
 
@@ -6597,7 +6682,7 @@ msgid "Stat_us:"
 msgstr "T_rạng thái:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Chưa định nghĩa"
 
@@ -6614,12 +6699,12 @@ msgstr "Độ ư_u tiên:"
 msgid "_Web Page:"
 msgstr "Trang _Mạng:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Tác vụ"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Chi tiết tác vụ"
 
@@ -6711,16 +6796,14 @@ msgstr[0] "%d tuần"
 
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
-msgstr "Không biết hành động cần thực hiện."
+msgstr "Không biết hành động cần thực hiện"
 
 #.Translator: The first %s refers to the base, which would be actions like
 #.* "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the start of the appointment"
-msgstr "%s %s trước khi bắt đầu cuộc hẹn"
-
-#.Translator: The first %s refers to the base, which would be actions like
+msgstr "%s %s trước khi bắt đầu cuộc hẹn"#.Translator: The first %s refers to the base, which would be actions like
 #.* "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:483
 #, c-format
@@ -6771,7 +6854,7 @@ msgstr "%s cho kiểu gây ra lạ"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70
-#: ../mail/em-folder-view.c:2857
+#: ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Nhấn để mở %s"
@@ -6810,7 +6893,7 @@ msgstr "Ngày đến hạn:"
 #: ../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:907
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Trạng thái:"
 
@@ -6818,31 +6901,22 @@ msgstr "Trạng thái:"
 msgid "Priority:"
 msgstr "Độ ưu tiên:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "Mô tả:"
-
 #: ../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
+#: ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Công cộng"
 
 #: ../calendar/gui/e-cal-list-view.c:256
 #: ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Riêng tư"
 
 #: ../calendar/gui/e-cal-list-view.c:257
 #: ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Tin tưởng"
 
@@ -6863,13 +6937,13 @@ msgid "Summary"
 msgstr "Tóm tắt"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Rảnh"
 
 #: ../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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Bận"
 
@@ -6878,24 +6952,25 @@ msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
-msgstr "Vị trí địa lý phải được nhập theo dạng thức:\n"
+msgstr ""
+"Vị trí địa lý phải được nhập theo dạng thức:\n"
 "\n"
 "10.783114,106.699804 (Sài Gòn)"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005
-#: ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Có"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005
-#: ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Không"
@@ -6909,23 +6984,23 @@ msgstr "Không"
 #: ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124
-#: ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222
-#: ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221
+#: ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Không biết"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Lặp lại"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Đã gán"
 
@@ -6935,7 +7010,7 @@ msgid "Save As..."
 msgstr "Lưu dạng..."
 
 #: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:1939
+#: ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Chọn thư mục nơi cần lưu những đính kèm đã chọn..."
 
@@ -6947,10 +7022,10 @@ msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
 #: ../calendar/gui/e-cal-popup.c:276
-#: ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1699
-#: ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596
+#: ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087
 #: ../mail/em-popup.c:554
 #: ../mail/em-popup.c:565
 msgid "_Save As..."
@@ -6972,84 +7047,79 @@ msgstr "_Lưu vùng chọn"
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-calendar-view.c:675
 #: ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Đang xoá bỏ các đối tượng đã chọn..."
 
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803
 #: ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Đang cập nhật các đối tượng..."
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138
+#: ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Lưu dạng..."
 
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1681
-msgid "New _Task"
-msgstr "_Tác vụ mới"
-
-#: ../calendar/gui/e-calendar-table.c:1260
-#: ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Mở trang _Mạng"
 
-#: ../calendar/gui/e-calendar-table.c:1262
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700
-#: ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1118
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597
+#: ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58
 #: ../ui/evolution-calendar.xml.h:44
@@ -7059,9 +7129,9 @@ msgstr "Mở trang _Mạng"
 msgid "_Print..."
 msgstr "_In..."
 
-#: ../calendar/gui/e-calendar-table.c:1266
-#: ../calendar/gui/e-calendar-view.c:1704
-#: ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1
@@ -7069,10 +7139,10 @@ msgstr "_In..."
 msgid "C_ut"
 msgstr "Cắ_t"
 
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706
-#: ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603
+#: ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15
@@ -7082,30 +7152,30 @@ msgstr "Cắ_t"
 msgid "_Paste"
 msgstr "_Dán"
 
-#: ../calendar/gui/e-calendar-table.c:1272
+#: ../calendar/gui/e-calendar-table.c:1187
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Gán Tác vụ"
 
-#: ../calendar/gui/e-calendar-table.c:1273
-#: ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188
+#: ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Chu_yển dạng iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1274
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "Đánh dấu _hoàn tất"
 
-#: ../calendar/gui/e-calendar-table.c:1275
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Đánh _dấu các tác vụ đã chọn là hoàn tất"
 
-#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Xoá bỏ các tác vụ đã chọn"
 
-#: ../calendar/gui/e-calendar-table.c:1513
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Nhấn để thêm tác vụ"
@@ -7141,105 +7211,109 @@ msgstr "Ngày bắt đầu"
 msgid "Task sort"
 msgstr "Sắp xếp tác vụ"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Đang di chuyển mục..."
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Đang sao chép mục..."
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Cuộc hẹ_n mới..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Sự _kiện nguyên ngày mới"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Cuộc _họp mới"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "_Tác vụ mới"
+
 #.FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Ô _xem hiện thời"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Chọn hôm na_y"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "Chọn n_gày..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_Chép vào Lịch..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Chuyển _vào Lịch..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "Ủ_y nhiệm cuộc họp..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch c_uộc họp..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "Chuyển dạng _iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "T_rả lời"
 
-#: ../calendar/gui/e-calendar-view.c:1716
-#: ../mail/em-folder-view.c:1112
+#: ../calendar/gui/e-calendar-view.c:1613
+#: ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559
 #: ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Cho phép di chuyển _lần này"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1619
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Xoá bỏ lần này"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Xó_a bỏ mọi lần"
 
 #.To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Tổ chức: %s <%s>"
 
 #.With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Tổ chức: %s"
 
 #.To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195
-#: ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2053
+#: ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Địa điểm: %s"
 
 #.To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Giờ: %s %s"
@@ -7268,7 +7342,7 @@ msgstr "Ngày phải được nhập theo dạng thức: \n"
 #.* to change the length of the time division in the calendar day view, e.g.
 #.* a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "lệch %02i phút"
@@ -7279,25 +7353,24 @@ msgstr "lệch %02i phút"
 #.month, %B = full month name. You can change the
 #.order but don't change the specifiers or add
 #.anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524
-#: ../calendar/gui/print.c:1538
+#: ../calendar/gui/e-day-view-top-item.c:707
+#: ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312
+#: ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #.String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745
+#: ../calendar/gui/e-day-view.c:744
 #: ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "sáng"
 
 #.String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748
+#: ../calendar/gui/e-day-view.c:747
 #: ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "chiều/tối"
 
@@ -7398,31 +7471,32 @@ msgstr "Người lạ"
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr "<br>Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ trình đơn bên "
+msgstr ""
+"<br>Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ trình đơn bên "
 "dưới."
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185
+#: ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1716
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Đã chấp nhận"
 
 #: ../calendar/gui/e-itip-control.c:1136
 #: ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1719
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Tạm đã chấp nhận"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675
 #: ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Bị từ chối"
 
@@ -7430,12 +7504,14 @@ msgstr "Bị từ chối"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr "Cuộc họp đã được hủy, tuy nhiên không tìm thấy nó trong các lịch của bạn."
+msgstr ""
+"Cuộc họp đã được hủy, tuy nhiên không tìm thấy nó trong các lịch của bạn."
 
 #: ../calendar/gui/e-itip-control.c:1226
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
-msgstr "Tác vụ đã được hủy, tuy nhiên không tìm thấy nó trong các danh sách tác vụ "
+msgstr ""
+"Tác vụ đã được hủy, tuy nhiên không tìm thấy nó trong các danh sách tác vụ "
 "của bạn."
 
 #: ../calendar/gui/e-itip-control.c:1305
@@ -7630,7 +7706,8 @@ msgstr "Đối tượng không hợp lệ nên không thể cập nhật nó.\n"
 
 #: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Hồi đáp này không phải đến từ một người dự hiện thời. Thêm người này như là "
+msgstr ""
+"Hồi đáp này không phải đến từ một người dự hiện thời. Thêm người này như là "
 "người dự nhé?"
 
 #: ../calendar/gui/e-itip-control.c:1954
@@ -7642,7 +7719,7 @@ msgid "Attendee status updated\n"
 msgstr "Mới cập nhật trạng thái người dự\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Không thể cập nhật trạng thái người dự vì không còn có lại mục ấy."
 
@@ -7754,76 +7831,76 @@ msgid "Resources"
 msgstr "Tài nguyên"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99
-#: ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98
+#: ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Riêng lẻ"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100
+#: ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Nhóm"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Tài nguyên"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Phòng"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Chủ trì"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Người dự cần thiết"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Người dự tùy chọn"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Người không tham dự"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Cần hành động"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Ướm"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Ủy nhiệm"
 
@@ -7832,15 +7909,15 @@ msgstr "Ủy nhiệm"
 msgid "Attendee                          "
 msgstr "Người dự                          "
 
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Trong tiến trình"
 
 #.This is a strftime() format string %A = full weekday name,
 #.%B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7848,87 +7925,87 @@ msgstr "%A, %d %B, %Y"
 #.name, %m = month number, %d = month day, %Y = full year.
 #.This is a strftime() format string %a = abbreviated weekday name,
 #.%m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #.This is a strftime() format string %m = month number,
 #.%d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:412
 #: ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ở ngoại văn phòng"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Không có thông tin"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Người _dự..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "Tù_y chọn"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Hiện chỉ giờ làm _việc"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Hiện Thu _nhỏ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Cậ_p nhật Rảnh/Bận"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Tự động chọn"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Mọi người và tài nguyên đều"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Mọi _người và một tài nguyên"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Người _cần thiết"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Người cần thiết _và một tài nguyên"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Thời điểm đầ_u :"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Thời điểm _cuối:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Xoá bỏ các ghi nhớ đã chọn"
 
-#: ../calendar/gui/e-memo-table.c:985
+#: ../calendar/gui/e-memo-table.c:993
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Nhấn để thêm ghi nhớ"
@@ -7938,13 +8015,14 @@ msgid "Memo sort"
 msgstr "Sắp xếp ghi nhớ"
 
 #: ../calendar/gui/e-memos.c:724
-#: ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
-msgstr "Lỗi khi « %s »:\n"
+msgstr ""
+"Lỗi khi « %s »:\n"
 " %s"
 
 #: ../calendar/gui/e-memos.c:772
@@ -7957,7 +8035,7 @@ msgid "Opening memos at %s"
 msgstr "Đang mở ghi nhớ tại %s..."
 
 #: ../calendar/gui/e-memos.c:1026
-#: ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Đang xoá bỏ các đối tượng đã chọn..."
 
@@ -7966,33 +8044,32 @@ msgstr "Đang xoá bỏ các đối tượng đã chọn..."
 msgid "Enter the password for %s"
 msgstr "Hãy gõ mật khẩu cho %s"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Đang tải tác vụ..."
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Đang mở tác vụ tại %s..."
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Đang hoàn tất tác vụ..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Đang xoá hẳn..."
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "Chọn múi giờ"
 
 #.strftime format %d = day of month, %B = full
 #.month name. You can change the order but don't
 #.change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541
-#: ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329
+#: ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8146,10 +8223,6 @@ msgstr "Thông tin iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người dự sự kiện ấy."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "Danh sách ghi _nhớ mới"
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
@@ -8215,7 +8288,8 @@ msgid ""
 "Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "Địa chỉ và cây thư mục tác vụ Evolution đã thay đổi so với Evolution phiên "
+msgstr ""
+"Địa chỉ và cây thư mục tác vụ Evolution đã thay đổi so với Evolution phiên "
 "bản 1.x.\n"
 "\n"
 "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
@@ -8226,7 +8300,8 @@ msgid ""
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "Địa chỉ và cây thư mục lịch Evolution đã thay đổi so với Evolution phiên bản "
+msgstr ""
+"Địa chỉ và cây thư mục lịch Evolution đã thay đổi so với Evolution phiên bản "
 "1.x.\n"
 "\n"
 "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
@@ -8235,7 +8310,8 @@ msgstr "Địa chỉ và cây thư mục lịch Evolution đã thay đổi so v�
 #: ../calendar/gui/migration.c:765
 #: ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Không thể chuyển đổi các thiết lập cũ từ tập tin evolution/config.xmldb"
+msgstr ""
+"Không thể chuyển đổi các thiết lập cũ từ tập tin evolution/config.xmldb"
 
 #.FIXME: domain/code
 #: ../calendar/gui/migration.c:794
@@ -8249,244 +8325,244 @@ msgstr "Không thể chuyển đổi lịch « %s »."
 msgid "Unable to migrate tasks `%s'"
 msgstr "Không thể chuyển đổi các tác vụ « %s »."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "mồng 1"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "mồng 2"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "mồng 3"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "mồng 4"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "mồng 5"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "mồng 6"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "mồng 7"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "mồng 8"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "mồng 9"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "mồng 10"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31"
 
 #.Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "CN"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "T2"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "T3"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "T4"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "T5"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "T6"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "T7"
 
 #.Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ngày đã chọn (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1961
-#: ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948
+#: ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1966
-#: ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953
+#: ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Tuần đã chọn (%s - %s)"
 
 #.Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Tháng đã chọn (%b %Y)"
 
 #.Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Năm đã chọn (%Y)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Tác vụ"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Tóm tắt: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Trạng thái: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Độ ưu tiên: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Phần trăm hoàn tất: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "Địa chỉ Mạng: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Loại: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Liên lạc: "
 
-#: ../calendar/gui/print.c:2601
-#: ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820
+#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799
 #: ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "In mục"
 
@@ -8549,22 +8625,23 @@ msgstr "_Danh sách tác vụ"
 msgid "Create a new task list"
 msgstr "Tạo danh sách tác vụ mới"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
-msgstr "Thao tác này sẽ xoá bỏ hoàn toàn mọi tác vụ được đánh dấu đã hoàn tất. Nếu "
+msgstr ""
+"Thao tác này sẽ xoá bỏ hoàn toàn mọi tác vụ được đánh dấu đã hoàn tất. Nếu "
 "bạn tiếp tục, bạn sẽ không thể phục hồi những tác vụ này.\n"
 "\n"
 "Bạn có thật sự muốn xoá bỏ những tác vụ này sao?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Đừng hỏi tôi lần nữa."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "In tác vụ"
 
@@ -10160,7 +10237,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Thanh đính kèm"
 
@@ -10168,46 +10245,31 @@ msgstr "Thanh đính kèm"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241
-#: ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439
-#: ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238
+#: ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441
+#: ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Không thể đính kèm tập tin « %s »: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249
-#: ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246
+#: ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Không thể đính kèm tập tin « %s »: không phải tập tin bình thường."
 
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Thuộc tính đính kèm"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Tên tập tin:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "Kiểu MIME:"
-
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Đích gửi đến"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Hãy chọn các thư mục nơi cần gửi thư."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Nhấn đây để xem Sổ địa chỉ"
 
@@ -10218,64 +10280,65 @@ msgstr "Nhấn đây để xem Sổ địa chỉ"
 #.* because that causes from_changed to be called, which
 #.* expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "T_rả lời cho :"
 
 #.
 #.* From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Từ :"
 
 #.
 #.* Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "C_hủ đề:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "Ch_o :"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Hãy gõ người nhận thư"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Chép cho: hãy gõ các địa chỉ sẽ nhận một bản sao của thư ấy."
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr "Bí mật Chép cho: hãy gõ các địa chỉ sẽ nhận một bản sao của thư mà không "
+msgstr ""
+"Bí mật Chép cho: hãy gõ các địa chỉ sẽ nhận một bản sao của thư mà không "
 "xuất hiện tên trong danh sách người nhận (tránh người gửi thư rác ăn cấp các "
 "địa chỉ ấy nhé)."
 
 #.
 #.* Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Gửi tới:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Nhấn vào đây để chọn thư mục nơi cần gửi"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Gửi tới:"
 
@@ -10283,14 +10346,15 @@ msgstr "Gửi tới:"
 msgid "A_ttach"
 msgstr "Đính _kèm"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Chèn đồ đính kèm"
 
 #: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Không thể ký tên thư gửi đi: chưa lập chứng nhận chữ ký cho tài khoản này."
+msgstr ""
+"Không thể ký tên thư gửi đi: chưa lập chứng nhận chữ ký cho tài khoản này."
 
 #: ../composer/e-msg-composer.c:835
 msgid ""
@@ -10300,13 +10364,13 @@ msgstr "Không thể mật mã hoá thư gửi đi: chưa lập chứng nhận m
 "này."
 
 #: ../composer/e-msg-composer.c:1295
-#: ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Ẩn th_anh đính kèm"
 
 #: ../composer/e-msg-composer.c:1298
-#: ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Hiện th_anh đính kèm"
 
@@ -10333,35 +10397,37 @@ msgstr "Thư không tên"
 msgid "Open File"
 msgstr "Mở tập tin"
 
-#: ../composer/e-msg-composer.c:2162
+#: ../composer/e-msg-composer.c:2151
 #: ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651
 #: ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Tự động phát sinh"
 
-#: ../composer/e-msg-composer.c:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Chữ _ký:"
 
-#: ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3752
-#: ../composer/e-msg-composer.c:3755
+#: ../composer/e-msg-composer.c:2522
+#: ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Viết thư"
 
-#: ../composer/e-msg-composer.c:4979
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(Bộ soạn thảo chứa phần thân thư phi văn bản nên không thể hiệu chỉnh nó)"
+msgstr ""
+"<b>(Bộ soạn thảo chứa phần thân thư phi văn bản nên không thể hiệu chỉnh nó)"
 "</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 "Hiện thời đang tải một số đính kèm về. Gửi thư này sẽ gửi nó không có những "
+msgstr ""
+"Hiện thời đang tải một số đính kèm về. Gửi thư này sẽ gửi nó không có những "
 "đính kèm treo."
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -10389,7 +10455,8 @@ msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
-msgstr "Đóng cửa sổ soạn này thì sẽ xoá bỏ thư ấy hoàn toàn, trừ bạn chọn lưu thư ấy "
+msgstr ""
+"Đóng cửa sổ soạn này thì sẽ xoá bỏ thư ấy hoàn toàn, trừ bạn chọn lưu thư ấy "
 "vào thư mục Nháp. Làm như thế sẽ cho phép bạn tiếp tục thư ấy lần sau."
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -10432,19 +10499,22 @@ msgstr "Gặp lỗi khi lưu vào tập tin lưu tự động vì « {1} »."
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
-msgstr "Trình Evolution đã thoát bất ngờ trong khi bạn soạn một thư mới. Phục hồi "
+msgstr ""
+"Trình Evolution đã thoát bất ngờ trong khi bạn soạn một thư mới. Phục hồi "
 "thư ấy thì sẽ cho phép bạn tiếp tục từ chỗ ấy."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "Tập tin « {0} » không phải là tập tin bình thường nên không thể được gửi "
+msgstr ""
+"Tập tin « {0} » không phải là tập tin bình thường nên không thể được gửi "
 "trong thư."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
-msgstr "Để đính kèm nội dung thư mục này thì bạn hãy hoặc đính kèm mỗi tập tin trong "
+msgstr ""
+"Để đính kèm nội dung thư mục này thì bạn hãy hoặc đính kèm mỗi tập tin trong "
 "nó từng cái một, hoặc tạo một kho của toàn bộ thư mục và đính kèm kho ấy."
 
 #: ../composer/mail-composer.error.xml.h:19
@@ -10453,7 +10523,8 @@ msgid ""
 "\n"
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
-msgstr "Không thể kích hoạt điều khiển bộ sửa HTML.\n"
+msgstr ""
+"Không thể kích hoạt điều khiển bộ sửa HTML.\n"
 "\n"
 "Vui lòng kiểm tra xem GtkHTML và libGtkHTML có được cài đặt đúng phiên bản "
 "chưa."
@@ -10493,7 +10564,7 @@ msgstr "_Lưu thư"
 # Name: do not translate/ tên: đừng dịch
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10519,7 +10590,8 @@ msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
 "Would you like to change your status to \"In the Office\"? "
-msgstr "<b>Hiện thời, trạng thái của bạn là «Ngoài văn phòng». </b>\n"
+msgstr ""
+"<b>Hiện thời, trạng thái của bạn là «Ngoài văn phòng». </b>\n"
 "\n"
 "Bạn có muốn thay đổi trạng thái thành «Trong văn phòng» không? "
 
@@ -10536,7 +10608,8 @@ msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
 "mail to you while you are out of the office.</small>"
-msgstr "<small>Thư dưới đây sẽ được tự động gửi tới mỗi người gửi thư cho bạn\n"
+msgstr ""
+"<small>Thư dưới đây sẽ được tự động gửi tới mỗi người gửi thư cho bạn\n"
 "khi bạn ở ngoài văn phòng.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
@@ -10577,7 +10650,8 @@ msgid ""
 "receipt when a message you\n"
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
-msgstr "<small>Trang này cho phép bạn chọn nếu muốn nhận thông báo người nhận đã đọc "
+msgstr ""
+"<small>Trang này cho phép bạn chọn nếu muốn nhận thông báo người nhận đã đọc "
 "thư của bạn, và cũng có thể lập hành động của trình Evolution khi người khác "
 "yêu cầu nhận thông báo đã đọc từ bạn.</small>"
 
@@ -10609,43 +10683,45 @@ msgstr "Trừ khi gửi thư ấy cho hộp thư chung, không phải cho tôi r
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr "Khi bạn nhận một thư yêu cầu nhận thông báo đã đọc, trình Evolution nên làm "
+msgstr ""
+"Khi bạn nhận một thư yêu cầu nhận thông báo đã đọc, trình Evolution nên làm "
 "gì vậy?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
-msgstr "Tập tin tên này đã có.\n"
+msgstr ""
+"Tập tin tên này đã có.\n"
 "Ghi đè lên nó không?"
 
-#: ../e-util/e-dialog-utils.c:285
+#: ../e-util/e-dialog-utils.c:283
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Ghi đè lên tập tin không?"
 
-#: ../e-util/e-error.c:86
-#: ../e-util/e-error.c:87
-#: ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84
+#: ../e-util/e-error.c:85
+#: ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Lỗi Evolution"
 
-#: ../e-util/e-error.c:88
-#: ../e-util/e-error.c:89
-#: ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86
+#: ../e-util/e-error.c:87
+#: ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Cảnh báo Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Thông tin Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Truy vấn Evolution"
 
 #.setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Lỗi nội bộ : yêu cầu lỗi không rõ « %s »."
@@ -10735,28 +10811,27 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Chọn thời điểm để đối chiếu"
 
-#: ../filter/filter-file.c:293
-#: ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Chọn tập tin"
 
 #: ../filter/filter-label.c:121
 #: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053
+#: ../mail/em-migrate.c:1052
 #: ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Quan trọng"
 
 #.forest green
 #: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Cần làm"
 
 #.blue
 #: ../filter/filter-label.c:125
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Sau đó"
@@ -10808,12 +10883,12 @@ msgstr "Gồm các nhánh"
 
 #: ../filter/filter-rule.c:986
 #: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Đến vào"
 
 #: ../filter/filter-rule.c:986
-#: ../mail/em-utils.c:329
+#: ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Gửi đi"
 
@@ -10827,7 +10902,8 @@ msgstr "Không thể biên dịch biểu thức chính quy « {1} »."
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "Tập tin « {0} » không tồn tại hoặc không phải là một tập tin bình thường."
+msgstr ""
+"Tập tin « {0} » không tồn tại hoặc không phải là một tập tin bình thường."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -10878,21 +10954,24 @@ msgstr "Hiển thị bộ lọc cho thư :"
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
-msgstr "Ngày gửi thư sẽ được đối chiếu với thời\n"
+msgstr ""
+"Ngày gửi thư sẽ được đối chiếu với thời\n"
 " điểm 12:00am tại ngày xác định."
 
 #: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
-msgstr "Ngày gửi thư sẽ được đối chiếu\n"
+msgstr ""
+"Ngày gửi thư sẽ được đối chiếu\n"
 "với thời điểm liên quan lúc lọc."
 
 #: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
-msgstr "Ngày gửi thư sẽ được đối chiếu\n"
+msgstr ""
+"Ngày gửi thư sẽ được đối chiếu\n"
 "với thời điểm hiện thời, khi lọc."
 
 #: ../filter/filter.glade.h:12
@@ -10908,7 +10987,7 @@ msgid "months"
 msgstr "tháng"
 
 #: ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "giây"
 
@@ -10943,7 +11022,8 @@ msgstr "Tùy thích bộ soạn thảo"
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
-msgstr "Cấu hình Tùy thích thư tín, bao gồm tính bảo mật và hiển thị thư, ở đây."
+msgstr ""
+"Cấu hình Tùy thích thư tín, bao gồm tính bảo mật và hiển thị thư, ở đây."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
@@ -10978,7 +11058,7 @@ msgid "Evolution Mail preferences control"
 msgstr "Bộ điều khiển tùy thích thư tín Evolution."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:518
+#: ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387
@@ -11016,9 +11096,9 @@ msgid ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 msgstr "\n"
-"Vui lòng đọc cẩn thận điều kiện bản quyền\n"
-"về %s được hiển thị bên dưới, và đánh dấu\n"
-"trong hộp chọn để chấp nhận các điều kiện này.\n"
+"Vui lòng đọc cẳn thận điều kiện quyền\n"
+"cho %s bên dưới, và đánh dấu\n"
+"trong hộp chọn để chấp nhận các điều kiện ấy.\n"
 
 #: ../mail/em-account-editor.c:482
 #: ../mail/em-filter-folder-element.c:237
@@ -11072,12 +11152,12 @@ msgstr "Tùy chọn Nhận"
 msgid "Checking for New Mail"
 msgstr "Kiểm tra tìm Thư Mới"
 
-#: ../mail/em-account-editor.c:2799
+#: ../mail/em-account-editor.c:2795
 #: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Bộ sửa tài khoản"
 
-#: ../mail/em-account-editor.c:2799
+#: ../mail/em-account-editor.c:2795
 #: ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
@@ -11117,7 +11197,7 @@ msgstr "Giao thức"
 
 #: ../mail/em-composer-prefs.c:311
 #: ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Không tên"
 
@@ -11149,7 +11229,8 @@ msgstr "người gửi lạ"
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
-msgstr "Vào ${AbbrevWeekdayName}, ngày ${Day}, ${Month} năm ${Year} lúc ${24Hour}:"
+msgstr ""
+"Vào ${AbbrevWeekdayName}, ngày ${Day}, ${Month} năm ${Year} lúc ${24Hour}:"
 "${Minute} ${TimeZone}, ${Sender} viết:"
 
 #: ../mail/em-filter-editor.c:155
@@ -11301,7 +11382,7 @@ msgid "Junk Test"
 msgstr "Kiểm tra Rác"
 
 #: ../mail/em-filter-i18n.h:37
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Nhãn"
 
@@ -11347,7 +11428,6 @@ msgid "Read"
 msgstr "Đọc"
 
 #: ../mail/em-filter-i18n.h:48
-#: ../mail/message-list.etspec.h:11
 msgid "Recipients"
 msgstr "Người nhận"
 
@@ -11376,12 +11456,11 @@ msgid "Run Program"
 msgstr "Chạy chương trình"
 
 #: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Điểm"
 
 #: ../mail/em-filter-i18n.h:56
-#: ../mail/message-list.etspec.h:13
 msgid "Sender"
 msgstr "Người gửi"
 
@@ -11414,11 +11493,11 @@ msgid "Stop Processing"
 msgstr "Dừng xử lý"
 
 #: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format-html.c:1659
+#: ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313
 #: ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:90
-#: ../mail/message-list.etspec.h:17
+#: ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11434,7 +11513,7 @@ msgstr "Bỏ đặt trạng thái"
 msgid "<b>Then</b>"
 msgstr "<b>Rồi</b>"
 
-#: ../mail/em-folder-browser.c:147
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "Tạ_o thư mục tìm kiếm từ kết quả tìm kiếm..."
 
@@ -11489,7 +11568,7 @@ msgstr "Nháp"
 #.translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487
 #: ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Hộp Đến"
 
@@ -11508,86 +11587,86 @@ msgstr "Đã gửi"
 msgid "Loading..."
 msgstr "Đang tải..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Cây thư mục thư"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Đang chuyển thư mục %s..."
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Đang sao chép thư mục %s..."
 
-#: ../mail/em-folder-tree.c:870
-#: ../mail/message-list.c:1778
+#: ../mail/em-folder-tree.c:863
+#: ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Đang chuyển thư vào thư mục %s..."
 
-#: ../mail/em-folder-tree.c:872
-#: ../mail/message-list.c:1780
+#: ../mail/em-folder-tree.c:865
+#: ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Đang sao chép thư vào thư mục %s..."
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Không thể thả thư vào kho mức độ đỉnh"
 
-#: ../mail/em-folder-tree.c:984
+#: ../mail/em-folder-tree.c:977
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Chép vào thư mục"
 
-#: ../mail/em-folder-tree.c:985
+#: ../mail/em-folder-tree.c:978
 #: ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Chu_yển vào thư mục"
 
-#: ../mail/em-folder-tree.c:1690
-#: ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683
+#: ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Đang quét các thư mục trong « %s »..."
 
-#: ../mail/em-folder-tree.c:2049
+#: ../mail/em-folder-tree.c:2042
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24
-#: ../ui/evolution-mail-global.xml.h:29
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56
 #: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Xem"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Mở tro_ng cửa sổ mới"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Chép..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "Chu_yển..."
 
 #.FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "Thư mục _mới..."
 
-#: ../mail/em-folder-tree.c:2062
+#: ../mail/em-folder-tree.c:2055
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "Tha_y tên..."
 
-#: ../mail/em-folder-tree.c:2067
+#: ../mail/em-folder-tree.c:2060
 #: ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Đổ _Rác"
@@ -11598,15 +11677,15 @@ msgid "Copying `%s' to `%s'"
 msgstr "Đang sao chép « %s » vào « %s »..."
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1003
-#: ../mail/em-folder-view.c:1018
+#: ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1018
+#: ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "Ché_p"
 
@@ -11628,318 +11707,321 @@ msgstr "Tạo thư mục"
 msgid "Specify where to create the folder:"
 msgstr "Xác định nơi tạo thư mục:"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1081
 #: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: ../mail/em-folder-view.c:1113
+#: ../mail/em-folder-view.c:1083
 #: ../mail/em-popup.c:561
 #: ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Chuyển t_iếp"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1086
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Sửa dạng thư mới..."
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Hủy xoá bỏ"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Ch_uyển sang thư mục..."
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Chép vào thư mục..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Đánh dấu Đã đọ_c"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Đánh dấ_u Chưa đọc"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Đánh dấu _Quan trọng"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Đánh dấu _Rác"
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Đá_nh dấu Khác rác"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Đánh dấu Cần th_eo dõi tiếp..."
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Nhãn"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Không có"
 
-#: ../mail/em-folder-view.c:1141
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Cờ _hoàn tất"
 
-#: ../mail/em-folder-view.c:1142
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Xó_a cờ"
 
-#: ../mail/em-folder-view.c:1145
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Tạo quy tắc trên thư"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Thư mục tìm kiếm theo _Chủ đề"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Thư mục tìm kiếm theo Người _gửi"
 
-#: ../mail/em-folder-view.c:1148
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Thư mục tìm kiếm theo Người _nhận"
 
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Thư mục tìm kiếm theo _Hộp thư chung"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _Chủ đề"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Lọc theo Người _gửi"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo Người _nhận"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Lọc  theo _Hộp thư chung"
 
 #.default charset used in mail view
-#: ../mail/em-folder-view.c:1997
-#: ../mail/em-folder-view.c:2041
+#: ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Mặc định"
 
-#: ../mail/em-folder-view.c:2140
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "In thư"
 
-#: ../mail/em-folder-view.c:2296
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Không thể nhận thư."
 
-#: ../mail/em-folder-view.c:2494
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Chép địa chỉ liên kết"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Tạo thư mục tìm _kiếm"
 
-#: ../mail/em-folder-view.c:2495
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Từ địa chỉ này"
 
-#: ../mail/em-folder-view.c:2496
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Cho địa chỉ này"
 
-#: ../mail/em-folder-view.c:2850
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Nhấn để gửi thư cho %s"
 
-#: ../mail/em-folder-view.c:2855
-msgid "Click to hide/unhide addresses"
-msgstr "Nhấn để (bỏ) ẩn địa chỉ"
-
 #.message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Khớp: %d"
 
-#: ../mail/em-format-html-display.c:781
-#: ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Chưa ký"
 
-#: ../mail/em-format-html-display.c:781
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Thư này không có chữ ký nên không thể đảm bảo thư này do người ấy gửi."
 
-#: ../mail/em-format-html-display.c:782
-#: ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Chữ ký hợp lệ"
 
-#: ../mail/em-format-html-display.c:782
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Thư này có chữ ký và hợp lệ nên rất có thể là thư ấy do người ấy gửi."
 
-#: ../mail/em-format-html-display.c:783
-#: ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758
+#: ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Chữ ký không hợp lệ"
 
-#: ../mail/em-format-html-display.c:783
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr "Không thể xác minh chữ ký của thư này: có lẽ nó bị giả trong khi truyền."
+msgstr ""
+"Không thể xác minh chữ ký của thư này: có lẽ nó bị giả trong khi truyền."
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Chữ ký hợp lệ nhưng mà không thể xác minh người gửi."
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "Thư này có chữ ký hợp lệ, nhưng mà không thể xác minh người gửi thư."
 
-#: ../mail/em-format-html-display.c:790
-#: ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Không mật mã"
 
-#: ../mail/em-format-html-display.c:790
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "Thư này không mật mã nên bất cứ người nào có xem được nội dung nó trong khi "
 "truyền qua Mạng."
 
-#: ../mail/em-format-html-display.c:791
-#: ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766
+#: ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Mật mã yếu"
 
-#: ../mail/em-format-html-display.c:791
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
-msgstr "Thư này mật mã, nhưng mà dùng thuật toán mật mã yếu. Người khác sẽ gặp khó "
+msgstr ""
+"Thư này mật mã, nhưng mà dùng thuật toán mật mã yếu. Người khác sẽ gặp khó "
 "khăn đọc thư này được một thời gian hữu ích, nhưng mà có thể làm như thế."
 
-#: ../mail/em-format-html-display.c:792
-#: ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767
+#: ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Mật mã"
 
-#: ../mail/em-format-html-display.c:792
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "Thư này mật mã. Người khác sẽ gặp khó khăn nhiều đọc nội dung thư."
 
-#: ../mail/em-format-html-display.c:793
-#: ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Mật mã mạnh"
 
-#: ../mail/em-format-html-display.c:793
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
-msgstr "Thư này mật mã dùng thuật toán mật mã mạnh. Người khác sẽ gặp khó khăn rất "
+msgstr ""
+"Thư này mật mã dùng thuật toán mật mã mạnh. Người khác sẽ gặp khó khăn rất "
 "nhiều đọc nội dung thư được thời gian hữu ích. "
 
-#: ../mail/em-format-html-display.c:894
+#: ../mail/em-format-html-display.c:869
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Xem chứng nhận"
 
-#: ../mail/em-format-html-display.c:909
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Chứng nhận này không có khả năng xem"
 
-#: ../mail/em-format-html-display.c:1200
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Hoàn tất vào %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1208
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Quá hạn:"
 
-#: ../mail/em-format-html-display.c:1211
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "trước %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1271
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Xem trực tiếp"
 
-#: ../mail/em-format-html-display.c:1272
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "Ẩ_n"
 
-#: ../mail/em-format-html-display.c:1273
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Vừa khít độ rộng"
 
-#: ../mail/em-format-html-display.c:1274
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Hiện kích cỡ _gốc"
 
-#: ../mail/em-format-html-display.c:1693
+#: ../mail/em-format-html-display.c:1667
 #: ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Đính kèm"
 
-#: ../mail/em-format-html-display.c:1900
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Chọn thư mục nơi cần lưu mọi đính kèm..."
 
-#: ../mail/em-format-html-display.c:1947
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Lưu vùng chọn..."
 
 #.Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2014
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
-msgstr[0] "%d đồ đí_nh kèm"
+msgstr[0] "%d đồ đính kèm"
 
-#: ../mail/em-format-html-display.c:2021
-#: ../mail/em-format-html-display.c:2097
+#: ../mail/em-format-html-display.c:1995
+#: ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Lưu"
 
-#: ../mail/em-format-html-display.c:2032
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Lư_u hết"
 
-#: ../mail/em-format-html-display.c:2093
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Không có đồ đính kèm"
 
@@ -11954,44 +12036,44 @@ msgstr "Trang %d trên %d"
 msgid "Retrieving `%s'"
 msgstr "Đang nhận « %s »..."
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Chữ ký hợp lệ nhưng mà không thể xác minh người gửi."
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Thân bên ngoại dạng sai."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Trỏ tới tập tin cục bộ (%s) hợp lệ tại nơi Mạng « %s »"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới dữ liệu ở xa (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu « %s »)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Đang định dạng thư..."
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844
 #: ../mail/em-mailer-prefs.c:85
@@ -12000,29 +12082,29 @@ msgstr "Đang định dạng thư..."
 msgid "From"
 msgstr "Từ"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845
 #: ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846
 #: ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Cho"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847
 #: ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848
 #: ../mail/em-mailer-prefs.c:89
@@ -12030,23 +12112,23 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #.pseudo-header
-#: ../mail/em-format-html.c:1663
+#: ../mail/em-format-html.c:1588
 #: ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Trình thư"
 
 #.translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #.translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703
+#: ../mail/em-format-html.c:1628
 #: ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850
 #: ../mail/em-mailer-prefs.c:91
@@ -12056,7 +12138,7 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Date"
 msgstr "Ngày"
 
-#: ../mail/em-format-html.c:1726
+#: ../mail/em-format-html.c:1651
 #: ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
@@ -12112,63 +12194,65 @@ msgstr "Một lần mỗi tuần"
 msgid "Once per month"
 msgstr "Một lần mỗi tháng"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "Vị trí và cây của các thư mục hộp thư Evolution đã thay đổi so sánh với "
+msgstr ""
+"Vị trí và cây của các thư mục hộp thư Evolution đã thay đổi so sánh với "
 "trình Evolution phiên bản 1.x.\n"
 "\n"
 "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Không thể tạo thư mục mới « %s »: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Không thể sao chép thư mục « %s » sang « %s »: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Không thể quét tìm hộp thư đã có tại « %s »: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Không thể mở dữ liệu giữ-trên-máy-chủ POP cũ « %s »: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Không thể tạo thư mục dữ liệu giữ-trên-máy-chủ POP3 « %s »: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Không thể sao chép dữ liệu giữ-trên-máy-chủ POP3 « %s »: %s"
 
-#: ../mail/em-migrate.c:2578
-#: ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577
+#: ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Việc tạo kho thư địa phương « %s » bị lỗi: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Không thể tạo những thư mục thư địa cục bộ « %s »: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr "Không thể đọc thiết lập từ bản cài đặt Evolution cũ: tập tin «evolution/"
+msgstr ""
+"Không thể đọc thiết lập từ bản cài đặt Evolution cũ: tập tin «evolution/"
 "config.xmldb» bị hỏng hay không tồn tại."
 
 #: ../mail/em-popup.c:557
@@ -12182,6 +12266,10 @@ msgstr "T_rả lời người gửi"
 msgid "Reply to _List"
 msgstr "Trả lời _Hộp thư chung"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Mở liên kết bằng trình duyệt"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Gửi thư mới cho..."
@@ -12211,29 +12299,29 @@ msgstr "Hãy chọn máy phục vụ."
 msgid "No server has been selected"
 msgstr "Chưa chọn máy phục vụ."
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Đừng hiện thư này lần nữa."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Bộ lọc thư"
 
-#: ../mail/em-utils.c:516
-#: ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496
+#: ../mail/em-utils.c:533
 msgid "message"
 msgstr "thư"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Lưu thư..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Thêm địa chỉ"
 
 #.Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Thừ từ %s"
@@ -12275,499 +12363,445 @@ msgid "Composer Window default width"
 msgstr "Độ rộng mặc định cửa sổ soạn"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Thu gọn ô hiển thị các địa chỉ trong Cho/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr "Thu gọn ô hiển thị các địa chỉ trong trường Cho/CC/BCC thành số được xác "
-"định trong giá trị « address_count » (số đếm địa chỉ)"
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Bộ ký tự mặc định để soạn thảo thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Bộ ký tự mặc định để soạn thảo thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Bộ ký tự mặc định để hiển thị thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Bộ ký tự mặc định để hiển thị thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Kiểu chuyển tiếp mặc định"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Độ cao mặc định cửa Cửa sổ Soạn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Độ cao mặc định cửa Cửa sổ Thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Độ cao mặc định cửa hộp thoại Đăng ký"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Kiểu trả lời mặc định"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Độ rộng mặc định cửa Cửa sổ Soạn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Độ rộng mặc định cửa Cửa sổ Thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Độ rộng mặc định cửa hộp thoại Đăng ký"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vẽ chỉ báo lỗi chính tả trên từ khi gõ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Đổ các thư mục Rác khi thoát"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Đổ các thư mục Rác khi thoát trình Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Hiệu lực chế độ con nháy, để bạn xem con chạy khi đọc thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Bật/tắt tính năng tìm kiếm gõ trước"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr "Hiệu lực tính năng tìm kiếm khung lề để bắt đầu tìm kiếm tương tác bằng cách "
-"gõ vào đoạn. Có ích để tìm dễ dàng thư mục trong khung lề bằng cách đơn giản "
-"gõ tên thư mục thì phần chọn nhảy tự động tới thư mục đó."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Bật/tắt chế độ con nháy"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Độ cao ô cửa sổ danh sách thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Độ cao ô cửa sổ danh sách thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
-msgstr "Nếu người dùng cố mở hơn 9 thư cùng lúc thì hỏi nếu họ thật muốn làm như thế."
-
-#: ../mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "Nếu ô cửa sổ « Xem thử » được bật, hiển thị nó cạnh nhau hơn là theo chiều dọc."
+msgstr ""
+"Nếu người dùng cố mở hơn 9 thư cùng lúc thì hỏi nếu họ thật muốn làm như thế."
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
-msgstr "Nếu Evolution không có bộ xem có sẵn cho một kiểu MIME nào đó thì sẽ dùng "
+msgstr ""
+"Nếu Evolution không có bộ xem có sẵn cho một kiểu MIME nào đó thì sẽ dùng "
 "bất cứ bộ xem tương thích với Bonobo nào sẵn sàng trong cơ sở dữ liệu kiểu "
 "MIME của GNOME."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Lần cuối cùng đã đổ Rác"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Danh sách Nhãn và màu sắc liên quan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Danh sách các quyền phép đã chấp nhận"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Danh sách các tài khoản"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr "Danh sách các tài khoản mà thành phần thư của Evolution biết được. Danh sách "
+msgstr ""
+"Danh sách các tài khoản mà thành phần thư của Evolution biết được. Danh sách "
 "ấy chứa chuỗi lập tên của các thư mục con liên quan với /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Danh sách các dòng đầu tự chọn và nếu bật chưa."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
-msgstr "Danh sách các nhãn mà thành phần thư của Evolution biết được. Danh sách ấy "
+msgstr ""
+"Danh sách các nhãn mà thành phần thư của Evolution biết được. Danh sách ấy "
 "chứa chuỗi name:color (tên:màu) mà màu ấy dạng hệ thập lục phân HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
-msgstr "Danh sách các kiểu MIME cần kiểm tra khớp với bộ xem thành phần Bonobo."
+msgstr ""
+"Danh sách các kiểu MIME cần kiểm tra khớp với bộ xem thành phần Bonobo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Danh sách các tên giao thức có quyền đã chấp nhận."
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Tải các ảnh cho thư HTML bằng giao thức HTTP"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
-msgstr "Tải các ảnh cho thư HTML bằng giao thức HTTP hay HTTPS. Giá trị có thể là:\n"
+msgstr ""
+"Tải các ảnh cho thư HTML bằng giao thức HTTP hay HTTPS. Giá trị có thể là:\n"
 "0 - không bao giờ tải ảnh từ Mạng\n"
 "1 - tải ảnh nếu người gửi có trong Sổ địa chỉ\n"
 "2 - luôn luôn tải ảnh từ Mạng (không an toàn)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Ghi lưu các hành động lọc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Ghi lưu các hành động lọc vào tập tin bản ghi đã ghi rõ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Tập tin bản ghi nơi cần ghi lưu các hành động lọc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Tập tin bản ghi nơi cần ghi lưu các hành động lọc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Đánh dấu là Đã xem, sau thời hạn đã ghi rõ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Đánh dấu là Đã xem, sau thời hạn đã ghi rõ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Đánh các trích dẫn trong thư « Xem thử »."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Đánh các trích dẫn trong thư « Xem thử »."
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Độ cao mặc định của Cửa sổ thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Độ rộng mặc định của Cửa sổ thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Kiểu dáng hiển thị thư (chuẩn, dòng đầu đây đủ, mã nguồn)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Số ngày tối thiểu giữa hai lần đổ Rác khi thoát."
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Thời gian tối thiểu giữa hai lần sổ Rác khi thoát, theo ngày."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Tập tin âm thanh Thông báo Thư Mới"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Kiểu Thông báo Thư Mới"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Số địa chỉ cần hiển thị trong Cho/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Nhắc khi có chủ đề rỗng"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Nhắc người dùng khi họ cố xoá hẳn thư mục."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Nhắc người dùng khi họ cố gửi thư chưa có Chủ đề."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Nhắc khi người dùng xoá hẳn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Nhắc khi người dùng chỉ nhập Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Nhắc khi người dùng cố mở hơn 9 thư cùng lúc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Nhắc khi người dùng cố gửi thư HTML cho liên lạc không muốn nhận HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Nhắc khi người dùng cố gửi thư mà không có người nhận Cho (To) hay Chép Cho "
+msgstr ""
+"Nhắc khi người dùng cố gửi thư mà không có người nhận Cho (To) hay Chép Cho "
 "(CC)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Nhắc khi người dùng cố gửi thư dạng HTML không phải được muốn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Nhận ra mọi liên kết trong văn bản và thay thế chúng."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Nhận dạng biểu tượng xác cảm trong văn bản và thay thế bằng ảnh."
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Chạy kiểm tra thư Rác khi mọi thư gửi Đến"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Gửi thư dạng HTML theo mặc định"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Gửi thư dạng HTML theo mặc định"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Hiện hoạt cảnh"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Hiện ảnh đã hoạt cảnh kiểu hoạt cảnh."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Hiển thị mọi thư bị xoá bỏ (kiểu gạch xuyên qua) trong danh sách các thư."
+msgstr ""
+"Hiển thị mọi thư bị xoá bỏ (kiểu gạch xuyên qua) trong danh sách các thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Hiển thị thư bị xoá bỏ trong danh sách các thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "Hiển thị địa chỉ thư của người gửi trong cột ghép thư trong danh sách thư"
-
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Hiển thị địa chỉ thư của người gửi trong cột thư trong danh sách thư"
-
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Tập tin âm thanh cần phát khi nhận thư mới."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Ghi rõ kiểu Thông báo Thư Mới người dùng muốn dùng."
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Kiểm tra trực tiếp chính tả"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Độ cao mặc định của hộp thoại đăng ký"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Độ rộng mặc định của hộp thoại đăng ký"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Phông chữ thiết bị cuối"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Lần cuối cùng đã chạy đổ Rác, theo ngày từ kỷ nguyên bắt đầu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Phông chữ thiết bị cuối để hiển thị thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Phông chữ độ rộng thay đổi để hiển thị thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
-msgstr "Khoá này nên chứa danh sách các cấu trúc XML ghi rõ dòng đầu tự chọn, và nếu "
+msgstr ""
+"Khoá này nên chứa danh sách các cấu trúc XML ghi rõ dòng đầu tự chọn, và nếu "
 "sẽ hiển thị chúng. Dang thức của cấu trúc XML là:\n"
 "&lt;header enabled&gt;\n"
 "(lập đã bật dòng đầu, nếu sẽ hiển thị dòng đầu ấy trong ô xem thư)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr "Tùy chọn này đặt số địa chỉ cần hiển thị trong ô xem danh sách thư mặc định, "
-"ở ngoại đó hiển thị dấu chấm lửng (…)."
-
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Hiển thị nhánh trong danh sách thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Hiển thị nhánh trong danh sách thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Hiển thị nhánh trong danh sách thư, theo Chủ đề"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Thời hạn đánh dấu thư Đã xem."
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Thời hạn đánh dấu thư Đã xem."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Chuỗi UID của tài khoản mặc định."
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Dùng trình nền và ứng dụng khách Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Dùng trình nền và ứng dụng khách Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Dùng phông chữ tự chọn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Dùng phông chữ tự chọn để hiển thị thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Dùng chỉ sự kiểm tra thư rác kiểu cục bộ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Dùng chỉ sự kiểm tra thư rác kiểu cục bộ (không có DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "Use side-by-side or wide layout"
-msgstr "Dùng bố trí cạnh nhau hay rộng"
-
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Phông chữ rộng biến"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Mục trình đơn Xem/Bcc đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Mục trình đơn Xem/Bcc đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Mục trình đơn Xem/Cc đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Mục trình đơn Xem/Cc đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Mục trình đơn Xem/Từ đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Mục trình đơn Xem/Từ đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Mục trình đơn Xem/Gửi tới đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Mục trình đơn Xem/Gửi tới đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Mục trình đơn Xem/Trả lời cho đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Mục trình đơn Xem/Trả lời cho đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
-msgstr "Có nên trở về tạo nhánh thư theo chủ đề khi thư không chứa dòng đầu In-Reply-"
+msgstr ""
+"Có nên trở về tạo nhánh thư theo chủ đề khi thư không chứa dòng đầu In-Reply-"
 "To (trả lời theo thư trước) hay References (tham chiếu)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
-msgid "Width of the message-list pane"
-msgstr "Độ rộng ô cửa sổ danh sách thư"
-
-#: ../mail/evolution-mail.schemas.in.in.h:120
-msgid "Width of the message-list pane."
-msgstr "Độ rộng của ô cửa sổ danh sách thư."
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Đang nhập dữ liệu Elm..."
@@ -12800,15 +12834,15 @@ msgstr "Bộ nhập thư mục dạng Berkeley Mailbox"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
 #: ../mail/importers/mail-importer.c:233
-#: ../shell/e-shell-importer.c:529
+#: ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Đang nhập « %s »..."
 
 #: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Vui lòng chờ..."
 
@@ -12840,7 +12874,8 @@ msgid ""
 "Evolution's scores, and the affected filters use scores instead\n"
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
-msgstr "Một số bộ lọc Netscape của bạn đựa vào độ ưu tiên thư,\n"
+msgstr ""
+"Một số bộ lọc Netscape của bạn đựa vào độ ưu tiên thư,\n"
 "mà Evolution không dùng. Thay vào đó, trình Evolution\n"
 "cung cấp điểm từ -3 đến 3, thì có thể lọc thư theo điểm\n"
 "đã gán vào nó.\n"
@@ -12857,7 +12892,8 @@ msgid ""
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
-msgstr "Một số bộ lọc Netscape của bạn dùng tín năng\n"
+msgstr ""
+"Một số bộ lọc Netscape của bạn dùng tín năng\n"
 "« Bỏ qua nhánh » hay « Theo dõi nhánh » mà trình\n"
 "Evolution không hỗ trợ. Sẽ bỏ qua những bộ lọc này."
 
@@ -12868,7 +12904,8 @@ msgid ""
 "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 "Một số bộ lọc Netscape của bạn kiểm tra\n"
+msgstr ""
+"Một số bộ lọc Netscape của bạn kiểm tra\n"
 "nếu thân thư khớp (hay không khớp) một chuỗi đã cho,\n"
 "mà trình Evolution không hỗ trợ. Đã sửa đổi\n"
 "các bộ lọc ấy để kiểm tra nếu thân thư\n"
@@ -12894,7 +12931,8 @@ msgstr "Bộ lọc thư"
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
-msgstr "Evolution đã tìm một số tập tin thư dạng Netscape.\n"
+msgstr ""
+"Evolution đã tìm một số tập tin thư dạng Netscape.\n"
 "Bạn có muốn nhập chúng vào Evolution không?"
 
 #: ../mail/importers/pine-importer.c:229
@@ -13256,7 +13294,8 @@ msgid ""
 "using Evolution. \n"
 "\n"
 "Click \"Apply\" to save your settings."
-msgstr "Xin chúc mừng, bạn đã hoàn tất quá trình cấu hình thư.\n"
+msgstr ""
+"Xin chúc mừng, bạn đã hoàn tất quá trình cấu hình thư.\n"
 "\n"
 "Từ bây giờ bạn có thể gửi và nhận thư bằng Evolution.\n"
 "\n"
@@ -13393,14 +13432,16 @@ msgstr "_Phát tập tin âm thanh khi nhận thư mới"
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
-msgstr "Hãy nhập một tên diễn tả cho tài khoản này vào trường bên dưới.\n"
+msgstr ""
+"Hãy nhập một tên diễn tả cho tài khoản này vào trường bên dưới.\n"
 "Chỉ được dùng tên này với mục đích hiển thị thôi."
 
 #: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
-msgstr "Hãy nhập thông tin về cách bạn sẽ gửi thư. Nếu bạn không chắc, hãy hỏi quản "
+msgstr ""
+"Hãy nhập thông tin về cách bạn sẽ gửi thư. Nếu bạn không chắc, hãy hỏi quản "
 "trị hệ thống hoặc ISP (nhà cung cấp dịch vụ Mạng) của bạn."
 
 #: ../mail/mail-config.glade.h:111
@@ -13408,7 +13449,8 @@ msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr "Vui lòng nhập tên và địa chỉ thư điện từ vào bên dưới. Trường « tùy chọn » "
+msgstr ""
+"Vui lòng nhập tên và địa chỉ thư điện từ vào bên dưới. Trường « tùy chọn » "
 "bên dưới không cần phải đã chọn, trừ khi bạn muốn gồm thông tin ấy vào thư "
 "bạn cần gửi."
 
@@ -13524,7 +13566,8 @@ msgstr "Kiể_u : "
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "Danh sách ngôn ngữ này phản ánh chỉ những ngôn ngữ cho mà bạn đã cài đặt từ "
+msgstr ""
+"Danh sách ngôn ngữ này phản ánh chỉ những ngôn ngữ cho mà bạn đã cài đặt từ "
 "điển."
 
 #: ../mail/mail-config.glade.h:143
@@ -13532,7 +13575,8 @@ msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
-msgstr "Đầu ra của tập lệnh này sẽ được dùng\n"
+msgstr ""
+"Đầu ra của tập lệnh này sẽ được dùng\n"
 "như là chữ ký bạn.\n"
 "Tên bạn xác định sẽ chỉ được dùng\n"
 "chỉ cho mục đích hiển thị."
@@ -13541,7 +13585,8 @@ msgstr "Đầu ra của tập lệnh này sẽ được dùng\n"
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
-msgstr "Hãy gõ tên mà bạn muốn dùng cho tài khoản này.\n"
+msgstr ""
+"Hãy gõ tên mà bạn muốn dùng cho tài khoản này.\n"
 "Ví dụ: « Chỗ làm » hoặc « Cá nhân »."
 
 #: ../mail/mail-config.glade.h:149
@@ -13558,7 +13603,8 @@ msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
-msgstr "Chào mừng dùng Phụ tá cấu hình thư Evolution.\n"
+msgstr ""
+"Chào mừng dùng Phụ tá cấu hình thư Evolution.\n"
 "\n"
 "Hãy nhấn « Tiếp » để bắt đầu."
 
@@ -13624,26 +13670,18 @@ msgid "_Show image animations"
 msgstr "_Hiện hoạt cảnh ảnh"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "Th_u gọn dòng đầu Cho/CC/BCC thành "
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "Dùng kết nối _bảo mật:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Dùng cùng những phông chữ với các ứng dụng khác"
 
-#: ../mail/mail-config.glade.h:177
-msgid "addresses"
-msgstr "địa chỉ"
-
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "màu"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "mô tả"
 
@@ -13707,12 +13745,13 @@ msgstr "Thông tin Bảo mật"
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
-msgstr "Các thư mà bạn đã chọn để theo dõi tiếp thì được liệt kê bên dưới.\n"
+msgstr ""
+"Các thư mà bạn đã chọn để theo dõi tiếp thì được liệt kê bên dưới.\n"
 "Hãy chọn một hành động theo dõi tiếp từ trình đơn « Cờ »."
 
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
-msgstr "_Chấp nhận Bản quyền"
+msgstr "_Chấp nhận Bản Quyền"
 
 #: ../mail/mail-dialogs.glade.h:20
 #: ../mail/message-tags.glade.h:6
@@ -13730,7 +13769,9 @@ msgstr "Đăng _ký"
 
 #: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
-msgstr "Hãy đánh dấu _trong hộp chọn này để chấp nhận các điều kiện của bản quyền này."
+msgstr ""
+"Hãy đánh dấu _trong hộp chọn này để chấp nhận các điều kiện của bản quyền "
+"này."
 
 #: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
@@ -13758,173 +13799,185 @@ msgstr "với mọi thư mục cục bộ"
 msgid "Pinging %s"
 msgstr "Đang « ping » %s..."
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Đang lọc thư mục..."
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Đang lấy thư..."
 
 #.sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Việc áp dụng bộ lọc gửi đi bị lỗi: %s"
 
-#: ../mail/mail-ops.c:578
-#: ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577
+#: ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
-msgstr "Lỗi phụ thêm vào %s: %s\n"
+msgstr ""
+"Lỗi phụ thêm vào %s: %s\n"
 "Thì phụ thêm vào thư mục « Đã gửi » thay thế."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Lỗi thêm vào thư mục « Đã gửi » cục bộ: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Đang gửi thư %d trên %d..."
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Việc gửi %d trên %d thư bị lỗi."
 
-#: ../mail/mail-ops.c:763
+#: ../mail/mail-ops.c:762
 #: ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Bị thôi."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Hoàn tất."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Đang lưu thư vào thư mục..."
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Đang chuyển thư tới %s..."
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Đang sao chép thư vào %s..."
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Thư đã chuyển tiếp"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Đang mở thư mục %s..."
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Đang mở kho %s..."
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Đang gở bỏ thư mục %s..."
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Đang cất giữ thư mục %s..."
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Đang xoá hẳn và cất giữ tài khoản %s..."
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Đang cất giữ tài khoản %s..."
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Đang cập nhật thư mục..."
 
-#: ../mail/mail-ops.c:1614
-#: ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613
+#: ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Đang xoá hẳn thư mục..."
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Đang đổ rác trong « %s »..."
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Đang lấy thư %s..."
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Đang lấy %d thư..."
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Đang lưu %d thư..."
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Không thể tạo tập tin xuất: %s:\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
-msgstr "Gặp lỗi khi lưu thư vào: %s:\n"
+msgstr ""
+"Gặp lỗi khi lưu thư vào: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Đang lưu đính kèm..."
 
-#: ../mail/mail-ops.c:2098
 #: ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
-msgstr "Không thể tạo tập tin xuất: %s:\n"
+msgstr ""
+"Không thể tạo tập tin xuất: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu : %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s..."
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s..."
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Đang kiểm tra dịch vụ..."
 
@@ -13953,26 +14006,17 @@ msgstr "Đang chờ..."
 msgid "Checking for new mail"
 msgstr "Đang kiểm tra tìm thư mới..."
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Hãy gõ cụm từ mật khẩu cho %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Gõ cụm từ mật khẩu"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Hãy gõ mật khẩu cho %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Gõ mật khẩu"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Người dùng đã thôi thao tác này."
 
@@ -14047,7 +14091,8 @@ msgid ""
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
-msgstr "Một thư mục không rỗng tại « {1} » đã có.\n"
+msgstr ""
+"Một thư mục không rỗng tại « {1} » đã có.\n"
 "\n"
 "Bạn có thể chọn bỏ qua thư mục này, ghi đè lên nó, phụ thêm nội dung nó, "
 "hoặc thoát."
@@ -14056,7 +14101,8 @@ msgstr "Một thư mục không rỗng tại « {1} » đã có.\n"
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
-msgstr "Yêu cầu một thông báo đã đọc cho « {1} ». Gửi thông báo nhận đó cho {0} chứ?"
+msgstr ""
+"Yêu cầu một thông báo đã đọc cho « {1} ». Gửi thông báo nhận đó cho {0} chứ?"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
@@ -14068,7 +14114,8 @@ msgstr "Chữ ký tên « {0} » đã có. Hãy gõ tên khác."
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "Thêm một Chủ đề có nghĩa vào thư bạn sẽ cho người nhận ý kiến về nội dung."
+msgstr ""
+"Thêm một Chủ đề có nghĩa vào thư bạn sẽ cho người nhận ý kiến về nội dung."
 
 #: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -14081,7 +14128,8 @@ msgstr "Bạn có muốn xoá bỏ tài khoản này không?"
 #: ../mail/mail.error.xml.h:10
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "Bạn có chắc muốn tắt tài khoản này và xoá bỏ các ủy nhiệm của nó không?"
+msgstr ""
+"Bạn có chắc muốn tắt tài khoản này và xoá bỏ các ủy nhiệm của nó không?"
 
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
@@ -14091,13 +14139,15 @@ msgstr "Bạn có chắc muốn mở cả {0} thư cùng lúc không?"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "Bạn có chắc muốn gỡ bỏ hoàn toàn mọi thư đã xoá bỏ trong mọi thư mục không?"
+msgstr ""
+"Bạn có chắc muốn gỡ bỏ hoàn toàn mọi thư đã xoá bỏ trong mọi thư mục không?"
 
 #: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
-msgstr "Bạn có chắc muốn xoá bỏ hoàn toàn mọi thư đã xoá bỏ trong thư mục « {0} » "
+msgstr ""
+"Bạn có chắc muốn xoá bỏ hoàn toàn mọi thư đã xoá bỏ trong thư mục « {0} » "
 "không?"
 
 #: ../mail/mail.error.xml.h:14
@@ -14106,7 +14156,8 @@ msgstr "Bạn có chắc muốn gửi thư dạng HTML không?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Bạn có chắc muốn gửi thư chỉ có người nhận Bí mật Chép Cho (BCC) không?"
+msgstr ""
+"Bạn có chắc muốn gửi thư chỉ có người nhận Bí mật Chép Cho (BCC) không?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
@@ -14177,7 +14228,8 @@ 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 "Không thể đọc tập tin quyền phép « {0} » vì gặp lỗi cài đặt. Bạn sẽ không "
+msgstr ""
+"Không thể đọc tập tin quyền phép « {0} » vì gặp lỗi cài đặt. Bạn sẽ không "
 "thể sử dụng nhà cung cấp này cho đến khi có thể chấp nhận quyền phép của nó."
 
 #: ../mail/mail.error.xml.h:34
@@ -14208,7 +14260,8 @@ msgstr "Không thể lập tập lệnh chữ ký « {0} »."
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
-msgstr "Hãy kiểm tra xem đã gõ mật khẩu cho đúng. Nhiều mật khẩu phân biệt chữ hoa, "
+msgstr ""
+"Hãy kiểm tra xem đã gõ mật khẩu cho đúng. Nhiều mật khẩu phân biệt chữ hoa, "
 "chữ thường; phím CapsLock (chữ hoa luôn) phải tắt."
 
 #: ../mail/mail.error.xml.h:41
@@ -14279,7 +14332,8 @@ msgstr "Nếu bạn tiếp tục, bạn sẽ không thể phục hồi những t
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr "Nếu bạn xoá bỏ thư mục này, mọi nội dung của nó và mọi nội dung của thư mục "
+msgstr ""
+"Nếu bạn xoá bỏ thư mục này, mọi nội dung của nó và mọi nội dung của thư mục "
 "con của nó sẽ bị xoá bỏ hoàn toàn."
 
 #: ../mail/mail.error.xml.h:58
@@ -14290,7 +14344,8 @@ msgstr "Nếu bạn tiếp tục, mọi tài khoản ủy nhiệm sẽ bị xoá
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
-msgstr "Nếu bạn tiếp tục, thông tin tài khoản và các thông tin ủy nhiệm sẽ bị xoá bỏ "
+msgstr ""
+"Nếu bạn tiếp tục, thông tin tài khoản và các thông tin ủy nhiệm sẽ bị xoá bỏ "
 "hoàn toàn."
 
 #: ../mail/mail.error.xml.h:61
@@ -14301,7 +14356,8 @@ msgstr "Nếu bạn tiếp tục, thông tin tài khoản sẽ bị xoá bỏ ho
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "Nếu bạn thoát thì những thư này sé không được gửi tới khi khởi chạy lại "
+msgstr ""
+"Nếu bạn thoát thì những thư này sé không được gửi tới khi khởi chạy lại "
 "trình Evolution."
 
 #: ../mail/mail.error.xml.h:63
@@ -14322,7 +14378,8 @@ msgid ""
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
-msgstr "Nhiều hệ thống thư điện tử thêm một dòng đầu «Hình như Cho» (Apparently-To) "
+msgstr ""
+"Nhiều hệ thống thư điện tử thêm một dòng đầu «Hình như Cho» (Apparently-To) "
 "vào mọi thư chỉ có người nhận BCC (Bí mật Chép Cho). Nếu thêm dòng đầu ấy, "
 "nó sẽ liệt kê mọi người nhận trong thư của bạn. Để tránh người gửi thư Rác "
 "ăn cấp các địa chỉ trong danh sách ấy, bạn hãy thêm ít nhất một người nhận "
@@ -14360,7 +14417,8 @@ msgstr "Hãy bật tài khoản này hoặc gửi bằng tài khoản khác."
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
-msgstr "Hãy nhập một địa chỉ thư điện tử hợp lệ vào trường Cho: (To). Có thể tìm "
+msgstr ""
+"Hãy nhập một địa chỉ thư điện tử hợp lệ vào trường Cho: (To). Có thể tìm "
 "kiếm địa chỉ thư bằng cách nhắp vào nút Cho: (To) ở cạnh hộp nhập."
 
 #: ../mail/mail.error.xml.h:76
@@ -14369,7 +14427,8 @@ msgid ""
 "HTML email:\n"
 "{0}\n"
 "Send anyway?"
-msgstr "Hãy đảm bảo rằng những người nhận sau có thể và cũng muốn nhận thư dạng "
+msgstr ""
+"Hãy đảm bảo rằng những người nhận sau có thể và cũng muốn nhận thư dạng "
 "HTML:\n"
 "{0}\n"
 "Vẫn muốn gửi không?"
@@ -14392,7 +14451,8 @@ msgstr "Đang truy vấn máy phục vụ..."
 
 #: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Đang truy vấn máy phục vụ có danh sách các cơ chế xác thực được hỗ trợ."
+msgstr ""
+"Đang truy vấn máy phục vụ có danh sách các cơ chế xác thực được hỗ trợ."
 
 #: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
@@ -14400,7 +14460,8 @@ msgstr "Thông báo đã đọc được yêu cầu."
 
 #: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Bạn thật sự muốn xoá bỏ thư mục « {0} » và mọi thư mục con của nó không?"
+msgstr ""
+"Bạn thật sự muốn xoá bỏ thư mục « {0} » và mọi thư mục con của nó không?"
 
 #: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
@@ -14416,9 +14477,11 @@ msgstr "Chữ ký đã có"
 
 #: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr "Không cho phép thay đổi tên của thư mục hệ thống, di chuyển hay xoá bỏ chúng vì trình Evolution cần thiết thư mục hệ thống để hoạt động được."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+"Không cho phép thay đổi tên của thư mục hệ thống, di chuyển hay xoá bỏ chúng "
+"vì trình Ximian Evolution cần thiết thư mục hệ thống để hoạt động được."
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -14428,7 +14491,8 @@ msgid ""
 "BCC recipients. This header, if added, will list all of your recipients in "
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
-msgstr "Bạn đang gửi cho một danh sách liên lạc có cấu hình ẩn mọi người nhận có "
+msgstr ""
+"Bạn đang gửi cho một danh sách liên lạc có cấu hình ẩn mọi người nhận có "
 "trong danh sách ấy.\n"
 "\n"
 "Nhiều hệ thống thư điện tử thêm một dòng đầu «Hình như Cho» (Apparently-To) "
@@ -14444,7 +14508,8 @@ msgid ""
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
-msgstr "Những thư mục tìm kiếm theo đây:\n"
+msgstr ""
+"Những thư mục tìm kiếm theo đây:\n"
 "{0}\n"
 "đã dùng thư mục mới bị gỡ bỏ:\n"
 "    « {1} »\n"
@@ -14457,7 +14522,8 @@ msgid ""
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
-msgstr "Những quy tắc lọc theo đây:\n"
+msgstr ""
+"Những quy tắc lọc theo đây:\n"
 "{0}\n"
 "đã dùng thư mục mới bị gỡ bỏ:\n"
 "    « {1} »\n"
@@ -14471,14 +14537,16 @@ msgstr "Tập tin tập lệnh phải tồn tại và có chạy được."
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
-msgstr "Có lẽ đã thêm thư mục này một cách ngầm; hãy dùng bộ sửa thư mục tìm kiếm để "
+msgstr ""
+"Có lẽ đã thêm thư mục này một cách ngầm; hãy dùng bộ sửa thư mục tìm kiếm để "
 "thêm nó một cách dứt khoát, nếu cần thiết."
 
 #: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "Không thể gửi thư này vì bạn đang gửi nó bằng một tài khoản chưa được bật"
+msgstr ""
+"Không thể gửi thư này vì bạn đang gửi nó bằng một tài khoản chưa được bật"
 
 #: ../mail/mail.error.xml.h:107
 msgid ""
@@ -14489,7 +14557,8 @@ msgstr "Không thể gửi thư này vì bạn chưa ghi rõ người nhận nà
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "Máy phục vụ này không hỗ trợ loại xác thực này và có lẽ hoàn toàn không hỗ "
+msgstr ""
+"Máy phục vụ này không hỗ trợ loại xác thực này và có lẽ hoàn toàn không hỗ "
 "trợ xác thực nào."
 
 #: ../mail/mail.error.xml.h:109
@@ -14500,7 +14569,8 @@ msgstr "Chữ ký này đã thay đổi, nhưng vẫn chưa được lưu."
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr "Hành động này sẽ đánh dấu mọi thư Đã Đọc trong thư mục đã chọn, cũng trong "
+msgstr ""
+"Hành động này sẽ đánh dấu mọi thư Đã Đọc trong thư mục đã chọn, cũng trong "
 "mọi thư mục con của nó."
 
 #: ../mail/mail.error.xml.h:111
@@ -14511,7 +14581,8 @@ msgstr "Không kết nối tới máy phục vụ Groupwise được."
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "Không thể mở thư mục Nháp (Drafts) cho tài khoản này. Dùng thư mục Nháp của "
+msgstr ""
+"Không thể mở thư mục Nháp (Drafts) cho tài khoản này. Dùng thư mục Nháp của "
 "hệ thống thay thế chứ?"
 
 #: ../mail/mail.error.xml.h:113
@@ -14551,7 +14622,8 @@ msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
-msgstr "Bạn phải ghi rõ ít nhất một thư mục là nguồn,\n"
+msgstr ""
+"Bạn phải ghi rõ ít nhất một thư mục là nguồn,\n"
 "hoặc bằng cách chọn mỗi thư mục từng một cái,\n"
 "hoặc/và bằng cách chọn mọi thư mục địa phương,\n"
 "mọi thư mục ở xa, hoặc cả hai."
@@ -14576,81 +14648,80 @@ msgstr "_Xoá hẳn"
 msgid "_Open Messages"
 msgstr "_Mở các thư"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Chưa xem"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Đã xem"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Đã trả lời"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Nhiều thư chưa xem"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Nhiều thư"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Thấp hơn"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: ../mail/message-list.c:1423
+#: ../mail/message-list.c:1341
 #: ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #.strftime format of a time,
 #.in 12-hour format, without seconds.
-#: ../mail/message-list.c:1430
+#: ../mail/message-list.c:1348
 #: ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: ../mail/message-list.c:1439
+#: ../mail/message-list.c:1357
 #: ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: ../mail/message-list.c:1451
+#: ../mail/message-list.c:1369
 #: ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1459
+#: ../mail/message-list.c:1377
 #: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1461
+#: ../mail/message-list.c:1379
 #: ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2213
-#: ../mail/message-list.etspec.h:8
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Thư"
 
-#: ../mail/message-list.c:3601
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thư..."
 
@@ -14670,19 +14741,15 @@ msgstr "Đã đặt cờ"
 msgid "Follow Up Flag"
 msgstr "Cờ theo dõi tiếp"
 
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Địa điểm gốc"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Đã nhận"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "Thư đã gửi"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Cỡ"
@@ -14762,8 +14829,9 @@ msgstr "Cung cấp chức năng lõi cho các sổ địa chỉ cục bộ."
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from evolution."
-msgstr "Một bổ sung định dạng mà hiển thị đính kèm âm thanh trong thư, và cho "
-"phép bạn phát chúng một cách trực tiếp từ trình Evolution."
+msgstr ""
+"Một bổ sung định dạng mà hiển thị đính kèm âm thanh trong thư, và cho phép "
+"bạn phát chúng một cách trực tiếp từ trình Evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -14803,7 +14871,8 @@ msgstr "Khởi chạy lại Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Bổ sung để lưu trữ và phục hồi dữ liệu và thiết lập của trình Evolution."
+msgstr ""
+"Bổ sung để lưu trữ và phục hồi dữ liệu và thiết lập của trình Evolution."
 
 #.the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
@@ -14842,7 +14911,8 @@ msgstr "Liên lạc Tin nhắn tức khắc"
 #: ../plugins/bbdb/bbdb.c:490
 msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Đồng bộ hoá theo định kỷ các thông tin liên lạc và ảnh đều từ danh sách "
+msgstr ""
+"Đồng bộ hoá theo định kỷ các thông tin liên lạc và ảnh đều từ danh sách "
 "người bạn Gaim"
 
 #.Synchronize now button.
@@ -14855,7 +14925,8 @@ 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 "Tự động chèn vào sổ địa chỉ các tên và địa chỉ thư đều khi bạn trả lời thư. "
+msgstr ""
+"Tự động chèn vào sổ địa chỉ các tên và địa chỉ thư đều khi bạn trả lời thư. "
 "Cũng chèn thông tin về liên lặc tin nhắn tức khác từ các danh sách người bạn "
 "của bạn."
 
@@ -14951,8 +15022,13 @@ msgstr "Lịch Thời tiết"
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr "Một bổ sung thử ra mà biểu diễn một bổ sung trình đơn bật lên cho "
-"phép bạn sao chép điều vào bảng nháp."
+msgstr ""
+"Một bổ sung thử ra mà biểu diễn một bổ sung trình đơn bật lên cho phép bạn "
+"sao chép điều vào bảng nháp."
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Chép địa chỉ _thư"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -14965,7 +15041,8 @@ msgstr "Kiểm tra nếu Evolution là trình thư mặc định."
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "Mỗi lần khởi chạy Evolution, kiểm tra nếu nó là trình thư mặc định hay không."
+msgstr ""
+"Mỗi lần khởi chạy Evolution, kiểm tra nếu nó là trình thư mặc định hay không."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
@@ -14977,7 +15054,8 @@ msgstr "Ứng dụng khách thư mặc định "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Bạn có muốn đặt Evolution là ứng dụng khách thư điện tử mặc định của bạn "
+msgstr ""
+"Bạn có muốn đặt Evolution là ứng dụng khách thư điện tử mặc định của bạn "
 "không?"
 
 #: ../plugins/default-source/default-source.c:82
@@ -15021,7 +15099,8 @@ msgstr "Mật khẩu bảo mật"
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
-msgstr "Tùy chọn này sẽ kết nối đến máy phục vụ Exchange dùng cách xác thực mặt khẩu "
+msgstr ""
+"Tùy chọn này sẽ kết nối đến máy phục vụ Exchange dùng cách xác thực mặt khẩu "
 "bảo mật (NTLM)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
@@ -15032,7 +15111,8 @@ msgstr "Mật khẩu chữ thô"
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
-msgstr "Tùy chọn này sẽ kết nối tới máy phục vụ Exchannge dùng cách xác thực mật "
+msgstr ""
+"Tùy chọn này sẽ kết nối tới máy phục vụ Exchannge dùng cách xác thực mật "
 "khẩu chữ thô (không mã hoá)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
@@ -15043,7 +15123,8 @@ msgstr "Ở ngoại văn phòng"
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
-msgstr "Thư dưới đây sẽ được gửi tự động\n"
+msgstr ""
+"Thư dưới đây sẽ được gửi tự động\n"
 "tới mỗi người gửi thư cho bạn khi bạn ở ngoài văn phòng."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:276
@@ -15115,7 +15196,8 @@ msgstr "_Kiểm tra có kiểu được hỗ trợ"
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
-msgstr "Trình Evolution hiện thời trong chế độ ngoại tuyện. Như thế thì bạn chưa có "
+msgstr ""
+"Trình Evolution hiện thời trong chế độ ngoại tuyện. Như thế thì bạn chưa có "
 "thể tạo hay sửa đổi thư mục.\n"
 "Hãy chuyển đổi sang chế độ trực tuyến cho thao tác như vậy."
 
@@ -15126,7 +15208,8 @@ msgstr "Trình Evolution hiện thời trong chế độ ngoại tuyện. Như t
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
-msgstr "Mật khẩu hiện thời không khớp với mật khẩu tồn tại cho tài khoản bạn. Hãy gõ "
+msgstr ""
+"Mật khẩu hiện thời không khớp với mật khẩu tồn tại cho tài khoản bạn. Hãy gõ "
 "mật khẩu đúng."
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
@@ -15147,18 +15230,17 @@ msgstr "Mật khẩu mới:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
-msgstr "Mật khẩu hiện thời của bạn đã hết hạn. Hãy thay đổi mật khẩu bạn ngay bây "
+msgstr ""
+"Mật khẩu hiện thời của bạn đã hết hạn. Hãy thay đổi mật khẩu bạn ngay bây "
 "giờ."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Mật khẩu bạn sẽ hết hạn dùng trong vòng %d ngày"
 
-#.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
 msgid "Custom"
 msgstr "Tự chọn"
 
@@ -15247,7 +15329,8 @@ msgstr "Người xem lại (chỉ đọc)"
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
-msgstr "Những người dùng này sẽ có thể gửi thư điện tử\n"
+msgstr ""
+"Những người dùng này sẽ có thể gửi thư điện tử\n"
 "thay mặt cho bạn, cũng có thể truy cập các thư mục bạn,\n"
 "dùng quyền hạn mà bạn đã cho họ."
 
@@ -15278,7 +15361,7 @@ msgstr "Tên thư mục:"
 msgid "Folder Size"
 msgstr "Cỡ thư mục"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Đăng ký với thư mục của người dùng khác"
@@ -15293,14 +15376,14 @@ msgstr "Cây thư mục Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Bỏ đăng ký thư mục..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Thật sự bỏ đăng ký trên thư mục « %s » không?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Bỏ đăng ký trên thư mục « %s »"
@@ -15409,7 +15492,8 @@ msgstr "Đăng ký với lịch của người dùng khác"
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr "Bổ sung có quản lý một số thao tác và tính năng đặc trưng cho Evolution."
+msgstr ""
+"Bổ sung có quản lý một số thao tác và tính năng đặc trưng cho Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -15424,83 +15508,80 @@ msgid "Cannot display folders."
 msgstr "Không thể hiển thị thư mục."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot perform the operation."
-msgstr "Không thể thực hiện thao tác đó."
-
-#: ../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 "Các thay đổi trong tùy chọn của tài khoản Evolution « {0} » sẽ có tác động "
-"chỉ sau khi bạn khởi chạy lại trình Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
+msgstr ""
+"Các thay đổi trong cấu hình của tài khoản Evolution sẽ có tác động chỉ sau khi bạn thoát và khởi chạy lại trình Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "Không thể xác thực tới máy phục vụ."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "Không thể thay đổi mật khẩu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
-msgstr "Không thể cấu hình tài khoản Exchange\n"
+msgstr ""
+"Không thể cấu hình tài khoản Exchange\n"
 "vì gặp một lỗi lạ. Bạn hãy kiểm tra đã gõ đúng\n"
 "địa chỉ Mạng, tên người dùng và mật khẩu\n"
 "rồi thử lại."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "Không thể kết nối đến máy phục vụ Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "Không thể kết nối đến máy phục vụ {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Không thể xác định quyền truy cập thư mục cho người ủy nhiệm."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Không tìm thấy Hệ thống Cất giữ Mạng Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Không thể định vị máy phục vụ {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "Không thể ủy nhiệm cho {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Không thể đọc quyền truy cập thư mục."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Không thể đọc quyền truy cập thư mục."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "Không thể đọc tính trạng ngoài-văn-phòng."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Không thể cập nhật quyền truy cập thư mục."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "Không thể cập nhật tính trạng ngoài-văn-phòng."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Tài khoản Exchange đang ngoại tuyến."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15514,7 +15595,8 @@ msgid ""
 "\n"
 "{0}\n"
 "  "
-msgstr "Trình Exchange Connector cần thiết truy cập\n"
+msgstr ""
+"Trình Exchange Connector cần thiết truy cập\n"
 "chức năng nào đó trên máy phục vụ Exchange\n"
 "dương như bị tắt hay bị trở ngại.\n"
 "(Thường không phải do chủ tâm.)\n"
@@ -15528,188 +15610,195 @@ msgstr "Trình Exchange Connector cần thiết truy cập\n"
 "<{0}>\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "Không thể cập nhật người ủy nhiệm:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "Thư mục này đã có"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "Không có thư mục này"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "Thư mục này ngoại tuyến."
 
-#: ../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:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Lỗi chung"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr "Nếu OWA đang chạy trên đường dẫn khác thì bạn cần phải ghi rõ nó trong hộp "
+msgstr ""
+"Nếu OWA đang chạy trên đường dẫn khác thì bạn cần phải ghi rõ nó trong hộp "
 "thoại cấu hình tài khoản."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "Không có hộp thư cho {0} trên máy phục vụ này."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "Hãy kiểm tra xem gõ địa chỉ Mạng đúng, rồi thử lại."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Hãy kiểm tra xem gõ tên phục vụ đúng, rồi thử lại."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr "Hãy kiểm tra xem gõ tên người dùng và mật khẩu đúng, rồi thử lại."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
-msgstr "Không có trình phục vụ Phân loại Toàn cục được cấu hình cho tài khoản này."
+msgstr ""
+"Không có trình phục vụ Phân loại Toàn cục được cấu hình cho tài khoản này."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "Không có hộp thư cho người dùng {0} trên {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "Không có người dùng như vậy {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "Mật khẩu đã được thay đổi."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Hãy khởi chạy lại Evolution để các thay đổi có tác động"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "Khởi chạy lại Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "Hãy chọn một người dùng."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "Máy phục vụ đã từ chối mật khẩu vì quá yếu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Tài khoản Exchange sẽ bị vô hiệu hoá khi bạn thoát trình Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Tài khoản Exchange sẽ bị gỡ bỏ khi bạn thoát trình Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Tài khoản Exchange không tương thích với Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
-msgstr "Máy phục vụ có chạy phần mềm Exchange phiên bản 5.5.\n"
+msgstr ""
+"Máy phục vụ có chạy phần mềm Exchange phiên bản 5.5.\n"
 "Exchange Connector hỗ trợ chỉ Microsoft™ Exchange phiên bản 2000 và 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
 "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
 "\n"
 "Or you might have just typed your password wrong."
-msgstr "Rất có thể có nghĩa là máy phục vụ cần thiết\n"
+msgstr ""
+"Rất có thể có nghĩa là máy phục vụ cần thiết\n"
 "bạn ghi rõi tên miền Windows là phần của tên người dùng\n"
 "(v.d. « MIỀN\\người_dùng »).\n"
 "\n"
 "Hoạc có lẽ bạn đã gõ sai mật khẩu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "Hãy thử lại với một mật khẩu mới."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "Không thể thêm người dùng vào danh sách điều khiển truy cập."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "Không thể sửa đổi người ủy nhiệm."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "Gặp lỗi lạ khi tra cứu {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "Lỗi lạ."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "Kiểu lạ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "Thao tác không được hỗ trợ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Bạn gần vượt quá giới hạn lưu thư trên máy phục vụ này."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "Bạn không thể ủy nhiệm cho mình."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Bạn đã vượt quá giới hạn lưu thư trên máy phục vụ này."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "Bạn có thể cấu hình chỉ một tài khoản Exchange riêng lẻ."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
-msgstr "Hiện thời bạn đang sử dụng chỗ: {0}KB. Hãy cố giải phóng thêm chỗ trống bằng "
+msgstr ""
+"Hiện thời bạn đang sử dụng chỗ: {0}KB. Hãy cố giải phóng thêm chỗ trống bằng "
 "cách xoá bỏ một số thư."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr "Hiện thời bạn đang sử dụng chỗ: {0}KB. Như thế thì bạn hiện thời không thể "
+msgstr ""
+"Hiện thời bạn đang sử dụng chỗ: {0}KB. Như thế thì bạn hiện thời không thể "
 "gửi hoặc nhận thư."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr "Hiện thời bạn đang sử dụng chỗ: {0}KB. Bạn sẽ không thể gửi thư đến khi bạn "
+msgstr ""
+"Hiện thời bạn đang sử dụng chỗ: {0}KB. Bạn sẽ không thể gửi thư đến khi bạn "
 "giải phóng thêm chỗ trống bằng cách xoá bỏ một số thư."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "Mật khẩu bạn đã hết hạn."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "Không thể thêm {0} vào danh sách điều khiển truy cập."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} đã một người ủy nhiệm."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} đã có trong danh sách."
 
@@ -15904,7 +15993,7 @@ msgstr "Đăng nhập ủy nhiệm"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sGõ mật khẩu cho %s (người dùng %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:514
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "Đăng nhậ_p ủy nhiệm..."
 
@@ -15965,12 +16054,12 @@ msgid "Select Calendar"
 msgstr "Chọn Lịch"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Nhập"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Tập tin iCalendar (.ics)"
 
@@ -15994,7 +16083,8 @@ msgstr "Không có thư mục xuất."
 msgid ""
 "The output directory was not found on iPod! Please ensure that iPod has been "
 "correctly set up and try again."
-msgstr "Không tìm thấy thư mục xuất trên iPod. Hãy chắc đã thiết lập đúng iPod rồi "
+msgstr ""
+"Không tìm thấy thư mục xuất trên iPod. Hãy chắc đã thiết lập đúng iPod rồi "
 "thử lại."
 
 #: ../plugins/ipod-sync/sync.c:174
@@ -16022,128 +16112,130 @@ msgstr "Không thể mở Lịch/Cần làm."
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "Không thể mở Lịch/danh sách Cần làm để xuất dữ liệu."
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Việc tải lịch « %s » bị lỗi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Có cuộc hẹn trong lịch « %s » xung đột với cuộc họp này."
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tìm thấy cuộc hẹn trong lịch « %s »"
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Không tìm thấy lịch nào"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Không tìm thấy cuộc họp này trong lịch nào"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Không tìm thấy tác vụ này trong danh sách tác vụ nào"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Không tìm thấy mục nhập nhật ký trong nhật ký nào"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Đang tìm kíếm một phiên bản hiện thời của cuộc hẹn này"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Không thể phân tach mục"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Không gửi được mục cho lịch « %s ». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:856
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Đã gửi cho lịch « %s » như đã chấp nhận"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Đã gửi cho lịch « %s » như dự định"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Đã gửi cho lịch « %s » như bị từ chối"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Đã gửi cho lịch « %s » với trạng thái « bị thôi »"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Bộ tổ chức đã gỡ bỏ người ủy nhiệm %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Đã gửi một thông báo hủy bỏ cho người ủy nhiệm"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Không thể gửi thông báo hủy bỏ cho người ủy nhiệm"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Không thể cập nhật trạng thái người dự vì trạng thái không hợp lệ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Không cập nhật được người dự. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Trạng thái người dự đã được cập nhật."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "Lịch đã đính kèm không hợp lệ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "Thư này tuyên bố chứa một lịch, nhưng mà lịch đó không phải là một iCalendar "
+msgstr ""
+"Thư này tuyên bố chứa một lịch, nhưng mà lịch đó không phải là một iCalendar "
 "hợp lệ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "Mục trong lịch không hợp lệ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
-msgstr "Thư ấy có phải chứa một lịch, nhưng mà lịch ấy không chứa sự kiện nào, tác "
+msgstr ""
+"Thư ấy có phải chứa một lịch, nhưng mà lịch ấy không chứa sự kiện nào, tác "
 "vụ nào hay thông tin rảnh/bận nào."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "Lịch đã đính kèm chứa nhiều mục"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16151,17 +16243,17 @@ msgstr "Để xử lý mọi mục này thì nên lưu tập tin này và nhập
 
 #.Delete message after acting
 #.FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2031
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Xoá bỏ thư sau hành động"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/itip-formatter/itip-formatter.c:2073
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "Tìm kiếm xung đột"
 
 #.Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2056
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Chọn những lịch cần tìm kiệm cuộc họp có xung đột với nhau"
 
@@ -16509,26 +16601,26 @@ msgid "_Update"
 msgstr "_Cập nhật"
 
 #.Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Thời điểm đầu :"
 
 #.End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Thời điểm cuối:"
 
 #.Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Ghi chú :"
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Gửi thông báo cậ_p nhật cho các người dự"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "Á_p dụng vào mọi lần"
 
@@ -16543,8 +16635,9 @@ msgstr "Bộ định dạng Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr "« {0} » đã ủy nhiệm cuộc họp này. Bạn có muốn thêm người ủy nhiệm « {1} » "
+"&quot;{1}&quot; ?"
+msgstr ""
+"« {0} » đã ủy nhiệm cuộc họp này. Bạn có muốn thêm người ủy nhiệm « {1} » "
 "không?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16554,7 +16647,8 @@ msgstr "Cuộc họp này đã được ủy nhiệm."
 #: ../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 "Hồi đáp này không phải đến từ một người dự hiện thời. Thêm người này như là "
+msgstr ""
+"Hồi đáp này không phải đến từ một người dự hiện thời. Thêm người này như là "
 "người dự không?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -16657,7 +16751,8 @@ msgstr "_Hôp thư chung"
 msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
-msgstr "Cung cấp hành động cho lệnh hộp thư chung thường (đăng ký, bỏ đăng ký ...)"
+msgstr ""
+"Cung cấp hành động cho lệnh hộp thư chung thường (đăng ký, bỏ đăng ký ...)"
 
 #: ../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
@@ -16685,7 +16780,8 @@ msgid ""
 "\n"
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
-msgstr "Sẽ gửi một thư cho địa chỉ Mạng « {0} ». Bạn có thể hoặc tự động gửi thư ấy, "
+msgstr ""
+"Sẽ gửi một thư cho địa chỉ Mạng « {0} ». Bạn có thể hoặc tự động gửi thư ấy, "
 "hoặc xem và sửa đổi nó trước đó.\n"
 "\n"
 "Bạn nên nhận một trả lời từ hộp thư chung một chút sau khi gửi thư ấy."
@@ -16706,7 +16802,8 @@ msgstr "Không cho phép gửi thư"
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
-msgstr "Không cho phép gửi thư cho hộp thư chung này. Có lẽ nó là hộp thư chung chỉ "
+msgstr ""
+"Không cho phép gửi thư cho hộp thư chung này. Có lẽ nó là hộp thư chung chỉ "
 "cho phép đọc. Hãy liên lạc với người chủ hộp thư chung, để tìm biết chi tiết."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
@@ -16719,7 +16816,8 @@ msgid ""
 "not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
-msgstr "Không thể trực hiện hành động ấy. Có nghĩa là dòng đầu của hành động này "
+msgstr ""
+"Không thể trực hiện hành động ấy. Có nghĩa là dòng đầu của hành động này "
 "không chứa hành động nào trình này có quản lý được.\n"
 "\n"
 "Dòng đầu: {0}"
@@ -16729,7 +16827,8 @@ msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
 "Header: {1}"
-msgstr "Dòng đầu « {0} » của thư này có dạng sai nên không xử lý được nó.\n"
+msgstr ""
+"Dòng đầu « {0} » của thư này có dạng sai nên không xử lý được nó.\n"
 "\n"
 "Dòng đầu: {1}"
 
@@ -16849,7 +16948,8 @@ msgstr "Mô tả"
 
 #: ../plugins/plugin-manager/plugin-manager.c:193
 msgid "Note: Some changes will not take effect until restart"
-msgstr "Ghi chú: một số thay đổi sẽ không hoạt động cho đến khi đã khởi động lại"
+msgstr ""
+"Ghi chú: một số thay đổi sẽ không hoạt động cho đến khi đã khởi động lại"
 
 #: ../plugins/plugin-manager/plugin-manager.c:202
 #: ../plugins/plugin-manager/plugin-manager.c:262
@@ -16862,8 +16962,9 @@ msgid ""
 "disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
-msgstr "Một bổ sung thử ra mà biểu diễn một bổ sung định dạng cho phép bạn "
-"chọn tắt dạng thức thư HTML.\n"
+msgstr ""
+"Một bổ sung thử ra mà biểu diễn một bổ sung định dạng cho phép bạn chọn tắt "
+"dạng thức thư HTML.\n"
 "\n"
 "Bổ sung này chỉ chứa mã biểu diễn không được hỗ trợ thôi.\n"
 
@@ -16950,7 +17051,8 @@ msgid ""
 "Daily\n"
 "Weekly\n"
 "Manual (via Actions menu)"
-msgstr "Hàng ngày\n"
+msgstr ""
+"Hàng ngày\n"
 "Hàng tuần\n"
 "Tự chọn (qua trình đơn Hành động)"
 
@@ -16975,7 +17077,8 @@ msgid ""
 "WebDAV (HTTP)\n"
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
-msgstr "SSH\n"
+msgstr ""
+"SSH\n"
 "FTP công\n"
 "FTP (đang nhập)\n"
 "chia sẻ Windows\n"
@@ -16999,7 +17102,8 @@ msgstr "_Xuất dạng:"
 msgid ""
 "iCal\n"
 "Free/Busy"
-msgstr "iCal\n"
+msgstr ""
+"iCal\n"
 "Rảnh/Bận"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:101
@@ -17010,8 +17114,9 @@ msgstr "Spamassassin (sẵn có)"
 msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
-msgstr "Lọc thư rác bằng Spamassassin (nên bổ sung cần đến Spamassassin đã được "
-"cài đặt)."
+msgstr ""
+"Lọc thư rác bằng Spamassassin (nên bổ sung cần đến Spamassassin đã được cài "
+"đặt)."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
@@ -17038,12 +17143,12 @@ msgstr "Lưu mọi đính kèm"
 msgid "Select save base name"
 msgstr "Chọn tên cơ bản khi lưu"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Kiểu MIME:"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11
 #: ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Lưu"
@@ -17154,7 +17259,7 @@ msgid "RDF format (.rdf)"
 msgstr "Khuôn dạng RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Chọn tập tin đích"
 
@@ -17196,25 +17301,26 @@ msgid ""
 "to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
-msgstr "Chào mừng dùng Evolution. Những màn hình kế tiếp\n"
+msgstr ""
+"Chào mừng dùng Evolution. Những màn hình kế tiếp\n"
 "sẽ cho phép Evolution kết nối với các tài khoản thư của bạn,\n"
 "và để nhập các tập tin từ các ứng dụng khác.\n"
 "\n"
 "Vui lòng nhấn nút « Tiếp » để tiếp tục."
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Hãy chọn thông tin bạn muốn nhập:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Từ %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Đang nhập dữ liệu."
 
@@ -17286,7 +17392,8 @@ msgstr "Phiên bản cấu hình Evolution đã cập nhật cuối cùng"
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Danh sách đường dẫn cho những thư mục sẽ được đồng bộ với đĩa để sử dụng "
+msgstr ""
+"Danh sách đường dẫn cho những thư mục sẽ được đồng bộ với đĩa để sử dụng "
 "ngoại tuyến."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
@@ -17302,89 +17409,86 @@ msgid "Skip development warning dialog"
 msgstr "Bỏ qua hộp thoại cảnh báo phát triển"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#: ../shell/main.c:470
+#: ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Khởi chạy trong chế độ ngoại tuyến"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Hiện khung lề"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Phiên bản cấu hình của trình Evolution, với mức độ cấu hình lớn/nhỏ (v.d. « "
+msgstr ""
+"Phiên bản cấu hình của trình Evolution, với mức độ cấu hình lớn/nhỏ (v.d. « "
 "2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Độ cao mặc định cửa của sổ chính, theo điểm ảnh."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Độ rộng mặc định cửa của sổ chính, theo điểm ảnh."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Độ rộng mặc định của thanh nách, theo điểm ảnh."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
-msgstr "Phiên bản cấu hình Evolution đã cập nhật cuối cùng, với mức độ cấu hình lớn/"
+msgstr ""
+"Phiên bản cấu hình Evolution đã cập nhật cuối cùng, với mức độ cấu hình lớn/"
 "nhỏ (v.d. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
-msgstr "Kiểu dạng mọi cái nút cửa sổ. Có thể là « chữ », « ảnh », « cả hai » hay « "
+msgstr ""
+"Kiểu dạng mọi cái nút cửa sổ. Có thể là « chữ », « ảnh », « cả hai » hay « "
 "thanh công cụ ». Nếu lập « thanh công cụ » thì thiết lập thanh công cụ GNOME "
 "sẽ quyết định kiểu dạng các cái nút này."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Hiện thanh công cụ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Có nên khỏi chạy trình Evolution trong chế độ ngoại tuyến thay vào chế độ "
+msgstr ""
+"Có nên khỏi chạy trình Evolution trong chế độ ngoại tuyến thay vào chế độ "
 "trực tuyến hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Có nên phóng to cửa sổ hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Có nên hiển thị khung lề hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Hiện/ẩn thanh trạng thái."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Có nên hiển thị thanh công cụ hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Có nên bỏ qua hộp thoại cảnh báo trong phiên bản phát triển Evolution hay "
+msgstr ""
+"Có nên bỏ qua hộp thoại cảnh báo trong phiên bản phát triển Evolution hay "
 "không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Có nên hiển thị mọi cái nút trên cửa sổ hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Kiểu nút cửa sổ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Hiển thị nút cửa sổ"
 
@@ -17405,56 +17509,57 @@ msgstr "Nhấn « Được » để đóng những kết nối này và chuyển
 msgid "(Untitled)"
 msgstr "(Không tên)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Chọn kiểu bộ nhập cần chạy:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
 "\n"
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
-msgstr "Hãy chọn tập tin muốn nhập vào Evolution, và chọn kiểu tập tin từ danh sách "
+msgstr ""
+"Hãy chọn tập tin muốn nhập vào Evolution, và chọn kiểu tập tin từ danh sách "
 "dưới đây.\n"
 "\n"
 "Bạn có thể chọn « Tự động » nếu bạn không biết, và Evolution sẽ thử tự tìm "
 "cách hoạt động."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Hãy chọn nhập vào đích nào"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
 "settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
-msgstr "Trình Evolution đã kiểm tra có thiết lập để nhập từ\n"
+msgstr ""
+"Trình Evolution đã kiểm tra có thiết lập để nhập từ\n"
 "những ứng dụng theo đây: Pine, Netscape, Elm, iCalendar.\n"
 "Chưa tìm thiết lập có thể nhập. Nếu bạn muốn thử lại,\n"
 "hãy nhắp vào cái nút «Lùi».\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Tên tập t_in:"
 
-#: ../shell/e-shell-importer.c:297
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Kiểu _tập tin:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Nhập dữ liệu và thiết lập từ chương trình _cũ"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Nhập _một tập tin riêng lẻ"
 
@@ -17480,7 +17585,8 @@ msgstr "Tên thư mục không thể chứa ký tự dấu thăng « # »."
 
 #: ../shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
-msgstr "Dấu chấm « . » và hai dấu chấm tiếp tực « .. » là hai tên thư mục đặc biệt, "
+msgstr ""
+"Dấu chấm « . » và hai dấu chấm tiếp tực « .. » là hai tên thư mục đặc biệt, "
 "được dành riêng."
 
 #: ../shell/e-shell-window-commands.c:71
@@ -17512,7 +17618,7 @@ msgid "_Work Online"
 msgstr "_Trực tuyến"
 
 #: ../shell/e-shell-window-commands.c:819
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Ngoại tuyến"
 
@@ -17522,7 +17628,8 @@ msgstr "Ngoại tuyến"
 
 #: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution hiện thời đang trực tuyến. Nhấn vào cái nút này để chạy ngoại "
+msgstr ""
+"Evolution hiện thời đang trực tuyến. Nhấn vào cái nút này để chạy ngoại "
 "tuyến."
 
 #: ../shell/e-shell-window.c:379
@@ -17531,7 +17638,8 @@ msgstr "Evolution đang chuyển sang ngoại tuyến."
 
 #: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution hiện thời đang ngoại tuyến. Nhấn vào cái nút này để chạy trực "
+msgstr ""
+"Evolution hiện thời đang ngoại tuyến. Nhấn vào cái nút này để chạy trực "
 "tuyến."
 
 #: ../shell/e-shell-window.c:786
@@ -17539,43 +17647,35 @@ msgstr "Evolution hiện thời đang ngoại tuyến. Nhấn vào cái nút nà
 msgid "Switch to %s"
 msgstr "Chuyển sang %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Gặp lỗi hệ thống lạ."
 
 # Variable and unit: do not translate/ biến và đơn vị: đừng dịch
+#: ../shell/e-shell.c:829
 #: ../shell/e-shell.c:830
-#: ../shell/e-shell.c:831
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1262
+#: ../shell/e-shell.c:1261
 #: ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "Được"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 
-#: ../shell/e-user-creatable-items-handler.c:689
-#: ../shell/e-user-creatable-items-handler.c:748
-msgid " New "
-msgstr " Mới "
-
-#: ../shell/e-user-creatable-items-handler.c:693
-#: ../shell/e-user-creatable-items-handler.c:705
-#: ../shell/e-user-creatable-items-handler.c:752
-#: ../shell/e-user-creatable-items-handler.c:764
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Mới"
 
@@ -17624,12 +17724,13 @@ msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
-msgstr "Chào mừng dùng Trợ tá nhập Evolution.\n"
+msgstr ""
+"Chào mừng dùng Trợ tá nhập Evolution.\n"
 "Với trợ tá này, bạn sẽ được hướng dẫn thông qua tiến trình\n"
 "nhập các tập tin bên ngoài vào Evolution."
 
 #.Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17647,7 +17748,8 @@ msgid ""
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
-msgstr "Xin chào. Xin cám ơn đã mất thời gian để tải về bản dùng thử này\n"
+msgstr ""
+"Xin chào. Xin cám ơn đã mất thời gian để tải về bản dùng thử này\n"
 "của bộ phần mềm nhóm Evolution.\n"
 "\n"
 "Đây là phiên bản Evolution chưa hoàn chỉnh. Nó gần hoàn chỉnh,\n"
@@ -17664,51 +17766,49 @@ msgstr "Xin chào. Xin cám ơn đã mất thời gian để tải về bản d�
 "Chúng tôi hy vọng bạn thích kết quả của quá trình làm việc của chúng tôi,\n"
 "và chúng tôi háo hức chờ đời sự đóng góp của bạn!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
-msgstr "Xin cám ơn\n"
+msgstr ""
+"Xin cám ơn\n"
 "Nhóm Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Đừng nói điều này lần nữa"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Báo trình Evolution hoạt hoá thành phần đã ghi rõ"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Khởi chạy trong chế độ trực tuyến"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Buộc kết thúc mọi thành phần Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Buộc tái nâng cấp từ Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Gửi thông tin gỡ lỗi của mọi thành phần vào tập tin."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Tắt tải bổ sung nào."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "— Ứng dụng thư điện tử và quản lý thông tin cá nhân Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
-msgstr "%s: hai tùy chọn «--online» (trực tuyến) và «--offline» (ngoại tuyến)\n"
+msgstr ""
+"%s: hai tùy chọn «--online» (trực tuyến) và «--offline» (ngoại tuyến)\n"
 "thì không thể được dùng chung.\n"
 "  Hãy dùng lệnh «%s --help» (trợ giúp) để biết thêm thông tin.\n"
 
@@ -17732,7 +17832,8 @@ msgstr "Evolution không thể khởi chạy."
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
-msgstr "Quên đi các mật khẩu đã nhớ sẽ xoá hết mật khẩu đã nhớ. Như vậy bạn sẽ lại "
+msgstr ""
+"Quên đi các mật khẩu đã nhớ sẽ xoá hết mật khẩu đã nhớ. Như vậy bạn sẽ lại "
 "được nhắc gõ mật khẩu lần sau cần thiết."
 
 #: ../shell/shell.error.xml.h:7
@@ -17754,7 +17855,8 @@ msgid ""
 "\n"
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
-msgstr "Sắp gỡ bỏ hoàn toàn mọi nội dung của thư mục « evolution ».\n"
+msgstr ""
+"Sắp gỡ bỏ hoàn toàn mọi nội dung của thư mục « evolution ».\n"
 "\n"
 "Có đề nghị là bạn tự kiểm chứng có tất cả dữ liệu thư, liên lạc và lịch "
 "trong phiên bản mới, mà hoạt động cho đúng, trước khi xoá bỏ dữ liệu cũ "
@@ -17771,7 +17873,8 @@ msgid ""
 "evolution&quot; directory will be removed permanently. If you choose to keep "
 "this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
-msgstr "Phiên bản Evolution trước đã lưu dữ liệu tại một địa điểmkhác.\n"
+msgstr ""
+"Phiên bản Evolution trước đã lưu dữ liệu tại một địa điểmkhác.\n"
 "\n"
 "Nếu bạn chọn gỡ bỏ dữ liệu này, toàn bộ nội dung của thư mục <evolution> sẽ "
 "bị gỡ bỏ hoàn toàn. Nếu bạn chọn giữ dữ liệu này, bạn có thể tự gỡ bỏ nội "
@@ -17788,7 +17891,8 @@ msgid ""
 "\n"
 "You will need to make more space available in your home directory before you "
 "can continue."
-msgstr "Nâng cấp các dữ liệu và thiết lập của bạn sẽ cần thiết đến {0} sức chứa trên "
+msgstr ""
+"Nâng cấp các dữ liệu và thiết lập của bạn sẽ cần thiết đến {0} sức chứa trên "
 "đĩa, nhưng mà hiện thời bạn chỉ có {1} sẵn sàng.\n"
 "\n"
 "Như thế thì bạn sẽ phải giải phóng thêm chỗ rỗng trong thư mục chinh của "
@@ -17799,7 +17903,8 @@ msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
-msgstr "Cấu hình hệ thống bạn không khớp với cấu hình Evolution.\n"
+msgstr ""
+"Cấu hình hệ thống bạn không khớp với cấu hình Evolution.\n"
 "\n"
 "Hãy nhắp vào « Trợ giúp » để xem chi tiết."
 
@@ -17810,7 +17915,8 @@ msgid ""
 "{0}\n"
 "\n"
 "Click help for details."
-msgstr "Cấu hình hệ thống bạn không khớp với cấu hình Evolution.\n"
+msgstr ""
+"Cấu hình hệ thống bạn không khớp với cấu hình Evolution.\n"
 "\n"
 "{0}\n"
 "\n"
@@ -17834,7 +17940,8 @@ msgid ""
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
-msgstr "{1}\n"
+msgstr ""
+"{1}\n"
 "\n"
 "Nếu bạn chọn tiếp tục thì có lẽ sẽ không thể truy cập một phần dữ liệu cũ.\n"
 
@@ -17844,7 +17951,8 @@ msgid ""
 "Certificate '%s' is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
-msgstr "Chức nhận « %s » là một chứng nhận CA (nhà cầm quyền chứng nhận).\n"
+msgstr ""
+"Chức nhận « %s » là một chứng nhận CA (nhà cầm quyền chứng nhận).\n"
 "\n"
 "Sửa đổi thiết lập tin cây:"
 
@@ -17853,7 +17961,8 @@ msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
-msgstr "Vì bạn tin cây nhà cầm quyền đã phát hành chứng nhận này, thì bạn tin cây "
+msgstr ""
+"Vì bạn tin cây nhà cầm quyền đã phát hành chứng nhận này, thì bạn tin cây "
 "xác thực của chứng nhận này trừ khi chỉ thị cách khác ở đây."
 
 #: ../smime/gui/cert-trust-dialog.c:158
@@ -17861,7 +17970,8 @@ msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
-msgstr "Vì bạn không tin cây nhà cầm quyền đã phát hành chứng nhận này, thì bạn "
+msgstr ""
+"Vì bạn không tin cây nhà cầm quyền đã phát hành chứng nhận này, thì bạn "
 "không tin cây xác thực của chứng nhận này trừ khi chỉ thị cách khác ở đây."
 
 #: ../smime/gui/certificate-manager.c:136
@@ -17923,7 +18033,8 @@ msgstr "Hãy gõ mật khẩu mới"
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
-msgstr "Phát hành cho:\n"
+msgstr ""
+"Phát hành cho:\n"
 "  Chủ đề: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:122
@@ -17931,7 +18042,8 @@ msgstr "Phát hành cho:\n"
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
-msgstr "Phát hành bởi:\n"
+msgstr ""
+"Phát hành bởi:\n"
 "  Chủ đề: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:174
@@ -17990,7 +18102,8 @@ msgstr "Lưu trữ hết"
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
-msgstr "Trước khi tin cây nhà cầm quyền này để làm gì thì bạn nên kiểm tra chứng "
+msgstr ""
+"Trước khi tin cây nhà cầm quyền này để làm gì thì bạn nên kiểm tra chứng "
 "nhận của nó, và chính thức và thủ tục của nó (nếu công bố)."
 
 #: ../smime/gui/smime-ui.glade.h:14
@@ -18086,11 +18199,13 @@ msgstr "Tin cây tính xác thực của chứng nhận này"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr "Tin cây nhà cầm quyền chứng nhận này để nhận diện người dùng thư điện tử."
+msgstr ""
+"Tin cây nhà cầm quyền chứng nhận này để nhận diện người dùng thư điện tử."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr "Tin cây nhà cầm quyền chứng nhận này để nhận diện người phát triển phần mềm."
+msgstr ""
+"Tin cây nhà cầm quyền chứng nhận này để nhận diện người phát triển phần mềm."
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
@@ -18122,7 +18237,7 @@ msgid "_Edit CA Trust"
 msgstr "_Sửa tính tin cây 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:664
 msgid "Certificate already exists"
 msgstr "Chứng nhận này đã có"
 
@@ -18475,7 +18590,7 @@ msgstr "Chọn hết"
 
 #: ../ui/evolution-addressbook.xml.h:35
 #: ../ui/evolution-composer-entries.xml.h:11
-#: ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Chọn _hết"
@@ -18547,7 +18662,7 @@ msgid "_Move Folder Contacts To"
 msgstr "Chu_yển liên lạc thư mục sang"
 
 #: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "Mớ_i"
 
@@ -18609,7 +18724,6 @@ msgstr "Tháng"
 
 #: ../ui/evolution-calendar.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Kế"
 
@@ -18620,6 +18734,7 @@ msgstr "Xem thử lịch cần in"
 #: ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Lùi"
 
@@ -18686,7 +18801,7 @@ msgstr "Tuần làm việc"
 
 #: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
-msgstr "_Mở Cuộc hẹn"
+msgstr "_Mở cuộc hẹn"
 
 #: ../ui/evolution-composer-entries.xml.h:2
 #: ../ui/evolution-editor.xml.h:7
@@ -18711,12 +18826,12 @@ msgid "Paste from clipboard"
 msgstr "Dán bảng nháp"
 
 #: ../ui/evolution-composer-entries.xml.h:10
-#: ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Dán đoạn từ bảng nháp"
 
 #: ../ui/evolution-composer-entries.xml.h:12
-#: ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Chọn toàn bộ văn bản"
 
@@ -18753,38 +18868,36 @@ msgstr "Nhấn đây để xem trợ giúp có sẵn"
 msgid "Close"
 msgstr "Đóng"
 
-#: ../ui/evolution-editor.xml.h:10
-#: ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Chè_n"
-
-#: ../ui/evolution-editor.xml.h:15
+#: ../ui/evolution-editor.xml.h:14
 #: ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
-msgstr "Đồ đính _kèm.."
+msgstr "Đồ đính _kèm..."
 
-#: ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-editor.xml.h:15
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Đón_g"
 
-#: ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Tập tin"
 
-#: ../ui/evolution-editor.xml.h:20
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "Trợ g_iúp"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "Chè_n"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "Tù_y chọn"
@@ -18895,12 +19008,6 @@ msgstr "Bật tắt hiển thị giờ là bận"
 msgid "_Alarms"
 msgstr "_Báo động"
 
-#: ../ui/evolution-event-editor.xml.h:27
-#: ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Loại"
-
 #: ../ui/evolution-event-editor.xml.h:28
 #: ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
@@ -18973,73 +19080,53 @@ msgid "F_older"
 msgstr "Thư _mục"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "_Xem thử thư"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Chuyển thư mục đã chọn vào thư mục khác"
 
 #.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 "Gỡ bỏ hoàn toàn mọi thư đã xoá bỏ ra mọi thư mục"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Tìm kiếm tr_ong thư mục"
 
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Show Message _Preview"
-msgstr "Hiện ô _xem thử thư"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "Hiển thị ô xem thử thư bên dưới danh sách thư"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "Hiển thị ô xem thử thư cạnh nhau với danh sách thư"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Hiện ô xem thử thư"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Đăng ký hoặc hủy đăng ký thư mục trên máy phục vụ từ xa"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "Xem _chuẩn"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "_Chép thư mục vào..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "Bộ _lọc thư"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "Chu_yển thư mục sang..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "_Mới..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Preview"
-msgstr "_Xem thử"
-
 #.
 #.<menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
 msgstr "_Sự đăng ký"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "Xem _dọc"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Thay đổi tên thư mục này"
@@ -19598,10 +19685,6 @@ msgid "_Unread"
 msgstr "_Chưa đọc"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "Thu _phóng"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Phóng to"
 
@@ -19611,7 +19694,7 @@ msgid "Close this window"
 msgstr "Đóng cửa sổ này"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Thanh công cụ chính"
 
@@ -19686,6 +19769,11 @@ msgstr "Chọn để nhận thông báo khi người nhận đã đọc thư b�
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Chè_n"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Mở tập tin"
@@ -19976,7 +20064,8 @@ msgstr "Tạo cửa sổ mới hiển thị thư mục này"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Hiển thị mọi cái nút cửa sổ dùng thiết lập thanh công cụ của màn hình nền"
+msgstr ""
+"Hiển thị mọi cái nút cửa sổ dùng thiết lập thanh công cụ của màn hình nền"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -20014,51 +20103,43 @@ msgstr "Biểu tượng _và nhãn"
 msgid "Import data from other programs"
 msgstr "Nhập dữ liệu từ chương trình khác"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "_Bố trí"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Cửa sổ _mới"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "Tù_y thích..."
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Gửi / Nhận"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "Gửi / _Nhận"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Gửi các mục đang đợi gửi và nhận các mục mới"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Thiết lập cấu hình Pilot"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Hiện thông tin về Evolution"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "Hiện khung _lề"
+msgid "Side _Bar"
+msgstr "Khung _lề"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "Hiện thanh t_rạng thái"
+msgid "Status _Bar"
+msgstr "Thanh t_rạng thái"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "Hiện _thanh công cụ"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "Hiện thông tin về Evolution"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Gửi Báo cáo Lỗi"
 
@@ -20066,71 +20147,75 @@ msgstr "Gửi Báo cáo Lỗi"
 #._label="Evolution _FAQ"/>
 #.
 #.<separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Gửi _Báo cáo lỗi"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Báo cáo lỗi bằng Bug Buddy"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Bật tắt hoạt động ngoại tuyến"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Thanh _công cụ"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "_Kiểu dáng thanh công cụ"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "Hiện/Ẩn khung lề"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Xem/Ẩn thanh trạng thái"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Giới thiệu"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "Đóng _cửa sổ"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "_Quên các mật khẩu"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "Ẩ_n nút"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Chỉ b_iểu tượng"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "Tham khảo _nhanh"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "T_hoát"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Hình thức bộ _chuyển đổi"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Tùy chọn đồng _bộ..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Chỉ _nhãn"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Cửa sổ"
 
@@ -20167,34 +20252,26 @@ msgid "_Work Week View"
 msgstr "Xem _tuần làm việc"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "The_o thư mục đã gửi cho ô xem rộng"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Th_eo thư mục đã gửi"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Theo _trạng thái"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Theo _người gửi"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Theo _chủ đề"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Theo cờ the_o dõi tiếp"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "Cho ô xem _rộng"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Thư"
 
@@ -20210,12 +20287,8 @@ msgstr "Với ngày đến _hạn"
 msgid "With _Status"
 msgstr "Với t_rạng thái"
 
-#.Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "Giờ thế giới"
 
@@ -20240,7 +20313,8 @@ msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
 "Use the right mouse button to zoom out."
-msgstr "Hãy dùng nút chuột trái để phóng to vùng trên bản đồ và chọn múi giờ.\n"
+msgstr ""
+"Hãy dùng nút chuột trái để phóng to vùng trên bản đồ và chọn múi giờ.\n"
 "Dùng nút chuột phải để thu nhỏ."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
@@ -20269,7 +20343,7 @@ msgid "_Edit..."
 msgstr "_Sửa..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20334,19 +20408,14 @@ msgstr "Kiểu ô xem"
 msgid "Type of view:"
 msgstr "Kiểu ô xem:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Đề nghị tự động hiển thị đính kèm"
-
 #.Translators: These are the first characters of each day of the
 #.week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "234567C"
 
 #.This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20425,7 +20494,7 @@ msgstr "Rộng tối thiểu"
 
 #: ../widgets/misc/e-canvas-vbox.c:114
 #: ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Khoảng cách"
 
@@ -20573,55 +20642,55 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Đã bung"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Có bung mũi tên bung hay không"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Chữ trong nhãn mũi tên bung"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Dùng gạch chân"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "Nếu lập thì gạch chân ngú ý ký tự sau nó là phím tắt."
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Dấu cách giữa nhãn và con"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Ô điều khiển nhãn"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Một ô điều khiển cần hiển thị trong chỗ nhãn mũi tên bung thường"
 
-#: ../widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:222
 #: ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Cỡ mũi tên bung"
 
-#: ../widgets/misc/e-expander.c:224
+#: ../widgets/misc/e-expander.c:223
 #: ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Cỡ mũi tên bung"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Dấu cách chỉ báo"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Dấu cách ở quanh mũi tên bung"
 
@@ -20662,15 +20731,16 @@ msgstr "Tìm kiếm cấp c_ao..."
 msgid "Choose Image"
 msgstr "Chọn ảnh"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Bản đồ Thế giới"
 
-#: ../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."
-msgstr "Ô điều khiển bản đồ tương tác đựa vào con chuột để chọn múi giờ. Người thích "
+msgstr ""
+"Ô điều khiển bản đồ tương tác đựa vào con chuột để chọn múi giờ. Người thích "
 "dùng bàn phím thì nên chọn múi giờ trong hộp tổ hợp bên dưới thay vào đó."
 
 #: ../widgets/misc/e-pilot-settings.c:103
@@ -20702,36 +20772,36 @@ msgstr "Rộng cột"
 
 #.To translators: This is the accessibility name of
 #.the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:372
+#: ../widgets/misc/e-search-bar.c:371
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../widgets/misc/e-search-bar.c:592
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "Tìm _kiếm"
 
-#: ../widgets/misc/e-search-bar.c:598
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "Tìm n_gay"
 
-#: ../widgets/misc/e-search-bar.c:599
-#: ../widgets/misc/e-search-bar.c:1002
+#: ../widgets/misc/e-search-bar.c:595
+#: ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Xoá"
 
-#: ../widgets/misc/e-search-bar.c:690
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Kiểu tìm kiếm"
 
-#: ../widgets/misc/e-search-bar.c:909
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID mục"
 
-#: ../widgets/misc/e-search-bar.c:916
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ID mục con"
 
-#: ../widgets/misc/e-search-bar.c:923
+#: ../widgets/misc/e-search-bar.c:904
 #: ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250
 #: ../widgets/text/e-text.c:3485
@@ -20739,8 +20809,8 @@ msgstr "ID mục con"
 msgid "Text"
 msgstr "Chữ"
 
-#: ../widgets/misc/e-search-bar.c:1004
-msgid "Find No_w"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
 msgstr "Tìm _ngay"
 
 #: ../widgets/misc/e-selection-model-array.c:547
@@ -20809,7 +20879,8 @@ msgstr "Tùy chọn ch_ung"
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr "Không có\n"
+msgstr ""
+"Không có\n"
 "Thông báo đã đọc"
 
 #: ../widgets/misc/e-send-options.glade.h:12
@@ -20817,7 +20888,8 @@ msgid ""
 "Public\n"
 "Private\n"
 "Confidential\n"
-msgstr "Công\n"
+msgstr ""
+"Công\n"
 "Riêng\n"
 "Tin tưởng\n"
 
@@ -20835,7 +20907,8 @@ msgid ""
 "High\n"
 "Standard\n"
 "Low"
-msgstr "Chưa định nghĩa\n"
+msgstr ""
+"Chưa định nghĩa\n"
 "Cao\n"
 "Chuẩn\n"
 "Thấp"
@@ -20939,23 +21012,23 @@ msgstr "Cột có tiêu điểm"
 msgid "Unselected Column"
 msgstr "Cột đã bỏ chọn"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Cột đã gạch ngang"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Cột đã gạch dưới"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Cột đậm"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Cột màu"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Cột màu nền"
 
@@ -20970,7 +21043,6 @@ msgstr "Trường có _sẵn:"
 
 #: ../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
 msgid "Ascending"
 msgstr "Tăng dần"
 
@@ -20981,7 +21053,6 @@ msgstr "Xoá hết"
 
 #: ../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 "Descending"
 msgstr "Giảm dần"
 
@@ -21081,14 +21152,14 @@ msgstr "_Hiển thị những trường này theo thứ tự:"
 #: ../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-header-item.c:1805
 msgid "DnD code"
 msgstr "Mã 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-header-item.c:1819
 msgid "Full Header"
 msgstr "Phần đầu đầy đủ"
 
@@ -21104,7 +21175,8 @@ msgstr "Bộ chọn trường"
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
-msgstr "Để thêm một cột vào bảng,\n"
+msgstr ""
+"Để thêm một cột vào bảng,\n"
 "hãy kéo nó vào vị trí đã định."
 
 #: ../widgets/table/e-table-group-container.c:346
@@ -21218,70 +21290,66 @@ msgstr "Độ cao hàng không đổi"
 msgid "Frozen"
 msgstr "Đông cứng"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Tùy chỉnh ô xem hiện thời"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Sắp xếp tăng dần"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Sắp xếp giảm dần"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Hủy sắp xếp"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Nhóm lại theo trường này"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Nhóm lại theo hộp"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Bỏ cột này"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Thêm cột..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Canh dòng"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Vừa nhất"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Định dạng cột..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Tùy chỉnh ô xem hiện thời..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "Sắp xếp theo"
-
-#: ../widgets/table/e-table-header-item.c:1899
+#: ../widgets/table/e-table-header-item.c:1812
 #: ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Bộ phông chữ"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Sắp xếp thông tin"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f07a21dc27..d131e1156a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,13 +5,12 @@
 # Partly comes from Sun_l10n group, 2003
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
 #
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 23:44+0200\n"
-"PO-Revision-Date: 2006-07-23 15:10+0800\n"
+"POT-Creation-Date: 2006-05-01 12:37+0200\n"
+"PO-Revision-Date: 2006-05-01 22:23+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +20,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution 地址簿"
 
@@ -35,11 +34,11 @@ msgstr "新建联系人"
 msgid "New Contact List"
 msgstr "新建联系人列表"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "当前地址簿文件夹 %s 有 %d 张名片"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "当前地址簿文件夹有 %d 张名片"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -58,32 +57,32 @@ msgstr "联系人："
 msgid "evolution minicard"
 msgstr "evolution 袖珍卡"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "有提醒。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "有再现。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "为会议。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "日历事件：摘要为 %s。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "日历事件：无摘要。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "日历视图事件"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "获得焦点"
 
@@ -112,46 +111,36 @@ msgstr "转到日期"
 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:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 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:151 ../a11y/calendar/ea-week-view.c:152
 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:155
 #, c-format
 msgid "Work Week View: %s. %s"
 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:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "日视图：%s。%s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "工作周的日历视图"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "一天或多天的日历视图"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -162,20 +151,18 @@ 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:190
-#: ../calendar/gui/calendar-component.c:706
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1480
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
 
 #: ../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:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -183,10 +170,10 @@ msgstr "%Y年%-m月%-d日%A"
 #: ../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:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%Y年%-m月%-d日"
 
@@ -196,11 +183,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:220
-#: ../calendar/gui/calendar-component.c:732
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1496
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%B%-d日"
 
@@ -330,14 +315,6 @@ msgstr "激活默认"
 msgid "Popup Menu"
 msgstr "弹出菜单"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "切换附件栏"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "激活"
-
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -498,9 +475,9 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则 {0} 的联系人无法使用。"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
+#: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "添加(_A)"
@@ -510,7 +487,7 @@ msgid "_Discard"
 msgstr "丢弃(_D)"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
@@ -550,9 +527,9 @@ 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:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "联系人"
 
@@ -592,8 +569,8 @@ msgstr "在此管理您的 S/MIME 证书"
 #. 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:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -608,13 +585,12 @@ msgstr "在此计算机中"
 #. 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:600
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "个人"
 
@@ -641,7 +617,7 @@ 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-config.c:1202
 msgid "New Address Book"
 msgstr "新地址簿"
 
@@ -657,73 +633,72 @@ msgstr "创建新地址簿"
 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:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "类型(_T)："
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../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/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: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:2047
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "常规"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../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/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
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "细节"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../addressbook/gui/component/addressbook-config.c:992
 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:1203
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "地址簿属性"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "正在升迁..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "升迁“%s”："
@@ -797,35 +772,34 @@ msgstr "文件夹名不能含有字符“/”"
 msgid "A Folder with this name already exists"
 msgstr "已经存在此名称的文件夹"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "新建地址簿(_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../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:2061 ../mail/em-folder-view.c:1126
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "另存为 Vcard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "属性(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "联系人源选择器"
 
@@ -834,12 +808,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "匿名访问 LDAP 服务器"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "认证失败。\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "输入 %s 的密码(用户 %s)"
@@ -881,7 +855,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "选择名称对话框中上次使用的文件夹 URI。"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "垂直面板的位置"
 
@@ -910,7 +884,7 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>身份验证</b>"
 
@@ -1148,9 +1122,9 @@ 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
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "名称(_N)："
 
@@ -1163,7 +1137,7 @@ msgid "_Search scope:"
 msgstr "搜索范围(_S)："
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "服务器(_S)："
@@ -1183,7 +1157,7 @@ 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/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
@@ -1192,222 +1166,242 @@ msgid "minutes"
 msgstr "分钟"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>电子邮件</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>家庭</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>即时通讯</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>职位</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>杂项</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>其它</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>电话</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Web 地址</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "联系人"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 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:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "昵称(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../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:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "工作"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 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:875
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1707
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1652
 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
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "类别(_C)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "城市(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "公司(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "国家/地区(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "部门(_D)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "存档为(_F)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "忙/闲(_F)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "主页(_H)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "经理(_M)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "注释(_N)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "办公室(_O)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "邮政邮箱(_P)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "职业(_P)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "配偶(_S)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "州/省(_S)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "头衔(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "视频聊天(_V)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "愿意接收 HTML 邮件(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Web 日志："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "何处(_W)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "邮政编码(_Z)："
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "地址"
 
@@ -1415,17 +1409,17 @@ msgstr "地址"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../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:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "可编辑"
 
@@ -2401,7 +2395,7 @@ msgstr "津巴布韦"
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 #: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "姓名"
@@ -2412,7 +2406,7 @@ msgstr "AOL 即时通讯程序"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2422,7 +2416,7 @@ msgstr "雅虎通"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2431,7 +2425,7 @@ msgid "Service"
 msgstr "服务"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
@@ -2443,28 +2437,26 @@ msgstr "用户名"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:204
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "家庭"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:205
-#: ../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:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "雅虎"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2493,20 +2485,20 @@ msgid "Changed"
 msgstr "已更改"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
-msgid "_No image"
-msgstr "无图像(_N)"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "无图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2514,31 +2506,15 @@ msgstr ""
 "联系人数据无效：\n"
 "\n"
 
-#: ../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:3106
-#, 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
-#, 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:3110
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "编辑全名(_E)"
 
@@ -2546,11 +2522,11 @@ msgstr "编辑全名(_E)"
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
-msgid "E_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
 msgstr "电子邮件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "选择地址簿(_S)"
 
@@ -2558,7 +2534,7 @@ msgstr "选择地址簿(_S)"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr "您确定要删除联系人列表(%s)吗？"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
@@ -2571,7 +2547,7 @@ msgstr "您确定要删除这些联系人列表吗？"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr "您确定要删除联系人(%s)吗？"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
@@ -2580,105 +2556,104 @@ msgid ""
 "to delete these contacts?"
 msgstr "您确定要删除这些联系人吗？"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "地址 _2："
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "城市(_T)："
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "国家/地区(_Y)："
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "完整地址"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "邮政编码(_Z)："
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "博士"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "先生"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "全名"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "晚辈"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "小姐"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "先生"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "夫人"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "女士"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "长辈"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "姓(_F)："
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "名(_L)："
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "中间名(_M)："
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "后缀(_S)："
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "添加即时通讯账户"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "账户名(_A)："
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "即时通讯服务(_I)："
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2689,61 +2664,61 @@ msgstr "位置(_L)："
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 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:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email addresses from Address Book"
 msgstr "从地址簿中插入电子邮件地址"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "成员"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "从列表中删除电子邮件地址"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 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:10
 msgid "_List name:"
 msgstr "列表名称(_L)："
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 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:12
 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:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "地址簿"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "为新列表"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "成员(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "联系人列表成员"
 
@@ -2784,18 +2759,25 @@ msgstr ""
 "此联系人的姓名或地址已经在本文件夹中存在了。\n"
 "您一定要添加吗？"
 
+#. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "任何域含有"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "类别为"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "姓名以此开头"
@@ -2812,9 +2794,9 @@ msgstr[0] "%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:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "查询"
 
@@ -2828,7 +2810,7 @@ msgstr "获取名簿视图出错"
 #: ../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
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "模型"
 
@@ -2836,104 +2818,103 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "修改名片错误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "来源"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "类型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "另存为 VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../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:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "新建联系人(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "新建联系人列表(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "另存为 VCard(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "转发联系人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "转发联系人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "给联系人发信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "给列表发信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "给联系人发信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "打印(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "复制到地址簿(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "移至地址簿(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c: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:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "粘贴(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "任何类别"
 
@@ -2943,7 +2924,6 @@ msgid "Print cards"
 msgstr "打印名片"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
 msgid "Assistant"
 msgstr "助手"
 
@@ -2972,7 +2952,7 @@ msgid "Car Phone"
 msgstr "车载电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -2984,7 +2964,7 @@ msgid "Company Phone"
 msgstr "公司电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:783
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "电子邮件"
@@ -3030,22 +3010,20 @@ msgid "Journal"
 msgstr "日记"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
 msgid "Manager"
 msgstr "经理"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "移动电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Nickname"
 msgstr "昵称"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "注释"
 
@@ -3054,7 +3032,7 @@ msgid "Office"
 msgstr "办公室"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "组织"
 
@@ -3087,7 +3065,6 @@ msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
 msgid "Spouse"
 msgstr "配偶"
 
@@ -3118,7 +3095,7 @@ msgid "Web Site"
 msgstr "网站"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3129,12 +3106,12 @@ msgstr "网站"
 #: ../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
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "宽度"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3144,12 +3121,12 @@ msgstr "宽度"
 #: ../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
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "高度"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "有焦点"
 
@@ -3173,7 +3150,7 @@ msgstr "最大域名长度"
 msgid "Column Width"
 msgstr "列宽"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3187,7 +3164,7 @@ msgstr ""
 "\n"
 "或在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3201,7 +3178,7 @@ msgstr ""
 "\n"
 "请在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3211,7 +3188,7 @@ msgstr ""
 "\n"
 "搜索联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3221,143 +3198,80 @@ msgstr ""
 "\n"
 "本视图中没有可显示的项。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "适配器"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Work Email"
-msgstr "工作电子邮件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Home Email"
-msgstr "家庭电子邮件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Other Email"
-msgstr "其它电子邮件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "已选择"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "有光标"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-folder-view.c:2497
-msgid "_Copy Link Location"
-msgstr "复制链接位置(_C)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-msgid "_Send New Message To ..."
-msgstr "把新信发送到(_S)..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "复制电子邮件地址(_E)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(地图)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:310
-#: ../addressbook/gui/widgets/eab-contact-display.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "地图"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:461
-#: ../addressbook/gui/widgets/eab-contact-display.c:761
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "列出成员"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
-msgid "Department"
-msgstr "部门"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Profession"
-msgstr "职业"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-msgid "Video Chat"
-msgstr "视频聊天"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../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
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "日历"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "视频会议"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "忙/闲"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "电话"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "传真"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
-msgid "Home Page"
-msgstr "主页"
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr "工作"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-msgid "Web Log"
-msgstr "Web 日志"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
-msgid "Birthday"
-msgstr "生日"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-msgid "Anniversary"
-msgstr "纪念日"
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "个人"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:779
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "职称"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "主页"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:818
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3388,7 +3302,7 @@ msgstr "未定义自身联系人"
 #. 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:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "没有权限"
 
@@ -3413,7 +3327,7 @@ msgstr "不支持的协议"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "已取消"
 
@@ -3540,7 +3454,7 @@ 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:695
 msgid "Error adding contact"
 msgstr "添加联系人出错"
 
@@ -3557,7 +3471,7 @@ 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:650
 msgid "Error removing contact"
 msgstr "删除联系人出错"
 
@@ -3573,7 +3487,7 @@ msgstr[0] ""
 "打开 %d 个联系人将同时打开 %d 个新窗口。\n"
 "您真的想要显示所有联系人吗？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3582,68 +3496,68 @@ msgstr ""
 "%s 已经存在\n"
 "您打算覆盖它吗？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "联系人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 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:756
 msgid "Move contact to"
 msgstr "将联系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "将联系人复制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "将联系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "将联系人复制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "多个 VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "%s 的 VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "联系人信息"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的联系人信息"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "正在查询地址簿..."
 
@@ -3732,12 +3646,12 @@ msgstr "Evolution VCard 导入器"
 msgid "Print envelope"
 msgstr "打印信封"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "打印联系人"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "打印联系人"
 
@@ -3786,7 +3700,7 @@ msgstr "格式"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "页眉"
@@ -3890,7 +3804,7 @@ msgstr "阴影"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4104,17 +4018,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "您确信您要删除该约会吗？"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "您确信您要删除该日记项吗？"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "您确信您要删除该会议吗？"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "您确定要删除此任务吗？"
 
@@ -4232,17 +4143,17 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Evolution 备忘异常退出。"
-
-#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 任务异常退出。"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "日历未标为脱机使用。"
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "您所选的日历为只读"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "备忘列表未标为脱机使用"
@@ -4309,59 +4220,49 @@ 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
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "您已经更改了此约会，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
 msgstr "您已经对此任务做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "您已经对此备忘做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的日历无法使用。"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "除非您重新启动 Evolution，否则您的备忘将无法使用。"
-
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的任务将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "保存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Send Notice"
 msgstr "发送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}。"
 
@@ -4378,8 +4279,8 @@ msgstr "分割多日事件："
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "无法启动 evolution-data-server"
 
@@ -4413,12 +4314,12 @@ 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:2038
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "日历"
 
@@ -4459,21 +4360,21 @@ 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/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "备忘"
 
 #: ../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/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "任务"
@@ -4491,15 +4392,15 @@ msgstr "任务(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 日历提醒通知服务"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4507,7 +4408,7 @@ msgid "hours"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "开始时间"
 
@@ -4518,10 +4419,10 @@ msgstr "约会"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "位置："
 
@@ -4531,16 +4432,16 @@ 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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -4552,31 +4453,32 @@ msgstr "午睡(_S)"
 msgid "location of appointment"
 msgstr "约会位置"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "没有可用的摘要。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "没有描述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "没有可用的位置信息。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 个提醒"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4588,7 +4490,7 @@ msgstr ""
 "发送电子邮件。Evolution 将以\n"
 "显示普通提示会话框代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4604,7 +4506,7 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
@@ -4700,196 +4602,178 @@ msgid "Default reminder value"
 msgstr "默认提醒值"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "事件渐变"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "事件透明度"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "忙/闲服务器 URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "忙/闲模板 URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "日历视图中事件的渐变。"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "隐藏已完成的任务"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "隐藏任务单位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "隐藏任务值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "水平面板位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "工作日结束的小时，以 24 小时格式表示，0 到 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "工作日开始的小时，以 24 小时格式表示，0 到 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "日视图和工作日视图中显示的间隔，以分钟计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "上次提醒时间"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "列出发表忙/闲的服务器 URL。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 线"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains 线颜色 - 日视图"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains 线颜色 - 日期栏"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "工作日结束的分钟，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "工作日开始的分钟，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "月视图水平面板的位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "月视图中垂直面板的位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "确定默认提醒的单位数量。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "决定何时隐藏任务的数字单位。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "延期任务的颜色"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "月视图中视图和日期导航器日历之间水平面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-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.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "任务列表和任务预览面板间垂直面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "月视图中视图和日期导航器日历及任务列表之间垂直面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr "非月视图中视图和日期导航器日历及任务列表之间垂直面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "允许提醒运行的程序。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示请回复域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示角色域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "在周视图和月视图中显示约会结束时间"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "在事件/会议/任务编辑器中显示分类域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "在通知托盘中显示提醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示状态域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "显示“预览”面板"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "显示“预览”面板。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "在事件/会议编辑器中显示时区域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示类型域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "在日期导航器中显示周数"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "今天到期的任务颜色"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "任务垂直面板位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4898,7 +4782,7 @@ msgstr ""
 "用作忙/闲数据发布的 URL 模板，%u 将替换为电子邮件的用户部分，而 %d 将替换为域"
 "名。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4906,141 +4790,127 @@ msgstr ""
 "日历中日期和时间所使用的默认时区，以未翻译的时区数据库位置表示，如“Asia/"
 "Shanghai”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "时间分割"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "提醒上次运行的时间，以 time_t 格式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "时区"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "二十四小时时间格式"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "默认提醒的单位，可为“minutes”，“hours”或“days”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "决定是否隐藏任务的单位，可为“minutes”，“hours”或“days”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "一周开始"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "一周开始的日子，从星期日(0)到星期六(6)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "是否使用通知托盘来显示提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "删除约会或任务时是否要求确认。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "销毁约会和任务时是否要求确认。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "在月视图中是否压缩周末；压缩时将把周六和周日用一个单元格显示。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在周视图和月视图中显示事件的结束时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在任务视图中隐藏已完成的任务。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否为约会设置默认提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示请回复域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/会议编辑器中显示分类域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议中显示角色域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示状态域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/会议编辑器中显示时区域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示类型域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期导航器中显示周数。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
-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.in.h:82
 msgid "Work days"
 msgstr "工作日"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "工作日结束小时"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "工作日结束分钟"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "工作日开始小时"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "工作日开始分钟"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
-msgid "daylight savings time"
-msgstr "夏时制时间"
-
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "概要含有"
@@ -5049,25 +4919,39 @@ msgstr "概要含有"
 msgid "Description contains"
 msgstr "描述含有"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "注释含有"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "位置含有"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
 #: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "打印"
 
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "日历"
+
 #: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5082,10 +4966,10 @@ msgstr "销毁较早的事件"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "天"
 
@@ -5093,89 +4977,89 @@ msgstr "天"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "网上"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "生日和纪念日"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "天气"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "新建日历(_N)"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
 msgstr "升级日历失败。"
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "无法打开日历“%s”来创建事件和会议"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "没有可创建事件和会议的日历"
 
-#: ../calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "日历源选择器"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "新建约会"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "新建会议"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "新建全天约会"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "全天约会(_P)"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
@@ -5207,11 +5091,11 @@ msgstr "打开日历的方法不支持"
 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:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "未知的错误"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
 msgid "Edit Alarm"
 msgstr "编辑提醒"
 
@@ -5327,25 +5211,54 @@ msgid "A_dd"
 msgstr "添加(_D)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "提醒"
 
-#: ../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
-msgid "_Suggest automatic display of attachment"
-msgstr "建议自动显示附件(_S)"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "建议自动显示附件"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "添加附件"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "附件属性"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+msgid "Description:"
+msgstr "描述："
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "File name:"
+msgstr "文件名："
+
+#: ../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 类型："
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "已选择用于提醒的日历"
 
@@ -5370,7 +5283,7 @@ msgid ""
 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:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
@@ -5379,7 +5292,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:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">常规</span>"
@@ -5396,25 +5309,27 @@ msgstr "<span weight=\"bold\">时间</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">工作周</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "调整夏时制时间(_V)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "一天结束(_E)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "显示"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "忙/闲"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5424,13 +5339,13 @@ msgstr ""
 "小时\n"
 "天"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5448,225 +5363,219 @@ msgstr ""
 "周六\n"
 "周日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "周日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
 msgstr "选择用于提醒的日历"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "显示一条提醒(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "今天到期的任务(_A)："
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "周四(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "模板："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "时区(_Z)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "时间格式："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1081
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1082
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "星期三"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
 msgstr "一周开始于(_K)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "工作日："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小时(上/下午)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 小时"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "删除项时要求确认(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "一天开始(_D)："
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "周五(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "随后隐藏已完成的任务(_H)"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "周一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "延期任务(_O)："
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "周六(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "在周视图和月视图中显示约会结束时间(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "时间分割(_T)："
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "周二(_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "周三(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "在每次约会前"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "将日历内容复制到本地以进行脱机操作(_Y)"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "将日历内容复制到本地以进行脱机操作"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "将任务列表内容复制到本地以进行脱机操作(_Y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "将任务列表内容复制到本地以进行脱机操作"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "将备忘列表内容复制到本地以进行脱机操作(_Y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "将备忘列表内容复制到本地以进行脱机操作"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "颜色(_O)："
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
 msgstr "任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-msgid "Memo List"
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
 msgstr "备忘列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "日历属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "任务列表属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "新建备忘列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "添加日历"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "添加任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "添加日历(_A)"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "添加任务列表(_A)"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "刷新(_R)："
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL："
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
@@ -5721,48 +5630,48 @@ msgstr "%s  您还没有进行修改，更新编辑器吗？"
 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:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (预定 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加的信件 - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 封附加的信件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "取消拖曳(_D)"
 
@@ -5770,7 +5679,7 @@ msgstr "取消拖曳(_D)"
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5781,96 +5690,97 @@ msgid "Hide Attachment _Bar"
 msgstr "隐藏附件栏(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "显示附件栏(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "添加附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "显示附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "按空格键可切换附件栏"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "会议 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日记条目 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "没有概要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话，对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本！"
 
@@ -5886,10 +5796,6 @@ msgstr "无法打开目的"
 msgid "Destination is read only"
 msgstr "目的只读"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "从全部其它收件人的邮箱中删除此项吗？(_D)"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "无法删除事件，原因是 corba 错误"
@@ -5951,125 +5857,136 @@ msgstr "授权给："
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "约会(_M)"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "再现"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "此事件有提醒"
 
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "日历(_N)："
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../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:916
 msgid "_Delegatees"
 msgstr "代理人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "需要至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "添加(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s”。"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天前"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d 小时前"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟前"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "自定义"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
 msgid "None"
 msgstr "无"
 
@@ -6086,33 +6003,38 @@ msgid "15 minutes before appointment"
 msgstr "约会的 15 分钟前"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "出席者(_S)..."
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "出席者(_N)..."
 
 #: ../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
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "自定义提醒："
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "描述(_E)："
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "事件描述"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "位置(_I)："
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "概要(_M)："
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "提醒(_A)"
 
@@ -6125,7 +6047,7 @@ msgstr "时间(_T)："
 #: ../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])
@@ -6134,6 +6056,14 @@ msgstr "持续时间"
 msgid "until"
 msgstr "直到"
 
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "代理人(_G)"
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "发件人："
+
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6180,7 +6110,7 @@ msgstr "请回复"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "状态"
 
@@ -6201,81 +6131,62 @@ msgid "Organizer"
 msgstr "组织者"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "组织者："
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "无法打开“%s”中的备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
-msgid "To"
-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/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "组(_G)："
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "备忘内容(_M)："
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>日历选项</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "添加新日历"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "日历组"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "日历位置"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "日历名称"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>日历列表选项</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "添加新任务列表"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "任务列表组"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "任务列表名称"
 
@@ -6421,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>"
 
@@ -6486,15 +6397,15 @@ msgstr "<span weight=\"bold\">状态</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c: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-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "已完成"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "高"
 
@@ -6503,20 +6414,20 @@ msgstr "高"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "进行中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "中"
 
@@ -6524,7 +6435,7 @@ msgstr "中"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -6537,7 +6448,7 @@ 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:389
 msgid "Undefined"
 msgstr "未定义"
 
@@ -6546,7 +6457,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:31
 msgid "_Priority:"
 msgstr "优先级(_P)："
 
@@ -6554,12 +6465,12 @@ msgstr "优先级(_P)："
 msgid "_Web Page:"
 msgstr "网页(_W)："
 
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "任务细节"
 
@@ -6572,10 +6483,6 @@ msgstr "到期日期错误"
 msgid "Unable to open tasks in '%s'."
 msgstr "无法打开“%s”中的任务。"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "出席者(_N)..."
-
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "类别(_I)..."
@@ -6584,6 +6491,10 @@ msgstr "类别(_I)..."
 msgid "Or_ganiser:"
 msgstr "组织者(_G)："
 
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "开始日期(_R)："
+
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "时区："
@@ -6592,46 +6503,46 @@ msgstr "时区："
 msgid "_Due date:"
 msgstr "到期日期(_D)："
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>忙/闲日历(_A)</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>发布频率</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>发布位置(_L)</b>"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "忙闲发布设置"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "每日(_D)"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "手动(_M)"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "记住密码(_R)"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "每周(_W)"
 
@@ -6710,42 +6621,35 @@ 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:2862
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, 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
-msgid "Untitled"
-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
-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
-msgid "Description:"
-msgstr "描述："
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr "备忘："
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "网页："
 
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "无标题"
+
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "概要："
 
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "开始日期："
+
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "到期日期："
@@ -6755,7 +6659,7 @@ msgstr "到期日期："
 #: ../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:959
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "状态："
 
@@ -6764,17 +6668,17 @@ 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
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "公开"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "保密"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "机密"
 
@@ -6783,25 +6687,24 @@ msgid "End Date"
 msgstr "结束日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "开始日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "概要"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:438
 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-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "繁忙"
 
@@ -6815,17 +6718,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "否"
@@ -6836,21 +6739,21 @@ msgstr "否"
 #: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "重复"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "已指派"
 
@@ -6858,7 +6761,7 @@ msgstr "已指派"
 msgid "Save As..."
 msgstr "另存为..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "选择保存选中附件的文件夹..."
 
@@ -6867,9 +6770,9 @@ msgstr "选择保存选中附件的文件夹..."
 msgid "untitled_image.%s"
 msgstr "无标题图像.%s"
 
-#: ../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:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
@@ -6887,79 +6790,74 @@ msgstr "保存选中(_S)"
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:418
 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:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "更新对象"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "另存为..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
-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:1175 ../calendar/gui/e-memo-table.c:853
 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:1123
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -6967,52 +6865,44 @@ msgstr "打开网页(_W)"
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-#: ../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:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
 
-#: ../calendar/gui/e-calendar-table.c: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:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派任务(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "作为 iCalendar 转发(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "把任务标记为完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1297
-msgid "_Mark as Incomplete"
-msgstr "标记为未完成(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1298
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "把任务标记为未完成(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "删除选中任务(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "单击以添加任务"
@@ -7022,7 +6912,7 @@ msgstr "单击以添加任务"
 msgid "% Complete"
 msgstr "% 完成"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "完成"
 
@@ -7047,101 +6937,105 @@ msgstr "开始日期"
 msgid "Task sort"
 msgstr "任务排序"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "移动项目"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "复制项目"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "新建会议(_M)"
 
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "新建任务(_T)"
+
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "当前视图(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "选择今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "选择日期(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "复制到日历(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "移至日历(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "代理会议(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "将此次发生变为可移动(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者：%s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者：%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间：%s %s"
@@ -7171,7 +7065,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
@@ -7182,22 +7076,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:1311
-#: ../calendar/gui/e-day-view.c:1463
-#: ../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:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "下午"
 
@@ -7283,12 +7175,10 @@ msgstr "iCalendar 错误"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:340
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "未知的人"
 
@@ -7301,22 +7191,22 @@ msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作�
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "接受"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "拒绝"
 
@@ -7533,7 +7423,7 @@ msgid "Attendee status updated\n"
 msgstr "更新出席者状态\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
@@ -7580,35 +7470,48 @@ msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--到--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "日历信件"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "日期："
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "装入日历"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "正在装入日历..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "服务器消息："
 
+#: ../calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "日期-结束"
+
+#: ../calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "日期-开始"
+
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "主席人员"
@@ -7627,65 +7530,65 @@ msgid "Resources"
 msgstr "资源"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "个人"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "组"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "资源"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "房间"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "必需的出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "不参加"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "需要动作"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "暂时的"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "被委任的"
 
@@ -7694,14 +7597,14 @@ msgstr "被委任的"
 msgid "Attendee                          "
 msgstr "出席者                            "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "处理中"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -7709,86 +7612,86 @@ 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:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 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:450
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "办公室以外"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "没有信息"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "出席者(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "选项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "全部人和资源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "全部人和一个资源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "开始时间(_S)："
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "结束时间(_E)："
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-memo-table.c:870
 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:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "单击以添加备忘"
 
@@ -7796,8 +7699,8 @@ msgstr "单击以添加备忘"
 msgid "Memo sort"
 msgstr "备忘排序"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7815,7 +7718,7 @@ msgstr "装入备忘"
 msgid "Opening memos at %s"
 msgstr "在 %s 打开备忘"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "正在删除选中的对象..."
 
@@ -7824,72 +7727,66 @@ msgstr "正在删除选中的对象..."
 msgid "Enter the password for %s"
 msgstr "为 %s 输入密码"
 
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "正在完成任务..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "销毁"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Select Timezone"
 msgstr "选择时区"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "更新查询"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "自定义视图(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "保存自定义视图(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "定义视图(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "装入位于 %s 的约会"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "装入位于 %s 的任务"
 
-#: ../calendar/gui/gnome-cal.c:2602
-#, c-format
-msgid "Loading memos at %s"
-msgstr "装入位于 %s 的备忘"
-
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "销毁"
 
@@ -8003,73 +7900,74 @@ msgstr "iCalendar 信息"
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/memos-component.c:451
-msgid "_New Memo List"
-msgstr "新建备忘列表(_N)"
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "复制"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "删除"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "属性..."
+
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已选中 %d 个"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "升级备忘失败。"
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "无法打开备忘列表“%s”来创建事件和会议"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "没有可创建备忘的日历"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "备忘来源选择器"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "新建备忘"
 
-#: ../calendar/gui/memos-component.c:1165
-msgid "Mem_o"
-msgstr "备忘(_O)"
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr "备忘(_M)"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "创建新备忘"
 
-#: ../calendar/gui/memos-component.c:1172
-msgid "New shared memo"
-msgstr "新建共享备忘"
-
-#: ../calendar/gui/memos-component.c:1173
-msgid "_Shared memo"
-msgstr "共享备忘(_S)"
-
-#: ../calendar/gui/memos-component.c:1174
-msgid "Create a shared new memo"
-msgstr "创建新的共享备忘"
-
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "新建备忘列表"
 
-#: ../calendar/gui/memos-component.c:1181
-msgid "Memo li_st"
-msgstr "备忘列表(_S)"
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
+msgstr "备忘列表(_I)"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
@@ -8116,240 +8014,240 @@ msgstr "无法升迁日历“%s”"
 msgid "Unable to migrate tasks `%s'"
 msgstr "无法升迁任务“%s”"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31日"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "六"
 
 #. Day
-#: ../calendar/gui/print.c:1936
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "选中的日期(%Y年%m月%d日%A)"
 
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%m月%d日%A"
 
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%Y年%d日%A"
 
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "选中的周(%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "选中的月(%Y年%m月)"
 
 #. Year
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "选中的年(%Y年)"
 
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "概要：%s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2445
 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
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "打印项"
 
@@ -8405,14 +8303,14 @@ msgid "New task list"
 msgstr "新建任务列表"
 
 #: ../calendar/gui/tasks-component.c:1187
-msgid "Tas_k list"
-msgstr "任务列表(_K)"
+msgid "Task l_ist"
+msgstr "任务列表(_I)"
 
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8423,11 +8321,11 @@ msgstr ""
 "\n"
 "确实删除这些任务吗？"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "不要再次询问。"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "打印任务"
 
@@ -9003,7 +8901,7 @@ msgid "America/Nassau"
 msgstr "美洲/拿骚"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "美洲/纽约"
 
@@ -10022,7 +9920,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "附件栏"
 
@@ -10030,43 +9928,28 @@ msgstr "附件栏"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "无法附加文件 %s：%s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "无法附加文件 %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 "MIME 类型："
-
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "投递目的"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "选择要将信件投递到哪个文件夹。"
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "单击此处以使用地址簿"
 
@@ -10077,45 +9960,45 @@ msgstr "单击此处以使用地址簿"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "回复到(_R)："
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "发件人(_O)："
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "主题(_U)："
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "收信人(_T)："
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "输入信件的收件人"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "抄送(_C)："
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "输入将接收该信件副本的收件人地址"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "暗送(_B)："
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10124,15 +10007,15 @@ msgstr "输入将接收该信件副本，但不出现在收件人列表中的收
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "投递到(_P)："
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "投递到："
 
@@ -10140,67 +10023,67 @@ msgstr "投递到："
 msgid "A_ttach"
 msgstr "附件(_T)"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "插入附件"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信件签名：未对此账户设置签名证书"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信件加密：未对此账户设置加密证书"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "隐藏附件栏(_A)"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "显示附件栏(_A)"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "无法打开文件"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器获取信件"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "无标题信件"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "打开文件"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "自动生成的"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2254
 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:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "撰写新邮件"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10338,7 +10221,7 @@ msgstr "保存信件(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10406,14 +10289,18 @@ msgid "Yes, Change Status"
 msgstr "是，更改状态"
 
 #: ../designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>接收电子邮件</b>"
 
-#: ../designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>发送电子邮件：</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10423,37 +10310,37 @@ msgstr ""
 "<small>此页面允许您选择是否要对您发出的信件是用阅读收条进行通知，\n"
 "以及指定在别人请求您的阅读收条时 Evolution 应该怎么做。</small>"
 
-#: ../designs/read_receipts/read.glade.h:5
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
 msgstr "总是发回阅读收条"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "询问我是否想要发回阅读收条"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "从不发回阅读收条"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "阅读收条"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "我发出的所有信件都要求阅读收条"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "除非信件发送给邮件列表，或者是给我自己发的"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr "当您收到请求阅读收条的邮件，Evolution 应该做什么？"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10461,28 +10348,28 @@ msgstr ""
 "指定名称的文件已经存在。\n"
 "覆盖它？"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "覆盖文件吗？"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution 信息"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution 查询"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "内部错误，请求了未知的错误“%s”"
@@ -10570,24 +10457,24 @@ msgstr "%Y-%m-%d"
 msgid "Select a time to compare against"
 msgstr "选择用于比较的时间"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "选择文件"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "重要"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "待办"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "稍候"
 
@@ -10636,11 +10523,11 @@ msgid "Include threads"
 msgstr "包含线索"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "接收"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "寄出"
 
@@ -10730,7 +10617,7 @@ msgstr "过去"
 msgid "months"
 msgstr "月"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "秒"
 
@@ -10799,22 +10686,22 @@ msgstr "Evolution 邮件撰写控件"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 邮件首选项控件"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../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:531
 msgid "Mail Accounts"
 msgstr "邮件账户"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "邮件首选项"
 
@@ -10840,7 +10727,7 @@ msgstr ""
 "并选中复选框表明您接受该协议\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "选择文件夹"
 
@@ -10848,11 +10735,11 @@ msgstr "选择文件夹"
 msgid "Ask for each message"
 msgstr "每封信都询问"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "标识"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "接收电子邮件"
 
@@ -10860,11 +10747,11 @@ msgstr "接收电子邮件"
 msgid "Automatically check for _new mail every"
 msgstr "自动检查新邮件的间隔(_N)"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "发送电子邮件"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "默认"
 
@@ -10883,11 +10770,11 @@ msgstr "接收选项"
 msgid "Checking for New Mail"
 msgstr "检查新邮件"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution 账户助手"
 
@@ -10907,22 +10794,22 @@ msgid "[Default]"
 msgstr "[默认]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "账户名"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "协议"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "未命名"
 
@@ -10998,12 +10885,6 @@ msgstr "接收日期"
 msgid "Date sent"
 msgstr "发送日期"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "删除"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "已删除"
@@ -11092,7 +10973,7 @@ msgstr "不是"
 msgid "is not Flagged"
 msgstr "未标志"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾"
@@ -11101,7 +10982,7 @@ msgstr "垃圾"
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "标签"
 
@@ -11145,7 +11026,7 @@ msgstr "播放声音"
 msgid "Read"
 msgstr "已读"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "收件人"
 
@@ -11173,11 +11054,11 @@ msgstr "返回小于"
 msgid "Run Program"
 msgstr "运行程序"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "分数"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "发送者"
 
@@ -11209,11 +11090,11 @@ msgstr "开始于"
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "主题"
@@ -11227,42 +11108,10 @@ msgstr "取消状态"
 msgid "<b>Then</b>"
 msgstr "<b>则</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "从头创建搜索文件夹(_R)..."
 
-#: ../mail/em-folder-browser.c:183
-msgid "All Messages"
-msgstr "全部信件"
-
-#: ../mail/em-folder-browser.c:184
-msgid "Unread Messages"
-msgstr "未读信件"
-
-#: ../mail/em-folder-browser.c:186
-msgid "No Label"
-msgstr "无标签"
-
-#: ../mail/em-folder-browser.c:193
-msgid "Read Messages"
-msgstr "已读信件"
-
-#: ../mail/em-folder-browser.c:194
-msgid "Recent Messages"
-msgstr "最近信件"
-
-#: ../mail/em-folder-browser.c:195
-msgid "Last 5 Days Messages"
-msgstr "前五天的信件"
-
-#: ../mail/em-folder-browser.c:196
-msgid "Messages with Attachments"
-msgstr "有附件的信件"
-
-#: ../mail/em-folder-browser.c:197
-msgid "Messages Not Junk"
-msgstr "不是垃圾邮件"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
@@ -11277,7 +11126,7 @@ msgid_plural "Unread messages:"
 msgstr[0] "未读信件数："
 
 #: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "文件夹属性"
 
@@ -11294,7 +11143,7 @@ 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/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "搜索文件夹"
 
@@ -11309,7 +11158,7 @@ msgstr "草稿"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "收件箱"
 
@@ -11325,77 +11174,77 @@ msgstr "已发箱"
 msgid "Loading..."
 msgstr "正在装入..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "邮件文件夹树"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s”"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信件移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信件复制到文件夹 %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信件放到顶级文件夹存储"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "复制到文件夹(_C)"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "移至文件夹(_M)"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "在“%s”中扫描文件夹"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "在新窗口中打开(_N)"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "移动(_M)..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
@@ -11404,14 +11253,13 @@ msgstr "清空回收站(_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "把“%s”复制到 %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "复制(_O)"
 
@@ -11433,218 +11281,208 @@ msgstr "创建文件夹"
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "作为新信件进行编辑(_E)..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "取消删除(_N)"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: ../mail/em-folder-view.c:1135
-msgid "Mark as Un_important"
-msgstr "标记为不重要(_I)"
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr "标记为不重要(_M)"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟随(_W)..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1105
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "无(_N)"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "已完成标志(_G)"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "清除标志(_E)"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "根据信件创建规则(_T)"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "基于主题的搜索文件夹(_S)"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "基于发件人的搜索文件夹(_N)"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "基于收件人的搜索文件夹(_R)"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "基于邮件列表的搜索文件夹(_L)"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "基于主题过滤(_J)"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "基于发件人过滤(_D)"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "基于收件人过滤(_C)"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "基于邮件列表过滤(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "默认"
 
-#: ../mail/em-folder-view.c:2145
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "打印信件"
 
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "无法获取信件"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "复制链接位置(_C)"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "创建搜索文件夹(_S)"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "自此地址(_F)"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "到此地址(_T)"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
 
-#: ../mail/em-folder-view.c:2860
-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:496
 #, c-format
 msgid "Matches: %d"
 msgstr "匹配：%d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "查找："
-
-#: ../mail/em-format-html-display.c:677
-msgid "M_atch case"
-msgstr "匹配大小写(_A)"
-
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "未签名"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信件未签名。无法保证这封信是可信的。"
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此信件已签名，而且签名是有效的。这意味着这封信应该是可信的。"
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "签名有效，无法校验发送者"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "这封信的签名有效，但是无法校验邮件的发送者。"
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:766
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11653,21 +11491,21 @@ msgstr ""
 "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花一"
 "定时间进行暴力破解，这很困难但并不是不可能。"
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:768
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11676,71 +11514,71 @@ msgstr ""
 "这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大"
 "量时间进行暴力破解，这十分困难。"
 
-#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Y年%m月%d日%A，%p%l:%M完成"
+msgstr "%Y年%m月%d日%A，%H:%M完成"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "延期："
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "到 %m月%d日%A，%p%l:%M"
+msgstr "到 %m月%d日%A，%H:%M"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "适合宽度(_F)"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "显示原始大小(_O)"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
-#: ../mail/em-format-html-display.c:2072
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "选择保存全部附件的文件夹..."
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "保存所选(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:1988
 #, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d 个附件(_T)"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] "%d 个附件(_N)"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "保存(_A)"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "全部保存(_A)"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "无附件"
 
@@ -11754,88 +11592,94 @@ msgstr "第 %d 页，共 %d 页"
 msgid "Retrieving `%s'"
 msgstr "收取“%s”"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "签名有效但是无法校验发送者"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "格式化信件"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "发件人"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "回复至"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr "收件人"
+
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "抄送"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "密件抄送"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "邮件程序"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%A，%R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "新闻组"
@@ -11885,7 +11729,7 @@ msgstr "每周一次"
 msgid "Once per month"
 msgstr "每月一次"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11896,47 +11740,47 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "无法创建新文件夹“%s”：%s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "无法将文件夹“%s”复制为“%s”：%s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "无法扫描位于“%s”的已有邮箱：%s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”：%s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”：%s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "无法复制 POP3 在服务器上保留的数据“%s”：%s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "创建本地邮件存储“%s”失败：%s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "无法在“%s”创建本地邮件文件夹：%s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11953,6 +11797,10 @@ msgstr "回复发件人(_R)"
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "在浏览器中打开链接(_O)"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "把新信发送到(_S)..."
@@ -11965,45 +11813,45 @@ msgstr "添加到地址簿(_A)"
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此存储不支持订阅，或订阅未启用。"
 
-#: ../mail/em-subscribe-editor.c:645
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "已订阅"
 
-#: ../mail/em-subscribe-editor.c:649
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "文件夹"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:870
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
-#: ../mail/em-subscribe-editor.c:891
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "没有选中服务器"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "不再显示此信息。"
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "邮件过滤器"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "信件"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "保存信件..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "添加地址"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "来自 %s 的信件"
@@ -12012,7 +11860,7 @@ msgstr "来自 %s 的信件"
 msgid "Search _Folders"
 msgstr "搜索文件夹(_F)"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "搜索文件夹来源"
 
@@ -12045,116 +11893,88 @@ msgid "Composer Window default width"
 msgstr "编写窗口的默认宽度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "压缩 TO/CC/BCC 中地址的显示"
-
-#: ../mail/evolution-mail.schemas.in.in.h:9
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "编写信件的默认字符集"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "编写信件的默认字符集。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "显示信件的默认字符集"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "显示信件的默认字符集。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "默认转发方式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "撰写窗口的默认高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "信件窗口的默认高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "订阅对话框的默认高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "默认回复样式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "撰写窗口的默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "信件窗口的默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "订阅对话框的默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "在您打字的时候就显示拼写错误标识。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "退出时清空回收站"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "退出 Evolution 时清空回收站"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "启用光标模式，这样您在读取邮件时就能看到光标了。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "启用或禁用自动前进功能"
-
-#: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "启用/禁用光标模式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "信件列表面板的高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "信件列表面板的高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "如果用户试图一次打开的信件大于等于十封，将会询问用户是否真的要这么做。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
-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.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12164,27 +11984,23 @@ msgstr ""
 "MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
 "内容。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "上次清空回收站的时间"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "标签及其对应颜色的列表"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "列出接受的许可"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "账户列表"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12192,11 +12008,11 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
 "accounts 的子目录命名字符串。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "自定义头及该头是否启用。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12204,19 +12020,19 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”，其中"
 "颜色使用了 HTML 十六进制编码方式。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "列出接受协议的协议名称。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "在 HTML 信件中装入 HTTP 图像"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12225,198 +12041,178 @@ msgstr ""
 "在 HTML 信件中装入 http(s) 图像。可供选择的值有：0 - 决不从网上装入图像，1 - "
 "如果发送者在地址簿中则装入图像，2 - 总是从网上装入图像"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "记录过滤动作"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "将过滤动作记录到指定日志文件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "记录过滤动作的日志文件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "记录过滤动作的日志文件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定超时过后标为已看"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定超时过后标为已看。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "在信件“预览”中标出引用"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在信件“预览”中标出引用。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "信件窗口默认高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "信件窗口默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "信件显示风格(普通、全部邮件头、源代码)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "退出时清空回收站的最少天数"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "退出时清空回收站的最少天数。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "新建邮件通知声音文件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "新建邮件通知类型"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "要在 TO/CC/BCC 中显示的地址数"
-
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "空主题时提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "用户视图销毁文件夹时提示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "用户视图发送没有主题的邮件时提示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "用户销毁时提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "用户只填入 Bcc 时提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "当用户试图一次打开超过十封信时提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:62
 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.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "当用户是否发送意外的 HTML 时提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
-msgid "Prompt while marking multiple messages"
-msgstr "标记多封信件时提示"
-
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "识别文本中的链接并进行替换。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "识别文本中的表情，并将其替换为图像。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "对收到的邮件运行垃圾邮件测试"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "默认以 HTML 发送邮件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "默认以 HTML 发送邮件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "显示动画"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "将动画图像显示为动画。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在信件列表中显示删除了的信件(带有删除线)。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "在信件列表中显示删除了的信件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-#, fuzzy
-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
-#, fuzzy
-msgid "Show the sender email in the messages column in the message list"
-msgstr "在信件列表中显示删除了的信件"
-
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "新邮件到达时要播放的声音文件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "指定用户想要使用的新邮件通知类型。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "内嵌拼写检查"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "订阅对话框默认高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "订阅对话框默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "上次清空回收站的时间，以 epoch 天数显示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "邮件显示用的终端字体"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "用于显示邮件的变宽字体"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12426,122 +12222,104 @@ msgstr ""
 "此键应包含指定自定义邮件头的 XML 结构列表，以及是否显示这些邮件头。XML 结构的"
 "格式为：&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-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:96
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "按线索编排信件列表。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "基于主题按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "将信件标为已看的超时"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "将信件标为已看的超时。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "默认账户的 UID 字符串。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "使用垃圾克星守护程序和客户"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "使用垃圾克星守护程序和客户(spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "使用自定义字体"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "使用自定义字体显示邮件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾邮件测试。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "之使用本地垃圾邮件测试(无 DNS)。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use side-by-side or wide layout"
-msgstr "使用并排还是宽屏布局"
-
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "变宽字体"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "选中了查看/Bcc 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "选中了查看/Bcc 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "选中了查看/Cc 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "选中了查看/Cc 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "选中了查看/From 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "选中了查看/From 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "选中了查看/PostTo 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "选中了查看/PostTo 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "选中了查看/ReplyTo 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "选中了查看/ReplyTo 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "是否在信件不包含 In-Reply-To 或 References 头时强制按主题编排线索。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Width of the message-list pane"
-msgstr "信件列表面板的高度"
-
-#: ../mail/evolution-mail.schemas.in.in.h:122
-msgid "Width of the message-list pane."
-msgstr "信件列表面板的高度。"
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "导入 Elm 数据"
@@ -12573,15 +12351,15 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "导入器 Berkeley 邮箱格式文件夹"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "导入“%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
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "请稍候"
 
@@ -12748,31 +12526,31 @@ msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] "，%d 封未读"
 
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "新建信件"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "信件(_M)"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "撰写一封新信"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "新建邮件文件夹"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "邮件文件夹(_F)"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "创建新邮件文件夹"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升级邮件设置或文件夹失败。"
 
@@ -12800,220 +12578,226 @@ msgstr "待办(_T)"
 msgid "_Later"
 msgstr "稍候(_L)"
 
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "检查支持的类型(_E)"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>签名(_N)</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>语言(_L)</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 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:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">账户信息</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 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
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">过滤器选项</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">标签和颜色</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">装入图像</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">信件显示</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">信件字体</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">信件收条</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">新邮件提醒</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 #: ../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:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">选项</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">打印字体</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">请求的信息</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">安全</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">已发送和草稿信件</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</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 "添加新签名(_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 mail"
 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 mail"
 msgstr "当发送加密邮件时总是对自身加密(_M)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "附加原始信件"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "自动插入表情图像(_S)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../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 "Beep w_hen new mail arrives"
 msgstr "新邮件到达时响铃(_H)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "字符集(_H)："
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "检查支持的类型(_E)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
 msgstr "检查收到的邮件是否是垃圾邮件(_C)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../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 "清除(_R)"
 
-#: ../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
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "颜色"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "销毁文件夹时确认(_W)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13028,134 +12812,134 @@ msgstr ""
 "\n"
 "单击“应用”可保存您的设置。"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "默认(_F)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "默认字符编码(_N)："
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "对寄出的信件进行数字签名(默认)(_S)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "无法引用原始信件"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "草稿文件夹(_F)："
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "启用(_N)"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "电子邮件"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "电子邮件地址(_A)："
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "退出时清空已删除邮件(_X)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "加密证书(_P)："
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "加密寄出的信件(默认)(_G)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "等宽字体(_X)："
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "等宽(_X)："
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "字体属性"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "用 HTML 格式化信件(_H)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "全名(_E)："
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML 邮件"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "信头"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "突出显示引用(_Q)"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "包含远程测试(_N)"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "嵌入"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "语言表"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "邮件头表"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "信件撰写器"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：直到您第一次连接的时候，才会询问密码。"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "组织(_G)："
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "新邮件到达时播放声音文件(_V)"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13163,7 +12947,7 @@ msgstr ""
 "请在下面的空白处输入此账户的描述性名称。\n"
 "此名称将只在显示时使用。"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13171,7 +12955,7 @@ msgstr ""
 "请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者"
 "互联网服务提供商ISP。"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13180,42 +12964,38 @@ msgstr ""
 "请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发"
 "出的邮件中包含此信息。"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "请从以下选项中选择"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "发送只有暗送收件人的信件时提示(_O)"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "引用原始信件"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "引用"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "记住密码(_M)"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "回复到(_P)："
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "记住密码(_P)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "选择(_E)..."
 
-#: ../mail/mail-config.glade.h:120
-msgid "S_end message receipts:"
-msgstr "发送信件收条(_E)："
-
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "标准字体(_T)："
@@ -13244,57 +13024,61 @@ msgstr "选择用于打印的 HTML 变宽度字体"
 msgid "Select sound file"
 msgstr "选择声音文件"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr "发送信件收条："
+
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "发送邮件"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "已发送信件文件夹(_M)："
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "签名证书(_N)："
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "签名(_U)："
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "签名"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "签名表"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 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"
@@ -13303,7 +13087,7 @@ msgstr ""
 "此脚本的输出将用于您的签名。您指定的名称将只会\n"
 "用于显示。"
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13311,15 +13095,15 @@ msgstr ""
 "输入您想要给此帐户起的名字。\n"
 "如：“工作”或“私人”"
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 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"
@@ -13329,71 +13113,67 @@ msgstr ""
 "\n"
 "单击“前进”开始。"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "添加签名(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "总是从 Internet 上装入图像(_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "新邮件到达时不要提醒我(_D)"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "转发方式(_F)："
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "装入联系人发来的邮件中的图像(_L)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "使它成为我的默认账户(_M)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "把信件标记为已读前等(_M)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "绝不从 Internet 装入图像(_N)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "路径(_P)："
 
-#: ../mail/mail-config.glade.h:166
+#: ../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:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "发送空主题行的信件时提示(_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "回复风格(_R)："
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "脚本(_S)："
 
 #. 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:173
 msgid "_Show image animations"
 msgstr "显示图像动画(_S)"
 
-#: ../mail/mail-config.glade.h:173
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
-
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "使用安全连接(_U)："
@@ -13403,21 +13183,13 @@ msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程序相同的字体(_U)"
 
 #: ../mail/mail-config.glade.h:176
-msgid "addresses"
-msgstr "个地址"
-
-#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "颜色"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "描述"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>搜索文件夹来源</b>"
@@ -13431,63 +13203,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">加密</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "全部活跃远程文件夹"
-
-#: ../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
 msgid "Case _sensitive"
 msgstr "区分大小写(_S)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "查找(_I)："
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:9
 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:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "跟随的标志"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "文件夹订阅"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "许可协议"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "没有选中"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "服务器(_E)："
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "安全信息"
 
-#: ../mail/mail-dialogs.glade.h:19
-msgid "Specific folders"
-msgstr "指定文件夹"
-
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13495,51 +13251,67 @@ msgstr ""
 "您选中进行跟随的信件已经在下面列出。\n"
 "请从“标志”菜单中选择跟随操作。"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "接受协议(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "延期人(_D)："
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "标志(_F)："
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "订阅(_S)"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "选中此处以表明您接受许可协议(_T)"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
+#: ../mail/mail-dialogs.glade.h:25
+msgid "specific folders only"
+msgstr "仅指定文件夹"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "with all active remote folders"
+msgstr "以全部活跃远程文件夹"
+
+#: ../mail/mail-dialogs.glade.h:27
+msgid "with all local and active remote folders"
+msgstr "以全部本地和活跃远程文件夹"
+
+#: ../mail/mail-dialogs.glade.h:28
+msgid "with all local folders"
+msgstr "以所有本地文件夹"
+
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "查验 %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "过滤文件夹"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "收取邮件"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "应用寄出过滤器失败：%s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13548,112 +13320,121 @@ msgstr ""
 "追加到 %s：%s 失败\n"
 "转而追加到本地“已发”文件夹。"
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "追加到本地“已发”文件夹失败：%s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第%d封信，共%d封"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "在第%d封信失败，共%d封"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "完成。"
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "把信件保存到文件夹中"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把信件移至 %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把信件复制到 %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "转发的信件"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "打开文件夹 %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "打开存储 %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "删除文件夹 %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "存储文件夹“%s”"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "销毁并存储账户“%s”"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "存储账户“%s”"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "刷新文件夹"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "销毁文件夹"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空“%s”中的回收站"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "本地文件夹"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "收取信件 %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "收取 %d 封信"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "保存 %d 封信"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"无法创建输出文件：%s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13662,11 +13443,11 @@ msgstr ""
 "在将信件保存到 %s 时发生错误：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "保存附件"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13675,69 +13456,60 @@ msgstr ""
 "无法创建输出文件：%s：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据：%s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "断开与 %s 的连接"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新连接到 %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "检查服务"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "检查新邮件"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "输入 %s 的密码"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "输入密码"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "用户己取消操作。"
 
@@ -13750,7 +13522,7 @@ msgid "Enter a name for this signature."
 msgstr "输入该签名的名字。"
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "名称："
 
@@ -13793,11 +13565,11 @@ msgstr "更新“%s:%s”的搜索文件夹"
 msgid "Updating Search Folders for '%s'"
 msgstr "更新“%s”的搜索文件夹"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "编辑搜索文件夹"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "新建搜索文件夹"
 
@@ -14179,9 +13951,9 @@ msgstr "签名已经存在"
 
 #: ../mail/mail.error.xml.h:89
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr "要让 Ximian Evolution 正常运作所需的系统文件夹无法重命名、移动或删除。"
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
@@ -14335,74 +14107,74 @@ msgstr "销毁(_E)"
 msgid "_Open Messages"
 msgstr "打开信件(_O)"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信件"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
-msgstr "今天%p%l:%M"
+msgstr "今天 %H:%M"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
-msgstr "昨天%p%l:%M"
+msgstr "昨天 %H:%M"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
-msgstr "%A%p%l:%M"
+msgstr "%A %H:%M"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
-msgstr "%m月%d日%p%l:%M"
+msgstr "%m月%d日 %H:%M"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "信件"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "生成信件列表"
 
@@ -14422,15 +14194,15 @@ msgstr "已标志"
 msgid "Follow Up Flag"
 msgstr "跟随标志"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "原始位置"
+
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "已接收"
 
-#: ../mail/message-list.etspec.h:14
-msgid "Sent Messages"
-msgstr "已发信件"
-
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "大小"
@@ -14578,10 +14350,6 @@ msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
 
-#: ../plugins/bbdb/bbdb.c:460
-msgid "Select Address book for Automatic Contacts"
-msgstr "选择自动联系人的地址簿"
-
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
 msgstr "即时通讯联系人"
@@ -14592,10 +14360,6 @@ msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "定时从 Gaim 好友列表中同步联系人信息和图像"
 
-#: ../plugins/bbdb/bbdb.c:496
-msgid "Select Address book for Gaim buddy list"
-msgstr "选择 Gaim 好友列表的地址簿"
-
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
@@ -14701,6 +14465,10 @@ msgid ""
 "things to the clipboard."
 msgstr "一个测试插件，它将显示允许您将文字复制到剪贴板的弹出菜单插件。"
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "复制电子邮件地址(_E)"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "复制工具"
@@ -14807,7 +14575,7 @@ msgid "Change the password for Exchange account"
 msgstr "更改 Exchange 账户的密码"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -14839,19 +14607,19 @@ msgstr "文件夹大小"
 msgid "Exchange Settings"
 msgstr "Exchange 设置"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "_OWA URL："
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "身份验证(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "身份验证类型"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "检查支持的类型(_E)"
 
@@ -14877,31 +14645,29 @@ msgstr "当前密码与您账户的已有密码不匹配。请输入正确的密
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "两个密码不匹配。请重新输入密码。"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
 msgstr "确认密码："
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "Current Password:"
 msgstr "当前密码："
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "New Password:"
-msgstr "新建密码："
+msgstr "新建密码码："
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
 msgstr "您目前的密码已经过期。请立即更改您的密码。"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, 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
 msgid "Custom"
 msgstr "自定义"
 
@@ -15019,7 +14785,7 @@ msgstr "文件夹名称"
 msgid "Folder Size"
 msgstr "文件夹大小"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:304
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "订阅其他用户的文件夹"
@@ -15034,14 +14800,14 @@ msgstr "Exchange 文件夹树"
 msgid "Unsubscribe Folder..."
 msgstr "退订文件夹..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "真的要退订文件夹“%s”吗？"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "退订“%s”"
@@ -15074,59 +14840,59 @@ msgstr "添加用户："
 msgid "Add User"
 msgstr "添加用户"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "<b>Permissions</b>"
 msgstr "<b>权限</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Delete"
 msgstr "无法删除"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Cannot Edit"
 msgstr "无法编辑"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create items"
 msgstr "创建项目"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Create subfolders"
 msgstr "创建子文件夹"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Any Items"
 msgstr "删除任何项目"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Delete Own Items"
 msgstr "删除自有项目"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Any Items"
 msgstr "编辑任何项目"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
 msgstr "编辑自有项目"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder contact"
 msgstr "文件夹联系人"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder owner"
 msgstr "文件夹所有者"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Folder visible"
 msgstr "文件夹可见"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Read items"
 msgstr "读取项目"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
 msgstr "角色："
 
@@ -15165,24 +14931,20 @@ msgid "Cannot display folders."
 msgstr "无法显示文件夹。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-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 "对 Exchange 账户“{0}”配置的更改将在您退出并重新启动 Evolution 后生效。"
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
+msgstr "对 Exchange 账户配置的更改将在您退出并重新启动 Evolution 后生效。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
 msgstr "无法认证到服务器。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not change password."
 msgstr "无法更改密码。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -15191,55 +14953,55 @@ msgstr ""
 "无法配置 Exchange 账户，原因是发生了未知错误。请检查 URL、用户名、密码，然后"
 "再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
 msgstr "无法连接到 Exchange 服务器。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "无法连接到服务器 {0}。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "无法确定代理人的文件夹权限。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "找不到 Exchange Web 存储系统。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "无法定位服务器 {0}。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "无法将授权给 {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "无法读取文件夹权限"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "无法读取文件夹权限。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "无法读取不在办公室状态"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "无法更新文件夹权限。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "无法更新不在办公室状态"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 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:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15263,90 +15025,90 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
 msgstr "更新代理人失败："
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
 msgstr "文件夹已经存在"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder does not exist"
 msgstr "文件夹不存在"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder offline"
 msgstr "文件夹脱机"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "常规错误"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr "如果 OWA 运行于不同的路径上，您必须在账户配置对话到中指定该路径。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0} 的邮箱不在此服务器上。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
 msgstr "请确定 URL 正确，然后再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "请确定服务器名称拼写正确，然后再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
 msgstr "请确定用户名和密码正确，然后再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
 msgstr "没有为此账户配置全局编目服务器。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
 msgstr "用户 {0} 在 {1} 上没有邮箱。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No such user {0}"
 msgstr "没有用户 {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
 msgstr "密码已经成功更改。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Please restart Evolution for changes to take effect"
-msgstr "请重新启动 Evolution 以便使得更改生效"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr "请重新启动 Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
 msgstr "请选择用户。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
 msgstr "服务器拒绝了密码，因为该密码的安全级别太低。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "当您退出 Evolution 时，Exchange 账户将被禁用"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "当您退出 Evolution 时 Exchange 账户将被删除"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange 服务器与 Exchange Connector 不兼容。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15354,7 +15116,7 @@ msgstr ""
 "服务器正在运行 Exchange 5.5。Exchange Connector 只支持 Microsoft Exchange "
 "2000 和 2003。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15367,81 +15129,81 @@ msgstr ""
 "\n"
 "或者，您可能拼错了密码。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
 msgstr "请用不同的密码再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
 msgstr "无法将用户添加到访问控制列表中："
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
 msgstr "无法编辑代理人。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
 msgstr "查阅 {0} 时发生未知错误"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unknown type"
 msgstr "未知类型"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unsupported operation"
 msgstr "不支持的操作"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "您即将用完您在此服务器上的存储邮件的配额。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
 msgstr "您不能授权给您自己"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "您已经超过了在此服务器上存储邮件的配额。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
 msgstr "您只能配置单个 Exchange 账户。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "您目前使用了 {0} KB。试着通过删除邮件来清理一些空间。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "您目前使用了 {0} KB。您现在既不能发送也不能接收邮件。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 msgstr "您目前使用了 {0} KB。您将无法发送邮件，除非您通过删除邮件来清理空间。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr "您的密码已经过期。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} 无法添加到访问控制列表中"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
 msgstr "{0} 已被授权"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
 msgstr "{0} 已经在列表中"
 
@@ -15466,13 +15228,7 @@ msgstr "允许在文件夹树的快捷菜单中退订邮件文件夹。"
 msgid "Unsubscribe Folders"
 msgstr "退订文件夹"
 
-#: ../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
-msgid "Notes"
-msgstr "笔记"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "待办清单"
 
@@ -15523,7 +15279,7 @@ 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
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "发送选项"
 
@@ -15539,40 +15295,40 @@ msgstr "Groupwise 特性"
 msgid "Accept Tentatively"
 msgstr "暂时接受"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
 msgstr "<b>用户数：</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
 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
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "联系人(_C)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Customize notification message"
 msgstr "自定义通知消息(_C)"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "未共享(_N)"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "共享对象(_S)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "共享(_S)"
 
@@ -15641,10 +15397,7 @@ msgstr "代理服务器登录"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s输入 %s 的密码(用户 %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:517
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "代理服务器登录(_P)..."
 
@@ -15705,12 +15458,12 @@ msgid "Select Calendar"
 msgstr "选择日历"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "导入(_I)"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar 格式(.ics)"
 
@@ -15760,126 +15513,126 @@ msgstr "无法打开日历/待办！"
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "无法打开 Evolution 日历/待办列表导出数据。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "装入日历“%s”失败"
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "日历“%s”中的一个约会与此会议冲突"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s”中找到了约会"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "无法在任何日记中找到此日记项"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "无法分析项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s”发送为已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状态无法更新，原因是状态无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "出席者状态已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信件声明其包含日历，但日历不是有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "信件的确包含日历，但是日历不包含事件、任务或忙/闲信息"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -15887,422 +15640,384 @@ msgstr "要处理这些全部项目，应该保存文件并导入日历"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "操作后删除消息(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
 msgid "Conflict Search"
 msgstr "冲突搜索"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择要搜索冲突会议的日历"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:202
 msgid "Today %l:%M:%S %p"
-msgstr "今天%p%l:%M:%S"
+msgstr "今天 %H:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:214
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:221
 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:228
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
-msgstr "明天%p%l:%M"
+msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "明天%p%l:%M:%S"
+msgstr "明天 %H:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
-msgstr "%A%p%l:%M"
+msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
-msgstr "%A%p%l:%M:%S"
+msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:276
 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:284
+#: ../plugins/itip-formatter/itip-view.c:282
 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:288
+#: ../plugins/itip-formatter/itip-view.c:286
 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:293
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %l:%M %p"
-msgstr "%-m月%-d日%A%p%l:%M"
+msgstr "%-m月%-d日%A %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:297
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%-m月%-d日%A%p%l:%M:%S"
+msgstr "%-m月%-d日%A %H:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 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:308
+#: ../plugins/itip-formatter/itip-view.c:306
 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:312
+#: ../plugins/itip-formatter/itip-view.c:310
 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:317
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y年%-m月%-d日%A%p%l:%M"
+msgstr "%Y年%-m月%-d日%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
+msgstr "%Y年%-m月%-d日%A %H:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> 通过 %s 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 为您代理了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 通过 %s 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望接收到下列会议的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 发回了下列会议请求的响应："
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 通过 %s 取消了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 取消了下列会议。"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 通过 %s 拒绝了下列会议变更："
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 拒绝了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 通过 %s 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:419
 #, 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:424
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 通过 %s 为您指派了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 为您指派了一个任务："
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s<b> 希望加入到已存在的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> 想要收到所指派的下列任务的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> 发回了下列指派任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> 通过 %s 取消了下列任务指派："
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 取消指派的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 提议了下列任务指派变更："
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:451
 #, 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:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 拒绝了指派的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> 通过 %s 发布了下列备忘："
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> 发布了下列备忘："
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, 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:491
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> 希望加入到已有的备忘中："
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, 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:497
-#, 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:753
+#: ../plugins/itip-formatter/itip-view.c:705
 msgid "_Open Calendar"
 msgstr "打开日历(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
-msgid "_Decline"
-msgstr "拒绝(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
 msgstr "全部拒绝(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "拒绝(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
 msgstr "全部待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
 msgstr "待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:724
 msgid "_Send Information"
 msgstr "发送信息(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:728
 msgid "_Update Attendee Status"
 msgstr "更新与会者状态(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
 msgstr "更新(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "开始时间："
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "结束时间："
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "注释："
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "给出席者发送更新(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "应用到全部实例(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
-msgid "_Tasks :"
-msgstr "任务(_T)："
-
-#: ../plugins/itip-formatter/itip-view.c:1711
-msgid "Memos :"
-msgstr "备忘："
-
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "显示信件的 text/calendar 部分。"
@@ -16314,7 +16029,7 @@ msgstr "Itip 格式化"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr "“{0}”代理了该会议。您是否想要添加代理人“{1}”？"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16399,14 +16114,17 @@ msgid "Convert the selected message to a new task"
 msgstr "将选中邮件转换为新任务"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
 msgstr "联系列表所有者(_O)"
 
 #: ../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 "获得列表存档(_A)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr "获得列表用法信息(_U)"
 
@@ -16426,14 +16144,17 @@ msgid ""
 msgstr "提供邮件列表公共命令的动作(订阅、退订等等)。"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "投递到列表(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "订阅列表(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "退订列表(_U)"
 
@@ -16511,27 +16232,15 @@ msgstr "编辑信件(_E)"
 msgid "_Send message"
 msgstr "发送信件(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "联系列表所有者(_O)"
-
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "联系这封信所属邮件列表的所有者"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "获得列表存档(_A)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "获得列表用法信息(_U)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "获取这封信所属邮件列表的存档"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "获取这封信所属邮件列表的用法信息"
 
@@ -16547,24 +16256,12 @@ msgstr "订阅这封信所属的邮件列表"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "退订这封信所属的邮件列表"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "投递到列表(_P)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "订阅列表(_S)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "退订列表(_U)"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "全部标为已读"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
+msgid "Mark me_ssages as read"
 msgstr "把信件标记为已读(_S)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -16822,16 +16519,16 @@ msgstr "保存附件..."
 msgid "Save all attachments"
 msgstr "保存全部附件"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "选择保存基础名称"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME 类型"
 
-#: ../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:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "保存"
 
@@ -16941,7 +16638,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF 格式(.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "选择目的文件"
 
@@ -16989,19 +16686,19 @@ msgstr ""
 "\n"
 "请单击“下一步”按钮继续。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息："
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
 #, 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:235
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "正在导入数据。"
 
@@ -17087,39 +16784,35 @@ msgstr "侧边栏可见"
 msgid "Skip development warning dialog"
 msgstr "跳过开发警告对话框"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "以脱机模式启动"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "状态栏可见"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "Evolution 的配置版本，带主/次/配置级别(如“2.6.0”)。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "主窗口的默认高度，以像素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "主窗口的默认宽度，以像素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "侧边栏的默认宽度，以像素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr "上次升级的 Evolution 配置版本，带主/次/配置级别(如“2.6.0”)。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17128,44 +16821,40 @@ msgstr ""
 "窗口按钮的样式。可以是文字、图标、二者、工具栏。如果设置为工具栏，则工具栏的"
 "样式由 GNOME 设置决定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "工具栏可见"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "是否以脱机模式而非联机模式启动 Evolution。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "窗口是否应为最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "侧边栏是否可见。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "状态栏是否可见。"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "工具栏是否可见。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否跳过 Evoltuion 开发版本的警告。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "窗口按钮是否可见。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "窗口按钮样式"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "窗口按钮可见"
 
@@ -17186,11 +16875,11 @@ msgstr "单击确定关闭这些连接，并转入脱机操作"
 msgid "(Untitled)"
 msgstr "(无标题)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "选择要运行的导入器类型："
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17202,11 +16891,11 @@ msgstr ""
 "\n"
 "如果您不清楚，可以选择“自动”，Evolution 将尝试为您确定类型。"
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "选择此导入的目的位置"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17217,23 +16906,23 @@ msgstr ""
 "iCalendar。并未发现可导入的设置。如果您想要再试一次，请单击\n"
 "“上一步”按钮。\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "文件名(_I)："
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "选择一个文件"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "文件类型(_T)："
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "从旧版程序中导入数据和设置(_O)"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "导入单个文件(_S)"
 
@@ -17291,7 +16980,7 @@ msgstr ""
 msgid "_Work Online"
 msgstr "联机工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "脱机工作(_W)"
 
@@ -17316,40 +17005,35 @@ msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
 msgid "Switch to %s"
 msgstr "切换到 %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "未知的系统错误。"
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, 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:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "确定"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "无效参数"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 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:685
 msgid "New"
 msgstr "新建"
 
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
-msgstr " 新建 "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "新建测试"
@@ -17400,7 +17084,7 @@ msgstr ""
 "本助手将全程指导您将外部文件导入 Evolution。"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17432,7 +17116,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17440,39 +17124,35 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "不要再通知我"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "启动 Evolution 并激活指定组件"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "以联机模式启动"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "强制关闭所有 Evolution 组件"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "强制从 Evolution 1.4 重新升迁"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "禁止装入任何插件。"
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolution 个人信息管理和邮件客户"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17887,7 +17567,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:664
 msgid "Certificate already exists"
 msgstr "证书已经存在"
 
@@ -18119,12 +17799,6 @@ 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-tasks.xml.h:2
-msgid "Copy"
-msgstr "复制"
-
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "把选中的联系人复制到其它文件夹..."
@@ -18221,12 +17895,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:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "全选"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "全选(_A)"
@@ -18296,7 +17970,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:46
 msgid "_New"
 msgstr "新建(_N)"
 
@@ -18357,7 +18031,6 @@ msgid "Month"
 msgstr "月"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "下一项"
 
@@ -18366,7 +18039,7 @@ msgid "Previews the calendar to be printed"
 msgstr "预览将要打印的日历"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "上一项"
 
@@ -18454,11 +18127,11 @@ msgstr "将选中文字剪切到剪贴板"
 msgid "Paste from clipboard"
 msgstr "从剪贴板粘贴"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "从剪贴板中粘贴文字"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "选中所有文字"
 
@@ -18493,31 +18166,30 @@ msgstr "单击此处可查看可用的帮助"
 msgid "Close"
 msgstr "关闭"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "插入(_N)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "帮助(_H)"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "插入(_I)"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "选项(_O)"
@@ -18615,11 +18287,6 @@ msgstr "切换是否将时间显示为忙"
 msgid "_Alarms"
 msgstr "提醒(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "类别(_C)"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18685,73 +18352,53 @@ msgid "F_older"
 msgstr "文件夹(_O)"
 
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr "信件预览(_P)"
+
+#: ../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
-msgid "Show Message _Preview"
-msgstr "显示信件预览(_P)"
-
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Show message preview below the message list"
-msgstr "在信件列表下方显示信件预览"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview side-by-side with the message list"
-msgstr "在信件列表旁显示信件预览"
-
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "显示信件预览窗口"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅或取消订阅远程服务器上的文件夹"
 
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "_Classic View"
-msgstr "分类视图(_C)"
-
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "文件夹复制到(_C)..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
 msgstr "邮件过滤(_M)"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "文件夹移至(_M)..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
 msgstr "新建(_N)..."
 
-#: ../ui/evolution-mail-global.xml.h:23
-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:23
 msgid "_Subscriptions"
 msgstr "订阅(_S)"
 
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Vertical View"
-msgstr "垂直视图(_V)"
-
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "更改此文件夹的名称"
@@ -19309,10 +18956,6 @@ msgid "_Unread"
 msgstr "未读(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "缩放(_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
@@ -19320,7 +18963,7 @@ msgstr "放大(_Z)"
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "主工具栏"
 
@@ -19395,6 +19038,11 @@ msgstr "当您的信件被阅读时得到投递通知"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "插入(_N)"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "打开文件"
@@ -19723,51 +19371,43 @@ msgstr "图标和文字(_A)"
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
-#: ../ui/evolution.xml.h:16
-msgid "La_yout"
-msgstr "布局(_Y)"
-
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "首选项(_N)"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "发送/接收"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "发送/接收(_R)"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "发送队列中的的邮件并收取新邮件"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "配置 Pilot"
 
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "显示关于 Evolution 的信息"
+
 #: ../ui/evolution.xml.h:24
-msgid "Show Side _Bar"
-msgstr "显示侧边栏(_B)"
+msgid "Side _Bar"
+msgstr "侧边栏(_B)"
 
 #: ../ui/evolution.xml.h:25
-msgid "Show _Status Bar"
-msgstr "显示状态栏(_S)"
+msgid "Status _Bar"
+msgstr "状态栏(_B)"
 
 #: ../ui/evolution.xml.h:26
-msgid "Show _Toolbar"
-msgstr "显示工具栏(_T)"
-
-#: ../ui/evolution.xml.h:27
-msgid "Show information about Evolution"
-msgstr "显示关于 Evolution 的信息"
-
-#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
@@ -19775,71 +19415,75 @@ msgstr "提交错误报告"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "切换是否脱机工作。"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "工具栏(_B)"
+
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "工具栏样式(_B)"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
 msgstr "查看/隐藏侧边栏"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "查看/隐藏状态栏"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "丢弃密码(_F)"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "隐藏按钮(_H)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "只有图标(_I)"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "切换器外观(_S)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "同步选项(_S)..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "只有文字(_T)"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "窗口(_W)"
 
@@ -19876,34 +19520,26 @@ msgid "_Work Week View"
 msgstr "周工作视图(_W)"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "对宽屏视图显示已发文件夹(_D)"
-
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "作为已发文件夹(_S)"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "按状态(_T)"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "按发件人(_N)"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "按主题(_B)"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "按跟随标志(_F)"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "对宽屏视图(_W)"
-
-#: ../views/mail/galview.xml.h:8
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "信件(_M)"
 
@@ -19919,32 +19555,28 @@ 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:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>时区</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>选择(_S)</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "选择一个时区"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "时区组合框"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19979,7 +19611,7 @@ msgid "_Edit..."
 msgstr "编辑(_E)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -19993,11 +19625,11 @@ msgstr "实例"
 msgid "Save Current View"
 msgstr "保存当前视图"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
 msgstr "创建新视图(_C)"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
 msgstr "替换现有视图(_R)"
 
@@ -20032,31 +19664,26 @@ msgstr "工厂"
 msgid "Define New View"
 msgstr "定义新视图"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
 msgstr "新视图的名称："
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
 msgstr "视图类型"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
 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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "一二三四五六日"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%Y年%B"
 
@@ -20066,8 +19693,8 @@ 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/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "填充颜色"
 
@@ -20076,16 +19703,16 @@ msgstr "填充颜色"
 #: ../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
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "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/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "点绘填充"
 
@@ -20124,11 +19751,11 @@ msgid "Minimum Width"
 msgstr "最小宽度"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "间距"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "现在"
 
@@ -20256,129 +19883,105 @@ msgstr "选择时间的组合框"
 msgid "Time"
 msgstr "时间"
 
-#: ../widgets/misc/e-dateedit.c:461
-msgid "No_w"
-msgstr "现在(_W)"
-
-#: ../widgets/misc/e-dateedit.c:467
-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
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%p%I:%M"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "已展开"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "是否展开扩展器"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "扩展器标签的文本"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "使用下划线"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "如果设置了此选项，将会在表明加速键的字符下面加下划线"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "标签及其子空间中间的间距"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "标签部件"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "在通常扩展器标签的位置显示的部件"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "扩展器大小"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "扩展器箭头的大小"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "标识器间距"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "扩展器箭头旁边的间距"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:163
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
-msgid "Save Search"
-msgstr "保存搜索"
-
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "搜索(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "搜索"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr "保存搜索"
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "保存搜索(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 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:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "高级搜索(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "全部账户"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "当前账户"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "当前文件夹"
-
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "当前信件"
-
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 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."
@@ -20410,45 +20013,45 @@ msgstr "回流模型"
 msgid "Column width"
 msgstr "列宽"
 
-#: ../widgets/misc/e-search-bar.c:527
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "搜索"
+
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr "搜索类型"
+
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "项目 ID"
 
-#: ../widgets/misc/e-search-bar.c:792 ../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:897
+msgid "Subitem ID"
+msgstr "子项目 ID"
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "文字"
 
-#. 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:911
-msgid "Show: "
-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:927
-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:939
-msgid " i_n "
-msgstr " 于(_N) "
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "立即查找(_N)"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20497,8 +20100,8 @@ msgid "A_uto-delete sent item"
 msgstr "自动删除已发项目(_U)"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "分类"
+msgid "C_lassification"
+msgstr "分类(_L)"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -20522,23 +20125,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Normal\n"
-"Proprietary\n"
+"Public\n"
+"Private\n"
 "Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
 msgstr ""
+"公开\n"
+"私人\n"
+"机密\n"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "请求回复(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr "状态跟踪(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -20550,51 +20153,51 @@ msgstr ""
 "标准\n"
 "低"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
 msgstr "接受时(_P)："
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "完成时(_M)："
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "拒绝时(_N)："
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "Wi_thin"
 msgstr "少于(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "之后(_A)："
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "全部信息(_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "推迟信件投递(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "已投递(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Set expiration date"
 msgstr "设置过期时间(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "直到(_U)："
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "方便时(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_When opened:"
 msgstr "打开时(_W)："
 
@@ -20612,19 +20215,19 @@ msgstr "%s (%d%% 完成)"
 msgid "Click here to go to URL"
 msgstr "单击此处转到 URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
 msgstr "编辑主类别列表..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
 msgstr "属于这些类别的项目(_C)："
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
 msgstr "可用类别(_A)："
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
 msgstr "类别"
 
@@ -20634,7 +20237,7 @@ msgstr "弹出列表"
 
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
-msgstr "%p%l:%M"
+msgstr "%H:%M"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Selected Column"
@@ -20648,23 +20251,23 @@ msgstr "聚焦列"
 msgid "Unselected Column"
 msgstr "未选列"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "给列加删除线"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "给列加下划线"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "给列加粗"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "给列着色"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "给列着背景色"
 
@@ -20679,7 +20282,6 @@ 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
 msgid "Ascending"
 msgstr "升序"
 
@@ -20690,7 +20292,6 @@ 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 "Descending"
 msgstr "降序"
 
@@ -20788,14 +20389,14 @@ msgstr "按顺序显示这些域(_S)："
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "拖放代码"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "完整标题"
 
@@ -20813,17 +20414,25 @@ 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:346
 #, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s：%s (%d 项)"
+msgstr "%s：%s (%d 项)"
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s：%s (%d 项)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d 项)"
+msgstr "%s (%d 项)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d 项)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -20903,69 +20512,65 @@ msgstr "统一行高"
 msgid "Frozen"
 msgstr "冻结"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "自定义当前视图"
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "升序排序"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "降序排序"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "未排序"
 
-#: ../widgets/table/e-table-header-item.c:1495
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "按该域分组"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "按方框分组"
 
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "删除该列"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "添加一列..."
 
-#: ../widgets/table/e-table-header-item.c:1501
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "对齐"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "最佳匹配"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "格式化列..."
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "自定义当前视图..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
-msgstr "排序方式"
-
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "字体集"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "排序信息"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21017,7 +20622,7 @@ msgid "This should test the minicard canvas item"
 msgstr "这应该测试迷你卡画布项"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "事件处理器"
 
@@ -21030,57 +20635,57 @@ 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
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "两端对齐"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "使用椭圆"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "椭圆"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "换行"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "换行字符"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "最多行数"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "允许新行"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "绘制边框"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "绘制背景"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "绘制按钮"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "光标位置"
 
@@ -21088,58 +20693,58 @@ msgstr "光标位置"
 msgid "Emulate label resize"
 msgstr "模拟标签缩放"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "输入法"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "粗体"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "删除线"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "锚点"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "裁剪宽度"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "裁剪高度"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "裁剪"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "填充裁剪矩形"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "水平偏移"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "垂直偏移"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "文字宽度"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "输入法环境"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "处理弹出"
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 790f20324a..e5a19c8017 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -6,40 +6,13 @@
 	* e-shell-window.c: (impl_dispose): Fix warnings at build-time, and
 	clean up the connections to the D-Bus on exit (Closes: #332387)
 
-2006-07-13  Srinivasa Ragavan  <sragavan@novell.com>
+2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
 
-	** Fix for bug #345331
+	** Fix for bug #341334
 	
-	* e-user-creatable-items-handler.c: (set_combo_button_style): Default
-	to both style.
-
-2006-07-12  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #347182
-	* e-user-creatable-items-handlers.c:
-	(set_combo_button_style): New function.
-	(new_button_change): Call set_combo_button_style.
-	(setup_toolbar_button): Call set_combo_button_style.
-
-2006-07-07  Li Yuan  <li.yuan@sun.com>
-
-	* e-shell-window.c: (setup_widgets):
-	Fix for #346613.
-	Fix the problem pointed out by Johnny <jjohnny@novell.com>.
-	When maximize Evolution, close and start Evolution sometimes,
-	the sidebar grows towards right. Set the view_notebook can be expanded
-	when the paned widget is resized.
-
-2006-07-05  Li Yuan  <li.yuan@sun.com>
-
-	* e-shell-window.c: (setup_widgets):
-	Fix for #346613.
-	Make the view_notebook cannot be resized shorter than its need.
-
-2006-06-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-user-creatable-items-handler.c: (setup_toolbar_button): Fixed a
-	minor packing issue in New button.
+	* e-component-registry.c: (e_component_registry_peek_info): Check for
+	the presence of the fields before comparing. Exchange component wont
+	have these alias/etc.
 
 2006-06-17  Tor Lillqvist  <tml@novell.com>
 
@@ -51,76 +24,28 @@
 	bonobo_activation_active_server_unregister() here, when the EShell
 	Bonobo object is still fully active.
 
-2006-06-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #252814
-	
-	* e-user-creatable-items-handler.c: (new_button_change),
-	(setup_toolbar_button), (e_user_creatable_items_handler_activate):
-	Read the toolbar setting and set the combo button. Patch from Oswald.
-
-2006-06-17  Andre Klapper  <a9016009@gmx.de>
-
-	* main.c: update last stable version number from 2.6.1 to 2.6.2
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #341334
-	
-	* e-component-registry.c: (e_component_registry_peek_info): Check for
-	the presence of the fields before comparing. Exchange component wont
-	have these alias/etc.
-
-2006-05-15  Li Yuan <li.yuan@sun.com>
+2006-06-09  Li Yuan <li.yuan@sun.com>
 
 	Fixes #341525
 
 	* e-sidebar.c: (button_toggled_callback):
 	If the button has been selected, it is no need to emit the signal.
 
-2006-04-30  Nancy Cai <nancy.cai@sun.com>
-
-	Fixes #323853
-
-	* e-shell-importer.c: (filename_changed), (item_selected),
-	(importer_file_page_new), (prepare_file_page):
-	replacing GnomeFileEntry by GtkFileButton, which can import task files
-	with none UTF-8 filenames.
-
-2006-04-27  Andre Klapper  <a9016009@gmx.de>
-
-	* main.c: update last stable version number from 2.4.2.1 to 2.6.1
-
-2006-04-24  Harish Krishnaswamy  <kharish@novell.com>
-
-	* main.c: (kill_dataserver): add eds-1.4 and eds-1.6
-	to the list of old instances.
-
-2006-04-24  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-shell-window-commands.c: Update credits for
-	the previous development series.
-
-2006-04-06  Alejandro Andres <fuzzy.alej@gmail.com>
-
-	* e-shell-view.c
-	* e-shell-window.c
-
-	Fixes #337258. Now Evolution is shown at the end of the title bar.
-
-2006-04-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #329731
-
-	* apps_evolution_shell.schemas.in.in: Added schema to maintain the
-	visibility of status bar.
-
 2006-04-18  Jeffrey Stedfast  <fejj@novell.com>
 
 	* e-shell-nm.c (e_shell_network_monitor): Intercept the
 	Disconnected signal and setup a timeout to try and reconnect when
 	the dbus daemon comes back up.
 
+2006-03-13  Harish Krishnaswamy  <kharish@novell.com>
+
+	* main.c (kill_dataserver): add evolution-data-server-1.4
+	to the list of old dataserver instances.
+
+2006-03-13  Harish Krishnaswamy  <kharish@novell.com>
+
+	* e-shell-window-commands.c: Update credits.
+
 2006-02-21  Tor Lillqvist  <tml@novell.com>
 
 	* main.c (main): On Win32, finally call link_shutdown() (from
@@ -197,9 +122,10 @@
 
 2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
 
-	* e-shell-nm-glib.c (e_shell_nm_glib_initialise): Remove
-	suspicious and possibly redundant register/unregister calls. Fixes
-	#325364 (critical warning crasher).
+	* e-shell-nm-glib.c: (e_shell_nm_glib_initialise):
+	Remove suspicious and possibly redundant 
+	register/unregister calls. Fixes #325364 (critical
+	warning crasher).
 
 2005-12-30  Andre Klapper <a9016009@gmx.de>
 
@@ -226,6 +152,7 @@
 	* shell.error.xml: fixed two dead links to "support.ximian.com" now to
 	the (yet to come) FAQ at go-evolution.org. (#315866)
 
+
 2005-12-22  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	* Evolution-Component.idl
@@ -269,44 +196,44 @@
 	e_shell_go_online.
 	
 2005-12-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-view.c (impl_ShellView_setTitle): take a component id
-	argument.
-
-	* e-shell-window.c (component_view_free): release the corba object
-	properly.
-	(e_shell_window_set_title): new helper to set the title for the
-	component.
-	(switch_view): use the component specific title if available or
-	fallback to the component name.
-
+ 
+ 	* e-shell-view.c (impl_ShellView_setTitle): take a component id
+ 	argument.
+ 
+ 	* e-shell-window.c (component_view_free): release the corba object
+ 	properly.
+ 	(e_shell_window_set_title): new helper to set the title for the
+ 	component.
+ 	(switch_view): use the component specific title if available or
+ 	fallback to the component name.
+ 
 2004-12-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #60354.
-
-	* Evolution-Component.idl: createControls -> createView and
-	ComponentView to keep track of things.
-
-	* Evolution-Shell.idl: return a new type ShellView from
-	createNewWindow so other parts of the system can access it later.
-	ShellView so far just lets you set title or switch component, but
-	could be subclassed later.
-
-	* e-shell.c (impl_Shell_createNewWindow): return a shell view.
-
-	* e-shell-window.c (init_view): create the view from the compnent
-	first, then get the controls from it separately.
-	(init): setup the e-shell-view object for the create view
-	thing.
-
-	* e-shell-view.c (e_shell_view_new): simple bonobo object for
-	Evolution_ShellView, keep track of the EShellWindow.
-
-	* e-component-view.[ch]: simple bonobo object for
-	Evolution_ComponentView.  Just keep track of the controls.
+ 
+ 	** See bug #60354.
+ 
+ 	* Evolution-Component.idl: createControls -> createView and
+ 	ComponentView to keep track of things.
+ 
+ 	* Evolution-Shell.idl: return a new type ShellView from
+ 	createNewWindow so other parts of the system can access it later.
+ 	ShellView so far just lets you set title or switch component, but
+ 	could be subclassed later.
+ 
+ 	* e-shell.c (impl_Shell_createNewWindow): return a shell view.
+ 
+ 	* e-shell-window.c (init_view): create the view from the compnent
+ 	first, then get the controls from it separately.
+ 	(init): setup the e-shell-view object for the create view
+ 	thing.
+ 
+ 	* e-shell-view.c (e_shell_view_new): simple bonobo object for
+ 	Evolution_ShellView, keep track of the EShellWindow.
+ 
+ 	* e-component-view.[ch]: simple bonobo object for
+ 	Evolution_ComponentView.  Just keep track of the controls.
 
 	Committed on behalf of NotZed - partha
-
+ 
 2005-12-17  Tor Lillqvist  <tml@novell.com>
 
 	* e-config-upgrade.c: Use libedataserver's e_xml_parse_file()
@@ -354,16 +281,16 @@
 
 	solves bug # 307780
 
-	* e-shell-window.h: added the prototype for the function
+	* e-shell-window.h : added the prototype for the function
 	e_shell_window_peek_statusbar(..);
-
-	* e-shell-window.c: show/hide the status bar widget based on the saved
+	
+	* e-shell-window.c : show/hide the status bar widget based on the saved
 	property.
 	retreive the status bar's previous status and set in UI.
 	define the function e_shell_window_peek_statusbar() which retrieves
 	the status bar widget for e-shell-window-commands.c
-
-	* e-shell-window-commands.c: view_statusbar_item_toggled_handler()
+	
+	* e-shell-window-commands.c : view_statusbar_item_toggled_handler()
 	is the component listener for the "View Status Bar" menu item.it 
 	handles the click event in the menu item "View status Bar".The
 	state of the status bar is also saved every time an event occurs
diff --git a/shell/apps_evolution_shell.schemas.in.in b/shell/apps_evolution_shell.schemas.in.in
index 1a0ea854f3..5e2ce825cf 100644
--- a/shell/apps_evolution_shell.schemas.in.in
+++ b/shell/apps_evolution_shell.schemas.in.in
@@ -165,19 +165,7 @@
         <long>Whether the sidebar should be visible.</long>
       </locale>
     </schema>
-    
-     <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/statusbar_visible</key>
-      <applyto>/apps/evolution/shell/view_defaults/statusbar_visible</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Statusbar is visible</short>
-        <long>Whether the status bar should be visible.</long>
-      </locale>
-    </schema>
-    
+
     <schema>
       <key>/schemas/apps/evolution/shell/view_defaults/component_id</key>
       <applyto>/apps/evolution/shell/view_defaults/component_id</applyto>
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index e5fc700ab0..d5c3a6ee5d 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -327,7 +327,7 @@ switch_view (EShellWindow *window, ComponentView *component_view)
 	}
 
 	if (component_view->title == NULL) {
-		title = g_strdup_printf ("%s - Evolution", info->button_label);
+		title = g_strdup_printf ("Evolution - %s", info->button_label);
 		gtk_window_set_title (GTK_WINDOW (window), title);
 		g_free (title);
 	} else
@@ -670,7 +670,7 @@ setup_widgets (EShellWindow *window)
 	priv->view_notebook = gtk_notebook_new ();
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->view_notebook), FALSE);
 	gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->view_notebook), FALSE);
-	gtk_paned_pack2 (GTK_PANED (priv->paned), priv->view_notebook, TRUE, FALSE);
+	gtk_paned_pack2 (GTK_PANED (priv->paned), priv->view_notebook, TRUE, TRUE);
 	gtk_widget_show (priv->view_notebook);
 
 	gtk_paned_set_position (GTK_PANED (priv->paned),
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index 32c25d748e..6c3499c98f 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -136,7 +136,7 @@ button_toggled_callback (GtkToggleButton *toggle_button,
 			 ESidebar *sidebar)
 {
 	int id = 0;
-	gboolean is_active = FALSE;
+	gboolean is_actived = FALSE;
 	GSList *p;
 
 	if (sidebar->priv->in_toggle)
@@ -145,7 +145,7 @@ button_toggled_callback (GtkToggleButton *toggle_button,
 	sidebar->priv->in_toggle = TRUE;
 
 	if (gtk_toggle_button_get_active (toggle_button))
-		is_active = TRUE;
+		is_actived = TRUE;
 
 	for (p = sidebar->priv->buttons; p != NULL; p = p->next) {
 		Button *button = p->data;
@@ -160,7 +160,7 @@ button_toggled_callback (GtkToggleButton *toggle_button,
 
 	sidebar->priv->in_toggle = FALSE;
 
-	if (is_active)
+	if (is_actived)
 		g_signal_emit (sidebar, signals[BUTTON_SELECTED], 0, id);
 }
 
diff --git a/shell/main.c b/shell/main.c
index ee86b45e58..6e22b85fd0 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -103,7 +103,6 @@ static gint idle_cb (void *data);
 
 static char *default_component_id = NULL;
 static char *evolution_debug_log = NULL;
-static gchar **remaining_args;
 
 static void
 no_windows_left_cb (EShell *shell, gpointer data)
@@ -131,7 +130,6 @@ kill_dataserver (void)
 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.0 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.2 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.4 2> /dev/null");
-	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.6 2> /dev/null");
 
 	system (KILL_PROCESS_CMD " -9 lt-evolution-alarm-notify 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null");
@@ -245,7 +243,7 @@ show_development_warning(void)
                   "\n"
 		  "We hope that you enjoy the results of our hard work, and we\n"
 		  "eagerly await your contributions!\n"),
-		"2.6.2");
+		"2.4.2.1");
 	label = gtk_label_new (text);
 	g_free(text);
 
@@ -463,45 +461,44 @@ setup_segv_redirect (void)
 #define setup_segv_redirect() 0
 #endif
 
-static const GOptionEntry options[] = {
-	{ "component", 'c', 0, G_OPTION_ARG_STRING, &default_component_id,
-	  N_("Start Evolution activating the specified component"), NULL },
-	{ "offline", '\0', 0, G_OPTION_ARG_NONE, &start_offline,
-	  N_("Start in offline mode"), NULL },
-	{ "online", '\0', 0, G_OPTION_ARG_NONE, &start_online,
-	  N_("Start in online mode"), NULL },
-#ifdef KILL_PROCESS_CMD
-	{ "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &killev, 
-	  N_("Forcibly shut down all Evolution components"), NULL },
-#endif
-#if DEVELOPMENT
-	{ "force-migrate", '\0', 0, G_OPTION_ARG_NONE, &force_migrate, 
-	  N_("Forcibly re-migrate from Evolution 1.4"), NULL },
-#endif
-	{ "debug", '\0', 0, G_OPTION_ARG_STRING, &evolution_debug_log, 
-	  N_("Send the debugging output of all components to a file."), NULL },
-	{ "disable-eplugin", '\0', 0, G_OPTION_ARG_NONE, &disable_eplugin, 
-	  N_("Disable loading of any plugins."), NULL },
-	{ "setup-only", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,
-	  &setup_only, NULL, NULL },
-	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &remaining_args, NULL, NULL },
-	{ NULL }
-};
-
 int
 main (int argc, char **argv)
 {
 #ifdef G_OS_WIN32
 	extern void link_shutdown (void);
 #endif
-
+	struct poptOption options[] = {
+		{ "component", 'c', POPT_ARG_STRING, &default_component_id, 0,
+		  N_("Start Evolution activating the specified component"), NULL },
+		{ "offline", '\0', POPT_ARG_NONE, &start_offline, 0, 
+		  N_("Start in offline mode"), NULL },
+		{ "online", '\0', POPT_ARG_NONE, &start_online, 0, 
+		  N_("Start in online mode"), NULL },
+#ifdef KILL_PROCESS_CMD
+		{ "force-shutdown", '\0', POPT_ARG_NONE, &killev, 0, 
+		  N_("Forcibly shut down all Evolution components"), NULL },
+#endif
+#if DEVELOPMENT
+		{ "force-migrate", '\0', POPT_ARG_NONE, &force_migrate, 0, 
+		  N_("Forcibly re-migrate from Evolution 1.4"), NULL },
+#endif
+		{ "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, 
+		  N_("Send the debugging output of all components to a file."), NULL },
+		{ "disable-eplugin", '\0', POPT_ARG_NONE, &disable_eplugin, 0, 
+		  N_("Disable loading of any plugins."), NULL },
+		{ "setup-only", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN,
+		  &setup_only, 0, NULL, NULL },
+		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
+	};
 #if DEVELOPMENT
 	GConfClient *client;
 	gboolean skip_warning_dialog;
 #endif
 	GSList *uri_list;
+	GValue popt_context_value = { 0, };
 	GnomeProgram *program;
-	GOptionContext *context;
+	poptContext popt_context;
+	const char **args;
 	GList *icon_list;
 	char *filename;
 
@@ -512,13 +509,9 @@ main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	context = g_option_context_new (_("- The Evolution PIM and Email Client"));
-
-	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
-
 	program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
-				      GNOME_PARAM_GOPTION_CONTEXT, context,
+				      GNOME_PARAM_POPT_TABLE, options,
 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),
 				      NULL);
 
@@ -578,14 +571,18 @@ main (int argc, char **argv)
 
 	uri_list = NULL;
 
-	if (remaining_args != NULL) {
+	g_value_init (&popt_context_value, G_TYPE_POINTER);
+	g_object_get_property (G_OBJECT (program), GNOME_PARAM_POPT_CONTEXT, &popt_context_value);
+	popt_context = g_value_get_pointer (&popt_context_value);
+	args = poptGetArgs (popt_context);
+	if (args != NULL) {
 		const char **p;
 
-		for (p = (const char**)remaining_args; *p != NULL; p++)
+		for (p = args; *p != NULL; p++)
 			uri_list = g_slist_prepend (uri_list, (char *) *p);
 	}
 	uri_list = g_slist_reverse (uri_list);
-	
+	g_value_unset (&popt_context_value);
 
 	gnome_sound_init ("localhost");
 
diff --git a/smime/ChangeLog b/smime/ChangeLog
index d02f320b5c..697618b86c 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,11 +1,18 @@
 2006-06-27  Veerapuram Varadhan  <vvaradhan@novell.com>
 
 	** Fixes #334848
+
+        * lib/e-pkcs12.c (prompt_for_password):
+        * gui/component.c (smime_pk11_passwd), (smime_pk11_change_passwd):
+        Do not pass NULL for the domain parameter of
+        e_passwords_ask_password.
+	
+2006-06-20  Arvind_evo  <sa.phoenix@gmail.com>
 	
-	* lib/e-pkcs12.c (prompt_for_password): 
-	* gui/component.c (smime_pk11_passwd), (smime_pk11_change_passwd): 
-	Do not pass NULL for the domain parameter of
-	e_passwords_ask_password.
+	** Fix for bug #268592
+
+	* gui/certificate-manager.c : hidden the backup and backupall button till 
+	a functionality has been developed in the future.
 	
 2006-06-15  Tor Lillqvist  <tml@novell.com>
 
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 6ae1b7f4e2..21a7fcb300 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -1016,5 +1016,9 @@ certificate_manager_config_control_new (void)
 	gtk_widget_set_sensitive(cfm_data->backup_your_button, FALSE);
 	gtk_widget_set_sensitive(cfm_data->backup_all_your_button, FALSE);
 
+	//hide the widgets till a functionality is developed in the future....
+	gtk_widget_hide_all(cfm_data->backup_your_button);
+	gtk_widget_hide_all(cfm_data->backup_all_your_button);
+	
 	return evolution_config_control_new (control_widget);
 }
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 92ffe53e03..acd5d887d8 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,23 +1,3 @@
-2006-07-14  Arvind <sa.phoenix@gmail.com>
-
-	** Fix for bug #209254
-	
-	* evolution-message-composer.xml: Added a HELP menu.
-
-2006-07-08  Andreas Köhler  <andi5.py@gmx.net>
-
-	* evolution-message-composer.xml: adding a seperator between
-	"save" and "save draft" button. Fixes bug #318462.
-	(Committed by Andre Klapper)
-
-2006-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* evolution-mail-global.xml: Added menu item for wide view.
-	* evolution-mail-list.xml: Adjusted the separator for threads
-	* evolution-mail-message.xml: Combined the zoom option to a submenu.
-	* evolution.xml: Combined the side bar/toolbar/status bar to a submenu
-	to avoid the large growing View menu.
-
 2006-04-27  Rodney Dawes  <dobey@novell.com>
 
 	* evolution-mail-global.xml: Don't set gtk-delete as the stock icon
@@ -28,21 +8,6 @@
 	Don't set an icon for MessageUndelete
 
 	Fixes #339626
-	
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Committing patch from PR Suman for adding missing icons to menus.
-
-	* evolution-addressbook.xml:
-	* evolution-event-editor.xml:
-	* evolution-mail-message.xml:
-	* evolution-message-composer.xml:
-	* evolution-tasks.xml:
-
-2006-02-26  Rakesh k.g <rakeysh_kg@yahoo.com>
-
-	* evolution-editor.xml: Insert menu changed its mnemonic.
-	Fixes bug #331975.
 
 2006-02-13  Karsten Bräckelmann  <guenther@rudersport.de>
 
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index fd1d514167..9626907c47 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -35,12 +35,6 @@
      accel="*Control*m"
      type="toggle"/>
 
-    <cmd name="ViewBelow" _label="_Classic View" 
-      type="radio" group="preview_display" _tip="Show message preview below the message list"/>
-
-    <cmd name="ViewAfter" _label="_Vertical View" 
-     type="radio" group="preview_display" _tip="Show message preview side-by-side with the message list"/>
-
   </commands>
 
   <keybindings>
@@ -56,14 +50,10 @@
     </submenu>
 
     <submenu name="View" _label="_View">
-      <placeholder name="ViewPreview">	    
-      <submenu name="Preview" _label="_Preview">	    
-        <menuitem name="ViewPreview" verb="" _label="Show Message _Preview"/>
-	<separator name="previewsep"/>
-	<menuitem name="ViewBelow" id="ViewBelow" _label="_Classic View"/>
-	<menuitem name="ViewAfter" id="ViewAfter" _label="_Vertical View"/>
-      </submenu>
+      <placeholder name="ViewPreview">
+        <menuitem name="ViewPreview" verb="" _label="Message _Preview"/>
       </placeholder>
+
       <separator f="" name="emailglobal"/>
       <placeholder name="MailMessageFilter"/>
       <placeholder name="MailMessageView"/>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 0bc0867aea..0ee5332278 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -286,7 +286,7 @@
 
     <submenu name="View">
        <placeholder name="MailMessageZoom">
-          <submenu name="zoom" _label="_Zoom">
+	  <separator f="" name="emaillist"/>
  	  <menuitem name="TextZoomIn" verb="" _label="_Zoom In"
 		    pixtype="stock" pixname="gtk-zoom-in"/>
  	  <menuitem name="TextZoomOut" verb="" _label="Zoom _Out"
@@ -294,7 +294,7 @@
 
  	  <menuitem name="TextZoomReset" verb="" _label="_Normal Size"
 		    pixtype="stock" pixname="gtk-zoom-100"/>
-	  </submenu>
+
        </placeholder>
 
        <placeholder name="MailViewType">
@@ -318,7 +318,7 @@
         </placeholder>
 
         <placeholder name="MessageNavigation">
-          <submenu name="GoTo" _label="_Go To" pixtype="stock" pixname="gtk-jump-to">
+          <submenu name="GoTo" _label="_Go To">
             <menuitem name="MailNext" verb="" _label="_Next Message"/>
             <menuitem name="MailNextUnread" verb="" _label="Next _Unread Message"/>
             <menuitem name="MailNextFlagged" verb="" _label="Next _Important Message"/>
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 0b349a6114..4244e273d7 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,121 +1,9 @@
-2006-07-21  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes 342313.
-	* text/e-text.c: Use GTK_CHECK_VERSION instead of GTK_2_2.
-
-2006-07-05  Rajeev ramanathan <rajeevramanathan_2004@yaoo.co.in>
-
-	* text/e-text.[ch]: Added code to render EText text 
-	items with antialiasing, hinting and sub-pixel ordering with cairo.
-	
-2006-07-18  Andre Klapper  <a9016009@gmx.de>
-
-	* e-timezone-dialog/e-timezone-dialog.glade: 
-	* menus/gal-view-instance-save-as-dialog.glade: 
-	* menus/gal-view-new-dialog.glade: 
-	remove "*" from translation. Fixes bug #331147.
-
-2006-07-13  Andre Klapper  <a9016009@gmx.de>
-
-	* menus/gal-view-instance-save-as-dialog.glade: 
-	remove empty strings from translation
-
-2006-07-12  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #347182.
-	* misc/e-combo-button.c: (e_combo_button_set_label):
-	Removed needless g_return_if_fail().
-
-2006-07-10  Harish Krishnaswamy  <kharish@novell.com>
-
-	* table/e-cell-text.c: (ect_unrealize), (build_layout):
-	* text/e-text.c: (reset_layout): Revert the previous
-	patch. Requires rework.
-
-2006-07-05  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-	* text/e-text.c, table/e-cell-text.c:
-		Added code to render ECell and EText text items with 
-	antialiasing, hinting and sub-pixel ordering with cairo.
-
 2006-07-06  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes bug #341354.
 	* text/e-text.c: (e_text_preedit_changed_cb):
 	Plugged memory leak.
 
-2006-06-30  Johnny Jacob  <jjohnny@novell.com>
-	* misc/Makefile.am: Added e-icon-entry.c, e-icon-entry.h
-	* misc/e-filter-bar.c: (rule_advanced_response),
-	(save_search_dialog), (menubar_activated), (option_changed),
-	(dup_item_no_subitems), (build_items), (free_built_items),
-	(free_items), (set_menu), (get_property), (e_filter_bar_new):
-	* misc/e-filter-bar.h:
-	* misc/e-search-bar.c: (set_find_now_sensitive),
-	(clear_search), (emit_search_activated), (search_now_verb_cb),
-	(clear_verb_cb), (setup_standard_verbs), (search_verb_cb),
-	(get_selected_item_label), (entry_focus_in_cb),
-	(entry_focus_out_cb), (entry_activated_cb), (entry_changed_cb),
-	(viewitem_activated_cb), (scopeitem_activated_cb),
-	(option_activated_cb), (option_button_clicked_cb),
-	(clear_button_clicked_cb), (scopeoption_changed_cb), (set_menu),
-	(set_option), (impl_get_property), (impl_set_property),
-	(impl_dispose), (class_init), (init), (e_search_bar_construct),
-	(e_search_bar_set_viewoption_menufunc),
-	(e_search_bar_set_viewoption_menu),
-	(e_search_bar_get_selected_viewitem),
-	(e_search_bar_set_viewoption), (e_search_bar_set_scopeoption),
-	(e_search_bar_set_scopeoption_menu),
-	(e_search_bar_set_viewitem_id), (e_search_bar_set_item_id),
-	(e_search_bar_set_search_scope), (e_search_bar_get_item_id),
-	(e_search_bar_get_search_scope), (e_search_bar_get_viewitem_id),
-	(e_search_bar_set_ids), (e_search_bar_set_text),
-	(e_search_bar_get_text):
-	* misc/e-search-bar.h:
-	* table/e-tree-table-adapter.c:
-	(e_tree_table_adapter_save_expanded_state): Added code for search
-	ui.
-	* misc/e-icon-entry.c : Added.
-	* misc/e-icon-entry.h : Added.
-	
-2006-06-20  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c
-	(zone_display_name_with_offset): Fix compiler warning.
-
-2006-06-19  Tor Lillqvist  <tml@novell.com>
-
-	* e-timezone-dialog/e-timezone-dialog.c: Define gmtime_r() and
-	localtime_r() macros for Win32. Should not declare tzname,
-	timezone and daylight on Win32, they are declared properly in
-	<time.h> already.
-
-2006-06-14  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #204798 , #235691 , #229132
-	* e-timezone-dialog/e-timezone-dialog.c: 
-	(e_timezone_dialog_add_timezones), (get_local_offset),
-	(get_local_timezone), (format_utc_offset),
-	(zone_display_name_with_offset), (zone_display_name),
-	(on_map_motion), (e_timezone_dialog_set_timezone): Added code to set
-	the timezone as default to local timezone and show the time offset in
-	the map motion.
-
-2006-06-02  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added a new hbox cell renderer and a new Sort By menu to e-table to
-	sort by columns not shown in the table.
-
-	* table/Makefile.am:
-	* table/e-cell-text.c: (build_layout): Added support for font
-	rendering in cell
-	* table/e-cell-tree.c: (ect_event): Fixed a bug where the expander
-	animates in arbitary position.
-	* table/e-table-header-item.c: (ethi_popup_customize_view),
-	(sort_by_id), (popup_custom), (ethi_header_context_menu),
-	(ethi_event): Added a new Sort by menu, to the e-table headers, which
-	helps to easily sort by columns without adding that column.
-	* table/e-cell-hbox.[ch]: Added a new hbox renderer.
-
 2006-01-30  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* e-timezone-dialog/e-timezone-dialog.c: (get_zone_from_point):
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 2d1f04c25c..cc5891c6a8 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,76 +1,16 @@
-2006-07-28  Srinivasa Ragavan  <sragavan@novell.com>
+2006-07-22  Karsten Bräckelmann  <guenther@rudersport.de>
 
-	* e-calendar-item.c: Removed the hardcoded ENABLE_CAIRO for tag
-	calendar.
+	* e-attachment.c (e_attachment_new_remote_file): Fix handling of
+	remote files containing non-alphanumeric chars. Committed patch by
+	Srini. Fixes bug #342242.
 
-2006-07-22 Yuri Pankov <yuri.pankov@gmail.com>
-	
-	Reviewed by Harish Krishnaswamy <kharish@novell.com>
-	* e-icon-entry.c:  Add missing headers. Fixes #347689.
-
-2006-07-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-search-bar.c: (e_search_bar_construct):  Modified
-	the mnemonics for avoiding the conflict with attachment bar.
-
-2006-07-18  Andre Klapper  <a9016009@gmx.de>
-
-	* e-attachment.glade: 
-	* gal-categories.glade: 
-	remove "*" from translation. Fixes bug #331147.
-
-2006-07-17  Sankar P  <psankar@novell.com>
-
-	* Replaced classification with security in the send-options
-	so that the client ui looks consistent (GW)
-	* e-send-options.[c|h|glade]:
-	
-2006-07-11  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #347166
-	
-	* widgets/misc.e-search-bar.c: (set_option):
-	remove gtk_option_menu_set_history().
-
-2006-06-07 Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #341333
-	
-	* e-dateedit.c:	accelarator for 'now'('w') and 'today'('t') 
-	'None'('n')	
-	
 2006-07-11  Li Yuan <li.yuan@sun.com>
 
-	Fixes bug #345402
+	* Fixes bug #345402
 
 	* e-dateedit.c: (on_date_popup_key_press):
 	Grab the popup window when some key except ESC is pressed.
 
-2006-07-04  Andre Klapper  <a9016009@gmx.de>
-
-	* e-search-bar.c: fixing two typos, adding translator comments.
-
-2006-07-03  Harry Lu  <harry.lu@sun.com>
-
-	Fix compile error in solaris
-
-	* e-filter-bar.h: E_FILTERBAR_SEPARATOR should have 3 members.
-	* e-search-bar.h: add the declaration of e_search_bar_set_viewitem_id.
-
-2006-06-19  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #252814
-	Committing a patch from Oswald.
-
-	* e-combo-button.c: (e_combo_button_init),
-	(e_combo_button_pack_hbox), (e_combo_button_pack_vbox):
-	* e-combo-button.h: Adds new packing support for supporting toolbar
-	options.
-
-2006-06-19  Chpe <chpe@gnome.org>
-
-	* e-combo-button.c: (paint): Fix for bug #262210
-
 2006-06-09  Johnny Jacob  <johnnyjacob@gmail.com>
 
 	* e-dateedit.c (): Removing aggressive time check when entering a
@@ -87,19 +27,10 @@
 	set_scroll_adjustments signal, and use the correct marshaler.
 	Fixes bug #331743.
 
-2006-06-02  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug 343494
-
-	* e-search-bar.c (add_button): Use gtk_button_set_image if GTK+ is
-	2.6 or higher.
-
-2006-05-30  Li Yuan <li.yuan@sun.com>
-
-	Fix for #343280.
+2006-06-01  Harish Krishnaswamy  <kharish@novell.com>
 
-	* e-search-bar.c (add_button): No need to add label when we use
-	gtk_button_new_from_stock to create a button.
+	* e-attachment-bar.c (e_attachment_bar_attach): Synch method
+	signature with its declaration. This was a build-breaker.
 
 2006-05-26  Jeffrey Stedfast  <fejj@novell.com>
 
@@ -144,102 +75,38 @@
 	(close_cb): Don't unref the attachment object here anymore.
 	(e_attachment_edit): Don't ref the EAttachment anymore.
 
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-attachment-bar.c (update, eab_icon_clicked_cb),
-	(e_attachment_bar_attach_remote_file):
-	
-	* e-attachment-bar.h:
-
-	* e-attachment.c (e_attachment_new_remote_file),
-	(e_attachment_build_remote_file): Added code to specify the
-	attachment type for remote files.  Also added code to save files
-	to CamelStreamVfs
-
-2006-05-04  Rajeev Ramanathan  <rajeevramanathan_2004@yahoo.co.in>
-
-	* e-calendar-item.c (e_calendar_item_draw),
-	(e_calendar_item_draw_month, e_calendar_item_draw_day_numbers),
-	(layout_set_day_text): enable build without cairo using
-	ENABLE_CAIRO macro. Also it fixes a bold issue, where entire
-	evolution appears with bold text.
-
-2006-04-27  Boby Wang <boby.wang@sun.com>
-
-	** Fixes bug #339138
-
-	* e-calendar.c (e_calendar_init): Correct the button's accessible
-	name.
-
-2006-04-27  Boby Wang  <boby.wang@sun.com>
-
-	** Fixes bug #332821
-
-	* e-expander.c (e_expander_class_init): Implement the
-	accessibility of EExpander.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-search-bar.c (append_xml_menu_item, setup_bonobo_menus): Added
-	icons to search menu.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-search-bar.c (add_button, e_search_bar_construct): Adding
-	icons for find and clear buttons. (Patch from PR Suman)
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from charu_jayaprakasam@yahoo.com fixes bug #335861
-
-	* e-search-bar.c (e_search_bar_construct): Change the mnemonics
-	for Find Now button.
-
-2006-04-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-calendar-item.c (e_calendar_item_draw),
-	(e_calendar_item_draw_month, e_calendar_item_draw_day_numbers):
-	Used Cairo to draw the Tag Calendar. (Rajeev)
-
-2006-04-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-attachment-bar.c (e_attachment_bar_create_attachment_cache):
-	Added a new function that creates a attachment with a image cache.
-
 2006-03-28  Li Yuan  <li.yuan@sun.com>
 
 	**Fixes bug #335618
-
-	* e-selection-model-array.c (e_selection_model_array_delete_rows):
-	If the row being deleted is the last one, we should change the
+	* e-selection-model-array.c: (e_selection_model_array_delete_rows):
+	If the row being deleted is the last one, we should change the 
 	selection_start_row.
 
 2006-03-06  Simon Zheng  <simon.zheng@sun.com>
 
 	Fixes bug #332140
-
-	* e-attachment-bar.c (temp_save_part): Changed to transfer
-	filenames from utf-8 to glib encoding before really saving files.
+	* e-attachment-bar.c: (temp_save_part):
+	Changed to transfer filenames from utf-8 to glib encoding 
+	before really saving files.
 
 2006-03-06  Jeff Cai  <jeff.cai@sun.com>
 
 	** Fixes for 333235
-
-	* e-combo-button.c (paint): If width of a widget is 0, don't draw
-	it.
+	* e-combo-button.c: (paint): If width of a widget is 0, 
+	don't draw it.
 
 2006-02-28  Devashish Sharma  <sdevashish@novell.com>
 
-	* e-reflow.c (do_adjustment): Check and see if reflow->items and
-	reflow->items[row] are NULL or not.  Fixes Bug # 331998.
-
+	* e-reflow.c :(do_adjustment): Check and see if reflow->items 
+	and reflow->items[row] are NULL or not.
+	Fixes Bug # 331998.
 	Patch submitted by Irene Huang <Irene.Huang@sun.com>
 
 2006-02-24  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fixes bug #322789
-
-	* e-image-chooser.c (set_image_from_data): Added code to get the
+	
+	* e-image-chooser.c: (set_image_from_data): Added code to get the
 	pixbuf after closing the loaded.
 
 2006-02-13  Andre Klapper  <a9016009@gmx.de>
@@ -258,16 +125,16 @@
 2006-01-16  Nancy Cai <nancy.cai@sun.com>
 
 	** Fixes bug #326649
-
-	* e-multi-config-dialog.c (set_page_timeout_callback): make the
-	preferences dialog's keyboard navigation more consistent.
+	
+	* e-multi-config-dialog.c: (set_page_timeout_callback):
+	make the preferences dialog's keyboard navigation more consistent.	
 
 2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fixes bug #326265
 
-	* e-charset-picker.c (e_charset_picker_bonobo_ui_populate): Added
-	mnemonics to "Character Encoding" menu.
+	* e-charset-picker.c: (e_charset_picker_bonobo_ui_populate):
+	Added mnemonics to "Character Encoding" menu.
 
 2006-01-11  Chenthill Palanisamy  <pchenthill@novell.com>
 
@@ -291,29 +158,29 @@
 	*e-util-marshal.list: removed
 
 2006-01-06  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* e-search-bar.c (clear_verb_cb): assign the data first before
-	accessing it.
+	
+	* e-search-bar.c:(clear_verb_cb): assign the data first
+	before accessing it.
 
 2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
 
 	reviewed by: Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-canvas-background.c (ecb_style_set): Set the foreground only
-	if the widget has already been realized.  Fixes #309618.
+	* e-canvas-background.c: (ecb_style_set): Set the
+	foreground only if the widget has already been realized.
+	Fixes #309618.
 
 2005-12-21  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fixes bug #324590
 
-	* e-search-bar.c (search_now_verb_cb, clear_verb_cb): Added code
-	to clear search entry from menu.
+	* e-search-bar.c: (search_now_verb_cb), (clear_verb_cb): Added
+	code to clear search entry from menu.
 
 2005-12-20  Johnny Jacob  <johnnyjacob@gmail.com>
 
 	** See Bug #246233
-
-	* e-filter-bar.c (member_activated): Changed "Search Editor" to
+	* e-filter-bar.c: (member_activated) : Changed "Search Editor" to
 	"Searches"
 
 2005-12-18  Tor Lillqvist  <tml@novell.com>
@@ -335,46 +202,44 @@
 
 2005-12-15  Srinivasa Ragavan  <sragavan@novell.com>
 
-	* e-filter-bar.c (rule_advanced_response, option_changed)
-	(set_property): Added code to Show color in search widget.  *
-
-	* e-search-bar.c (entry_activated_cb),
-	(activate_button_clicked_cb, clear_button_clicked_cb): Added code
-	to show color in search widget, when the filter is active.
+	* e-filter-bar.c: (rule_advanced_response), (option_changed),
+	(set_property): Added code to Show color in search widget.
+	* e-search-bar.c: (entry_activated_cb),
+	(activate_button_clicked_cb), (clear_button_clicked_cb): Added
+	code to show color in search widget, when the filter is active.
 
 2005-11-24  Tor Lillqvist  <tml@novell.com>
 
-	* e-dateedit.c:
+	* e-dateedit.c
 	* e-cell-date-edit.c: Include e-time-utils.h from libedataserver
 	instead of using evolution's copy which is going away.
 
 2005-11-23  Johnny Jacob  <johnnyjacob@gmail.com>
 
-	* e-dateedit.c (on_date_entry_focus_out, on_time_entry_focus_out):
+	* e-dateedit.c: (on_date_entry_focus_out) (on_time_entry_focus_out) :
 	Validation for date and time during focus out event.
 
 2005-11-22  Johnny Jacob  <johnnyjacob@gmail.com>
 
 	** See Bug #303856
-
-	* e-dateedit.c (create_children): Added a signal handler for
-	date_entry's "key_release_event".
+	* e-dateedit.c: (create_children) : Added a signal handler
+	for date_entry's "key_release_event".
 
 2005-11-17  Harish Krishnaswamy  <kharish@novell.com>
 
-	* e-attachment-bar.c (update, e_attachment_bar_set_width): Fix a
-	division-by-zero error crasher.
+	* e-attachment-bar.c: (update), (e_attachment_bar_set_width):
+	Fix a division-by-zero error crasher.
 
 2005-11-15  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (e_attachment_bar_get_all_attachments): Added
+	* e-attachment-bar.[ch] (e_attachment_bar_get_all_attachments): Added
 	a function to get all attachments of the attachment bar for plugin
 	purposes.
 
 2005-11-14  Chenthill Palanisamy  <pchenthill@novell.com>
 
-	* e-dateedit.c (create_children): Adjusted the size for the
-	dateedit widgets.
+	* e-dateedit.c: (create_children): Adjusted the size
+	for the dateedit widgets.
 
 2005-11-14  Srinivasa Ragavan <sragavan@novell.com>
 
@@ -388,8 +253,8 @@
 	
 2005-09-28  Tor Lillqvist  <tml@novell.com>
 
-	* e-charset-picker.c (e_charset_picker_new)
-	(e_charset_picker_bonobo_ui_populate): Use g_ascii_strcasecmp()
+	* e-charset-picker.c (e_charset_picker_new,
+	e_charset_picker_bonobo_ui_populate): Use g_ascii_strcasecmp()
 	instead of strcasecmp(). We are comparing to strings known to be
 	plain ASCII, so just casefolding ASCII is enough. Also better for
 	portability.
@@ -426,31 +291,29 @@
 
 2005-08-17  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (eab_drag_data_get): Use camel_url to
-	construct url
-	(eab_icon_clicked_cb, e_attachment_bar_new): Fixed part of bug
-	#312224. It handles double click on a attachment icon and calls
-	gnome_url_show.
+	* e-attachment-bar.c 
+	eab_drag_data_get: Use camel_url to construct url
+	(eab_icon_clicked_cb) (e_attachment_bar_new): 
+	Fixed part of bug #312224. It handles double click on a attachment
+	icon and calls gnome_url_show.
 
-	* e-attachment.c (finalise, init): Add a new member to preserve
+	* e-attachment.[ch] (finalise) (init): Add a new member to preserve
 	the stored location
-	(e_attachment_new)(e_attachment_build_remote_file): Camel_url to
+	(e_attachment_new)(e_attachment_build_remote_file): Camel_url to 
 	construct urls
 	
 2005-08-16  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment.c (download_to_local_path, e_attachment_edit):
-	Fixed few warnings
+	* e-attachment.c (download_to_local_path) (e_attachment_edit): Fixed
+	few warnings
 
 2005-08-16  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment.c (finalise, e_attachment_new)
-	(e_attachment_build_remote_file, e_attachment_new_from_mime_part)
-	(ok_cb): Maintain the filename of the attachment in the structure
-	and free it in finalize.
-
-	* e-attachment-bar.c (update): For display consider the filename
-	from the structure before from the part.
+	* e-attachment.c (finalise) (e_attachment_new) (e_attachment_build_remote_file)
+	(e_attachment_new_from_mime_part) (ok_cb): Maintain the filename of the 
+	attachment in the structure and free it in finalize.
+	* e-attachment-bar.c (update): For display consider the filename from the 
+	structure before from the part.
 
 2005-08-03  Not Zed  <NotZed@Ximian.com>
 
@@ -459,69 +322,59 @@
 
 2005-08-11  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (e_attachment_bar_refresh): Added a function
+	* e-attachment-bar.[ch] (e_attachment_bar_refresh): Added a function
 	to force refresh/resize the icons.
 
 2005-08-02  David Malcolm  <dmalcolm@redhat.com>
 
-	* e-attachment-bar.c (update_remote_file): escape the "%"
-	character correctly.
+	* e-attachment-bar.c: (update_remote_file): escape the "%" character 
+	correctly.
 
 2005-07-29  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment.c (e_attachment_new_from_mime_part): used ref
-	instead of copying the entire mime part.
+	* e-attachment.c: (e_attachment_new_from_mime_part) used ref instead of 
+	copying the entire mime part.
 
 2005-07-15  Diego Gonzalez    <diego@pemas.net>
 
-	* e-image-chooser.c (image_drag_data_received_cb): modificatio to
+	* e-image-chooser.c(image_drag_data_received_cb): modificatio to
 	avoid getting into an infinite loop. Also remove some debug
 	output.
 	(set_image_from_data): substitute calls to gdk_pixbuf_unref and
 	gdk_pixbuf_ref and use g_object_ref/unref instead. The first ones
-	are deprecated API.  Fixes #310488
+	are deprecated API.
+	Fixes #310488
 
 2005-07-25  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (e_attachment_bar_remove_selected)
-	(e_attachment_bar_edit_selected)
-	(e_attachment_bar_get_attachment, e_attachment_bar_get_parts)
-	(e_attachment_bar_get_download_count)
-	(e_attachment_bar_attach_remote_file): Added checks for the
-	parameters.
+	* e-attachment-bar,c: (e_attachment_bar_remove_selected) (e_attachment_bar_edit_selected)
+	(e_attachment_bar_get_attachment) (e_attachment_bar_get_parts) 
+	(e_attachment_bar_get_download_count) (e_attachment_bar_attach_remote_file): Added 
+	checks for the parameters.
 	
 2005-07-20  Vivek Jain  <jvivek@novell.com>
-
-	* e-send-options.h: ESendOptionsDialogClass: has a member new
-	virtual method for default callback of "sod_response"
-
-	* e-send-options.c: introduced a new signal "sod_response"
-	captures the response for the child dialog and makes it available
-	at the object level (useful for the external members invoking the
-	dialog)
+	
+	* e-send-options.h : ESendOptionsDialogClass: has a member new virtual
+	method for default callback of "sod_response"
+	* e-send-options.c : introduced a new signal "sod_response"
+	captures the response for the child dialog and makes it available at the
+	object level (useful for the external members invoking the dialog)
 
 2005-07-20  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (remove_attachment, update)
-	(e_attachment_bar_get_selector, e_attachment_bar_get_attachment)
-	(destroy, init, e_attachment_bar_new)
-	(e_attachment_bar_add_attachment)
-	(e_attachment_bar_attach_remote_file): Cleaned up most of
-	it. Added the DnD.
-
-	* e-attachment.c (real_changed, class_init, init)
-	(e_attachment_new, e_attachment_new_remote_file)
-	(e_attachment_build_remote_file): Moved the remote download code
-	from bar to here and few cleanups.
+	* e-attachment-bar.[ch]:(remove_attachment) (update) (e_attachment_bar_get_selector) 
+	(e_attachment_bar_get_attachment) (destroy) (init) (e_attachment_bar_new) 
+	(e_attachment_bar_add_attachment) (e_attachment_bar_attach_remote_file)
+	Cleaned up most of it. Added the DnD.
+	* e-attachment.[ch]: (real_changed) (class_init) (init) (e_attachment_new) 
+	(e_attachment_new_remote_file) (e_attachment_build_remote_file): Moved the
+	remote download code from bar to here and few cleanups.
 	
 2005-07-11  Srinivasa Ragavan <sragavan@novell.com>
 	
-	* Makefile.am: Added e-attachment-bar.[ch], e-attachment.[ch],
-	and e-attachment.glade.
-
-	* e-attachment.[ch]: Merge of em-attachment.[ch] and
-	cal-attachment.[ch]
-
+	* Makefile.am: Added e-attachment-bar.[ch] e-attachment.[ch]
+	e-attachment.glade.
+	* e-attachment.[ch]: Merge of em-attachment.[ch] and cal-attachment.[ch]
 	* e-attachment-bar.[ch]: Merge of em-attachment-bar.[ch] and
 	cal-attachment-bar.[ch].
 
@@ -533,8 +386,8 @@
 
 2005-05-31  Li Yuan  <li.yuan@sun.com>
 
-	* e-dateedit.c (e_date_edit_update_date_entry): add relation to
-	date_button.
+	* e-dateedit.c:(e_date_edit_update_date_entry):
+	add relation to date_button.
 
 	Fixes #302267
 
@@ -549,11 +402,11 @@
 
 2005-05-12  Shreyas Srinivasan	<sshreyas@novell.com>
 
-	* e-send-options.c: Fixed #272005
-
+	* e-send-options.c : Fixed #272005
+	
 2005-05-06  Sarfraaz Ahmed <asarfraaz@novell.com>
 
-	* e-send-options.glade: Fixed a typo. #273095
+	* e-send-options.glade : Fixed a typo. #273095
 
 2005-05-06  Harish Krishnaswamy  <kharish@novell.com>
 
@@ -575,7 +428,8 @@
 
 2005-02-02  Li Yuan  <li.yuan@sun.com>
 
-	* e-url-entry.c (init): add a11y name to url link button.
+	* e-url-entry.c: (init):
+	add a11y name to url link button.
 
 2005-01-26  Rodney Dawes  <dobey@novell.com>
 
@@ -589,7 +443,8 @@
 
 2005-01-24  Mengjie Yu  <meng-jie.yu@sun.com>
 
-	* e-search-bar.c (set_option): add a11y name for the option menu.
+	* e-search-bar.c: (set_option):
+	add a11y name for the option menu.
 
 2005-01-20  Not Zed  <NotZed@Ximian.com>
 
@@ -602,49 +457,47 @@
 
 2005-01-20  Harry Lu  <harry.lu@sun.com>
 
-	* e-search-bar.c (activate_by_subitems): add a translater note.
+	* e-search-bar.c: (activate_by_subitems): add a translater note.
 
 2005-01-19  Harry Lu  <harry.lu@sun.com>
 
 	Fix for 46359, enable "Alt+Down Arrow" to show the popup for
 	e-combo-cell-editable.c.
 
-	* e-combo-cell-editable.c (show_popup): rewrite it to a more
+	* e-combo-cell-editable.c: (show_popup): rewrite it to a more
 	generic function.
 	(button_clicked_cb): call the new show_popup function.
 	(entry_key_press_event_cb): show popup if "Alt+Down Arrow".
 	(ecce_grab_focus): new function.
-	(ecce_class_init): add grab_focus handler so that the entry can
-	get focus.
+	(ecce_class_init): add grab_focus handler so that the entry
+	can get focus.
 
 2005-01-17  Harry Lu  <harry.lu@sun.com>
 
 	Fix for 62831.
 
-	* e-search-bar.c (activate_by_subitems): add an a11y name for the
-	search entry.
+	* e-search-bar.c: (activate_by_subitems): add an a11y name for 
+	the search entry.
 
 2005-01-12 Chenthill Palanisamy <pchenthill@novell.com>
 
-	* e-send-options.c (e_send_options_get_widgets_data),
-	(e_send_options_fill_widgets_with_data): Get the value for the
-	autodelete toggle button
-	(page_changed_cb): Do not hide the classification label and its
-	combo box here.
+	* e-send-options.c: (e_send_options_get_widgets_data),
+	(e_send_options_fill_widgets_with_data): Get the value
+	for the autodelete toggle button
+	(page_changed_cb): Do not hide the classification label 
+	and its combo box here. 
 
 2005-01-10 Chenthill Palanisamy <pchenthill@novell.com>
 
-	* e-send-options.c (e_send_options_get_widgets_data),
-	(e_send_options_fill_widgets_with_data, page_changed_cb),
-	(init_widgets, get_widgets, setup_widgets),
-	(e_sendoptions_set_global, e_sendoptions_dialog_run),
-	(e_sendoptions_dialog_finalize, e_sendoptions_dialog_dispose),
-	(e_sendoptions_dialog_init, e_sendoptions_dialog_class_init),
-	(e_sendoptions_dialog_get_type): Added code to support global
-	options.  Filled the finalize and dispose functions.
-
+	* e-send-options.c: (e_send_options_get_widgets_data),
+	(e_send_options_fill_widgets_with_data), (page_changed_cb),
+	(init_widgets), (get_widgets), (setup_widgets),
+	(e_sendoptions_set_global), (e_sendoptions_dialog_run),
+	(e_sendoptions_dialog_finalize), (e_sendoptions_dialog_dispose),
+	(e_sendoptions_dialog_init), (e_sendoptions_dialog_class_init),
+	(e_sendoptions_dialog_get_type): Added code to support global options.
+	Filled the finalize and dispose functions.
 	* e-send-options.glade: Changed a label id.
-
 	* e-send-options.h: Added the set_global function.
 
 2005-01-06  JP Rosevear  <jpr@novell.com>
@@ -659,22 +512,18 @@
 2005-01-06 Chenthill Palanisamy <pchenthill@novell.com>
 	
 	merging send options
-
 	* Makefile.am:
-
 	* e-send-options.[ch]: Widgets for the send options dialog
-
 	* e-send-options.glade:	Contains interface for the dialog
 
 2005-01-04  Harry Lu  <harry.lu@sun.com>
 
-	* misc/e-combo-button.c (e_combo_button_popup): new internal
-	function to popup the menu.
+	* misc/e-combo-button.c: (e_combo_button_popup): new internal function
+	to popup the menu.
 	(impl_button_press_event): call the new function.
 	(e_combo_button_class_init): init a11y.
 	(e_combo_button_get_label): new function to return label.
 	(e_combo_button_popup_menu): new function to popup menu.
-
 	* misc/e-combo-button.h: add function declarations.
 
 2004-12-17  Not Zed  <NotZed@Ximian.com>
@@ -725,24 +574,24 @@
 
 2004-10-28  Li Yuan  <li.yuan@sun.com>
 
-	* e-calendar.c (e_calendar_init, e_calendar_new): Make
+	* e-calendar.c: (e_calendar_init), (e_calendar_new): Make
 	accessibility name and description translatable.  Add a atk name
 	for the two buttons so that they can be UI grabbed by GOK.
-
-	* e-dateedit.c (e_date_edit_new, create_children): Add a name for
-	atk object.  Make accessibility name and description translatable.
-	Add name and description for the date_entry, date_button and
-	time_combo.
+	
+	* e-dateedit.c: (e_date_edit_new), (create_children): Add a name
+	for atk object.  Make accessibility name and description
+	translatable.  Add name and description for the date_entry,
+	date_button and time_combo.
 	(e_date_edit_show_date_popup), (hide_date_popup): Grab and ungrab
 	keyboard.  add_relation(): New function to add labelled_by
 	relation for entry and combobox.
-
-	* e-map.c (e_map_new): Add a name for world map widget.  Make
+	
+	* e-map.c: (e_map_new): Add a name for world map widget.  Make
 	accessibility name and description translatable.  Set the atk role
 	to image.
-
-	* e-multi-config-dialog.c (e_multi_config_dialog_add_page): Add an
-	atk name for the page.
+	
+	* e-multi-config-dialog.c: (e_multi_config_dialog_add_page): Add
+	an atk name for the page.
 	
 2004-10-27  JP Rosevear  <jpr@novell.com>
 
@@ -759,16 +608,16 @@
 
 2004-10-08  Harry Lu  <harry.lu@sun.com>
 
-	* e-source-selector.c (e_source_selector_popup_menu),
-	(class_init): implement popup_menu so that popup menu can be shown
-	with Shift+F10.
+	* e-source-selector.c: (e_source_selector_popup_menu),
+	(class_init): implement popup_menu so that popup menu can
+	be shown with Shift+F10.
 
 2004-10-06  JP Rosevear  <jpr@novell.com>
  
  	Fixes #66164
  	
-	* e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): replicate
-	fix to e-cell-combo.c by NotZed
+ 	* e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): replicate
+ 	fix to e-cell-combo.c by NotZed
 	
 2004-10-01  Not Zed  <NotZed@Ximian.com>
 
@@ -807,8 +656,8 @@
 
 2004-07-26  JP Rosevear  <jpr@novell.com>
  
-	* e-search-bar.c (setup_bonobo_menus): use ctrl-shift-q to clear
-	search bar
+ 	* e-search-bar.c (setup_bonobo_menus): use ctrl-shift-q to clear
+ 	search bar
 	
 2004-07-20  Not Zed  <NotZed@Ximian.com>
 
diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c
index 3efe865681..3b09407edb 100644
--- a/widgets/misc/e-attachment-bar.c
+++ b/widgets/misc/e-attachment-bar.c
@@ -65,7 +65,6 @@
 #define ICON_BORDER 2
 #define ICON_TEXT_SPACING 2
 
-
 static GnomeIconListClass *parent_class = NULL;
 
 struct _EAttachmentBarPrivate {
@@ -76,7 +75,6 @@ struct _EAttachmentBarPrivate {
 	char *path;
 };
 
-
 enum {
 	CHANGED,
 	LAST_SIGNAL
@@ -84,12 +82,10 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
 static void update (EAttachmentBar *bar);
 
-
 static char *
-size_to_string (size_t size)
+size_to_string (gulong size)
 {
 	char *size_string;
 	
@@ -139,7 +135,8 @@ attachment_changed_cb (EAttachment *attachment,
 }
 
 static void
-add_common (EAttachmentBar *bar, EAttachment *attachment)
+add_common (EAttachmentBar *bar,
+	    EAttachment *attachment)
 {
 	g_return_if_fail (attachment != NULL);
 	
@@ -153,25 +150,28 @@ add_common (EAttachmentBar *bar, EAttachment *attachment)
 }
 
 static void
-add_from_mime_part (EAttachmentBar *bar, CamelMimePart *part)
+add_from_mime_part (EAttachmentBar *bar,
+		    CamelMimePart *part)
 {
 	add_common (bar, e_attachment_new_from_mime_part (part));
 }
 
 static void
-add_from_file (EAttachmentBar *bar, const char *file_name, const char *disposition)
+add_from_file (EAttachmentBar *bar,
+	       const char *file_name,
+	       const char *disposition)
 {
 	EAttachment *attachment;
 	CamelException ex;
 	
 	camel_exception_init (&ex);
-	
-	if ((attachment = e_attachment_new (file_name, disposition, &ex))) {
+	attachment = e_attachment_new (file_name, disposition, &ex);
+	if (attachment) {
 		add_common (bar, attachment);
 	} else {
 		/* FIXME: Avoid using error from mailer */
-		e_error_run ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) bar), "mail-composer:no-attach",
-			     file_name, camel_exception_get_description (&ex), NULL);
+		e_error_run((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)bar), "mail-composer:no-attach",
+			    file_name, camel_exception_get_description(&ex), NULL);
 		camel_exception_clear (&ex);
 	}
 }
@@ -203,66 +203,6 @@ calculate_height_width(EAttachmentBar *bar, int *new_width, int *new_height)
 	return;
 }
 
-void
-e_attachment_bar_create_attachment_cache (EAttachment *attachment)
-{
-
-	CamelContentType *content_type;
-
-	content_type = camel_mime_part_get_content_type (attachment->body);
-
-	if (camel_content_type_is(content_type, "image", "*")) {
-		CamelDataWrapper *wrapper;
-		CamelStreamMem *mstream;
-		GdkPixbufLoader *loader;
-		gboolean error = TRUE;
-		GdkPixbuf *pixbuf;
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-		mstream = (CamelStreamMem *) camel_stream_mem_new ();
-			
-		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
-			
-		/* Stream image into pixbuf loader */
-		loader = gdk_pixbuf_loader_new ();
-		error = !gdk_pixbuf_loader_write (loader, mstream->buffer->data, mstream->buffer->len, NULL);
-		gdk_pixbuf_loader_close (loader, NULL);
-			
-		if (!error) {
-			int ratio, width, height;
-			
-			/* Shrink pixbuf */
-			pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-			width = gdk_pixbuf_get_width (pixbuf);
-			height = gdk_pixbuf_get_height (pixbuf);
-			if (width >= height) {
-				if (width > 48) {
-					ratio = width / 48;
-					width = 48;
-					height = height / ratio;
-				}
-			} else {
-				if (height > 48) {
-					ratio = height / 48;
-					height = 48;
-					width = width / ratio;
-				}
-			}
-			
-			attachment->pixbuf_cache = gdk_pixbuf_scale_simple (pixbuf, width,height,GDK_INTERP_BILINEAR);
-			pixbuf = attachment->pixbuf_cache;
-			g_object_ref(pixbuf);
-		} else {
-			attachment->pixbuf_cache = NULL;
-			g_warning ("GdkPixbufLoader Error");
-		}
-			
-		/* Destroy everything */
-		g_object_unref (loader);
-		camel_object_unref (mstream);
-	}
-}
-
 static void
 update (EAttachmentBar *bar)
 {
@@ -283,16 +223,17 @@ update (EAttachmentBar *bar)
 		EAttachment *attachment;
 		CamelContentType *content_type;
 		char *size_string, *label;
-		GdkPixbuf *pixbuf = NULL;
+		GdkPixbuf *pixbuf=NULL;
 		const char *desc;
 		
 		attachment = priv->attachments->pdata[i];
 		
 		if (!attachment->is_available_local) {
 			/* stock_attach would be better, but its fugly scaled up */
-			if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) {
+			pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
+			if (pixbuf) {
 				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
-				g_object_unref (pixbuf);
+				g_object_unref(pixbuf);
 			}
 			continue;
 		}
@@ -300,7 +241,8 @@ update (EAttachmentBar *bar)
 		content_type = camel_mime_part_get_content_type (attachment->body);
 		/* Get the image out of the attachment 
 		   and create a thumbnail for it */
-		if ((pixbuf = attachment->pixbuf_cache)) {
+		pixbuf = attachment->pixbuf_cache;
+		if (pixbuf) {
 			g_object_ref(pixbuf);
 		} else if (camel_content_type_is(content_type, "image", "*")) {
 			CamelDataWrapper *wrapper;
@@ -339,10 +281,13 @@ update (EAttachmentBar *bar)
 					}
 				}
 				
-				attachment->pixbuf_cache = gdk_pixbuf_scale_simple (pixbuf, width, height,
-										    GDK_INTERP_BILINEAR);
+				attachment->pixbuf_cache = gdk_pixbuf_scale_simple 
+					(pixbuf,
+					 width,
+					 height,
+					 GDK_INTERP_BILINEAR);
 				pixbuf = attachment->pixbuf_cache;
-				g_object_ref (pixbuf);
+				g_object_ref(pixbuf);
 			} else {
 				pixbuf = NULL;
 				g_warning ("GdkPixbufLoader Error");
@@ -364,7 +309,8 @@ update (EAttachmentBar *bar)
 		if (!desc)
 			desc = _("attachment");
 		
-		if (attachment->size && (size_string = size_to_string (attachment->size))) {
+		if (attachment->size
+		    && (size_string = size_to_string (attachment->size))) {
 			label = g_strdup_printf ("%s (%s)", desc, size_string);
 			g_free (size_string);
 		} else
@@ -382,56 +328,56 @@ update (EAttachmentBar *bar)
 			}
 			g_free (mime_type);
 		}
-		
+
 		if (pixbuf) {
-			GdkPixbuf *pixbuf_orig = pixbuf;
+			GdkPixbuf* pixbuf_orig = pixbuf;
 			pixbuf = gdk_pixbuf_add_alpha (pixbuf_orig, TRUE, 255, 255, 255);
-			
+
 			/* gdk_pixbuf_add_alpha returns a newly allocated pixbuf,
 			   free the original one. 
 			*/
 			g_object_unref (pixbuf_orig);
-			
+
 			/* In case of a attachment bar, in a signed/encrypted part, display the status as a emblem*/
 			if (attachment->sign) {
 				/* Show the signature status at the right-bottom.*/
 				GdkPixbuf *sign = NULL;
-				int x, y;
-				
+				int x,y;
+
 				if (attachment->sign == CAMEL_CIPHER_VALIDITY_SIGN_BAD)
-					sign = e_icon_factory_get_icon ("stock_signature-bad", E_ICON_SIZE_MENU);
+					sign = e_icon_factory_get_icon("stock_signature-bad", E_ICON_SIZE_MENU);
 				else if (attachment->sign == CAMEL_CIPHER_VALIDITY_SIGN_GOOD)
-					sign = e_icon_factory_get_icon ("stock_signature-ok", E_ICON_SIZE_MENU);
+					sign = e_icon_factory_get_icon("stock_signature-ok", E_ICON_SIZE_MENU);
 				else
-					sign = e_icon_factory_get_icon ("stock_signature", E_ICON_SIZE_MENU);
-				
-				x = gdk_pixbuf_get_width (pixbuf) - 17;
-				y = gdk_pixbuf_get_height (pixbuf) - 17;
+					sign = e_icon_factory_get_icon("stock_signature", E_ICON_SIZE_MENU);
+
+				x = gdk_pixbuf_get_width(pixbuf) - 17;
+				y = gdk_pixbuf_get_height(pixbuf) - 17;
 				
-				gdk_pixbuf_copy_area (sign, 0, 0, 16, 16, pixbuf, x, y);
+				gdk_pixbuf_copy_area(sign, 0, 0, 16, 16, pixbuf, x, y);
 				g_object_unref (sign);
 			}
-			
+
 			if (attachment->encrypt) {
 				/* Show the encryption status at the top left.*/
-				GdkPixbuf *encrypt = e_icon_factory_get_icon ("stock_lock-ok", E_ICON_SIZE_MENU);
+				GdkPixbuf *encrypt = e_icon_factory_get_icon("stock_lock-ok", E_ICON_SIZE_MENU);
 				
-				gdk_pixbuf_copy_area (encrypt, 0, 0, 16, 16, pixbuf, 1, 1);
+				gdk_pixbuf_copy_area(encrypt, 0, 0, 16, 16, pixbuf, 1, 1);
 				g_object_unref (encrypt);
 			}
-			
+
 			gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, label);
-			g_object_unref (pixbuf);
+			g_object_unref(pixbuf);
 		}
 		
 		g_free (label);
 	}
 	
 	gnome_icon_list_thaw (icon_list);
-	
+
 	/* Resize */
 	if (bar->expand) {
-		gtk_widget_get_size_request ((GtkWidget *) bar, &bar_width, &bar_height);
+		gtk_widget_get_size_request ((GtkWidget *)bar, &bar_width, &bar_height);
 		
 		if (bar->priv->attachments->len) {
 			int per_col, rows, height, width;
@@ -440,7 +386,7 @@ update (EAttachmentBar *bar)
 			per_col = bar_width / width;
 			per_col = (per_col ? per_col : 1);
 			rows = (bar->priv->attachments->len + per_col -1) / per_col;
-			gtk_widget_set_size_request ((GtkWidget *) bar, bar_width, rows * height);
+			gtk_widget_set_size_request ((GtkWidget *)bar, bar_width, rows * height);
 		}
 	}
 }
@@ -705,17 +651,20 @@ destroy (GtkObject *object)
 }
 
 static char *
-temp_save_part (CamelMimePart *part)
+temp_save_part(CamelMimePart *part)
 {
 	const char *filename;
 	char *tmpdir, *path, *mfilename = NULL, *utf8_mfilename = NULL;
 	CamelStream *stream;
 	CamelDataWrapper *wrapper;
-	
-	if (!(tmpdir = e_mkdtemp ("evolution-tmp-XXXXXX")))
+
+	tmpdir = e_mkdtemp("evolution-tmp-XXXXXX");
+	if (tmpdir == NULL) {
 		return NULL;
-	
-	if (!(filename = camel_mime_part_get_filename (part))) {
+	}
+
+	filename = camel_mime_part_get_filename (part);
+	if (filename == NULL) {
 		/* This is the default filename used for temporary file creation */
 		filename = _("Unknown");
 	} else {
@@ -725,14 +674,14 @@ temp_save_part (CamelMimePart *part)
 		g_free (utf8_mfilename);
 		filename = (const char *) mfilename;
 	}
-	
-	path = g_build_filename (tmpdir, filename, NULL);
-	g_free (tmpdir);
-	g_free (mfilename);
-	
+
+	path = g_build_filename(tmpdir, filename, NULL);
+	g_free(tmpdir);
+	g_free(mfilename);
+
 	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
 	stream = camel_stream_fs_new_with_name (path, O_RDWR|O_CREAT|O_TRUNC, 0600);
-	
+
 	if (!stream) {
 		/* TODO handle error conditions */
 		g_message ("DEBUG: could not open the file to write\n");
@@ -842,17 +791,17 @@ eab_button_press_event(EAttachmentBar *bar, GdkEventButton *event, gpointer dumm
 	};	
 
 	selected = gnome_icon_list_get_selection(icon_list);
-	length = g_list_length (selected);
+	length = g_list_length(selected);
 
 	if (event) {
 		icon_number = gnome_icon_list_get_icon_at(icon_list, event->x, event->y);
 		if (icon_number < 0) { 
-			/* When nothing is selected, deselect all */
-			gnome_icon_list_unselect_all (icon_list);
+			/* When nothing is selected deselect all*/
+			gnome_icon_list_unselect_all(icon_list);
 			length = 0;
 			selected = NULL;
 		}
-		
+	
 		if (event->button == 1) {
 			/* If something is selected, then allow drag or else help to select */
 			if (length)
@@ -861,11 +810,11 @@ eab_button_press_event(EAttachmentBar *bar, GdkEventButton *event, gpointer dumm
 				gtk_drag_source_unset((GtkWidget *)bar);
 			return FALSE;
 		}
-		
+	
 		/* If not r-click dont progress any more.*/
 		if (event->button != 3)
-			return FALSE;
-		
+			return FALSE;	
+
 		/* When a r-click on something, if it is in the already selected list, consider a r-click of multiple things
 		 * or deselect all and select only this for r-click 
 		 */
@@ -874,42 +823,42 @@ eab_button_press_event(EAttachmentBar *bar, GdkEventButton *event, gpointer dumm
 				if (GPOINTER_TO_INT(tmp->data) == icon_number)
 					take_selected = TRUE;
 			}
-			
+	
 			if (!take_selected) {
 				gnome_icon_list_unselect_all(icon_list);
 				gnome_icon_list_select_icon(icon_list, icon_number);
 			}
 		}
-	}
-	
+	} 
 	return FALSE;
 }
 
 static gboolean
 eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy)
 {
-	EAttachment *attachment;
+	GSList *p = NULL;
 	GError *error = NULL;
 	gboolean ret = FALSE;
-	CamelURL *url;
-	char *path;
-	GSList *p;
-	
+
 	if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) {
 		p = e_attachment_bar_get_selected (bar);
-		if (p && p->next == NULL) {
-			attachment = p->data;
-			
+		if (p && g_slist_length(p) == 1) {
+			EAttachment *attachment;
+			char *path = NULL;
+
+			attachment = (EAttachment *)p->data;
+
 			/* Check if the file is stored already */
 			if (!attachment->store_uri) {
+				CamelURL *curl;
+				
 				path = temp_save_part (attachment->body);				
-				url = camel_url_new ("file:", NULL);
-				camel_url_set_path (url, path);
-				attachment->store_uri = camel_url_to_string (url, 0);
-				camel_url_free (url);
-				g_free (path);
+				curl  = camel_url_new ("file:", NULL);
+				camel_url_set_path ( curl, path);
+				attachment->store_uri = camel_url_to_string (curl, 0);
+				camel_url_free (curl);
 			}
-			
+
 			/* launch the url now */
 			gnome_url_show (attachment->store_uri, &error);
 			if (error) {
@@ -917,12 +866,13 @@ eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy)
 				g_error_free (error);
 				error = NULL;
 			}
-			
+
+			g_free (path);
 			ret = TRUE;
 		}
-		
+
 		if (p) {
-			g_slist_foreach (p, (GFunc) g_object_unref, NULL);
+			g_slist_foreach (p, (GFunc)g_object_unref, NULL);
 			g_slist_free (p);
 		}
 	}
@@ -1021,8 +971,8 @@ e_attachment_bar_new (GtkAdjustment *adj)
 	gnome_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE);
 
 	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (new)), 
-			     _("Attachment Bar"));
-	
+			_("Attachment Bar"));
+
 	g_signal_connect (new, "button_release_event", G_CALLBACK(eab_button_release_event), NULL);
 	g_signal_connect (new, "button_press_event", G_CALLBACK(eab_button_press_event), NULL);
 	g_signal_connect (new, "drag-data-get", G_CALLBACK(eab_drag_data_get), NULL);
@@ -1125,7 +1075,9 @@ attach_to_multipart (CamelMultipart *multipart,
 }
 
 void
-e_attachment_bar_to_multipart (EAttachmentBar *bar, CamelMultipart *multipart, const char *default_charset)
+e_attachment_bar_to_multipart (EAttachmentBar *bar,
+			       CamelMultipart *multipart,
+			       const char *default_charset)
 {
 	struct _EAttachmentBarPrivate *priv;
 	EAttachment *attachment;
@@ -1154,7 +1106,9 @@ e_attachment_bar_get_num_attachments (EAttachmentBar *bar)
 
 
 void
-e_attachment_bar_attach (EAttachmentBar *bar, const char *file_name, const char *disposition)
+e_attachment_bar_attach (EAttachmentBar *bar,
+			 const char *file_name,
+			 const char *disposition)
 {
 	g_return_if_fail (E_IS_ATTACHMENT_BAR (bar));
 	g_return_if_fail (file_name != NULL && disposition != NULL);
@@ -1163,7 +1117,8 @@ e_attachment_bar_attach (EAttachmentBar *bar, const char *file_name, const char
 }
 
 void
-e_attachment_bar_add_attachment (EAttachmentBar *bar, EAttachment *attachment)
+e_attachment_bar_add_attachment (EAttachmentBar *bar,
+				 EAttachment *attachment)
 {
 	g_return_if_fail (E_IS_ATTACHMENT_BAR (bar));
 	
@@ -1190,30 +1145,32 @@ e_attachment_bar_get_download_count (EAttachmentBar *bar)
 	return n;
 }
 
-void
-e_attachment_bar_attach_remote_file (EAttachmentBar *bar, const char *url, const char *disposition)
+void 
+e_attachment_bar_attach_remote_file (EAttachmentBar *bar, const char *url)
 {
 	EAttachment *attachment;
 	CamelException ex;
-	
+
 	g_return_if_fail (E_IS_ATTACHMENT_BAR (bar));
-	
+
 	if (!bar->priv->path)
-		bar->priv->path = e_mkdtemp ("attach-XXXXXX");
-	
+		bar->priv->path = e_mkdtemp("attach-XXXXXX");
+
 	camel_exception_init (&ex);
-	if ((attachment = e_attachment_new_remote_file (url, disposition, bar->priv->path, &ex))) {
-		add_common (bar, attachment);
+	attachment = e_attachment_new_remote_file (url, "attachment", bar->priv->path, &ex);
+	if (attachment) {
 		g_signal_connect (attachment, "update", G_CALLBACK (update_remote_file), bar);
+		add_common (bar, attachment);
 	} else {
-		e_error_run ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) bar), "mail-composer:no-attach",
-			     attachment->file_name, camel_exception_get_description (&ex), NULL);
+		e_error_run((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)bar), "mail-composer:no-attach",
+			    attachment->file_name, camel_exception_get_description(&ex), NULL);
 		camel_exception_clear (&ex);
 	}
 }
 
 void
-e_attachment_bar_attach_mime_part (EAttachmentBar *bar, CamelMimePart *part)
+e_attachment_bar_attach_mime_part (EAttachmentBar *bar,
+				   CamelMimePart *part)
 {
 	g_return_if_fail (E_IS_ATTACHMENT_BAR (bar));
 	
diff --git a/widgets/misc/e-attachment-bar.h b/widgets/misc/e-attachment-bar.h
index 0acccf742a..24eda03029 100644
--- a/widgets/misc/e-attachment-bar.h
+++ b/widgets/misc/e-attachment-bar.h
@@ -72,7 +72,7 @@ guint e_attachment_bar_get_num_attachments (EAttachmentBar *bar);
 void e_attachment_bar_attach (EAttachmentBar *bar, const char *file_name, const char *disposition);
 void e_attachment_bar_attach_mime_part (EAttachmentBar *bar, CamelMimePart *part);
 int e_attachment_bar_get_download_count (EAttachmentBar *bar);
-void e_attachment_bar_attach_remote_file (EAttachmentBar *bar, const char *url, const char *disposition);
+void e_attachment_bar_attach_remote_file (EAttachmentBar *bar, const char *url);
 GSList *e_attachment_bar_get_attachment (EAttachmentBar *bar, int id);
 void e_attachment_bar_add_attachment (EAttachmentBar *bar, EAttachment *attachment);
 void e_attachment_bar_edit_selected (EAttachmentBar *bar);
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 570c2e3332..7cf6d8887e 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -64,7 +64,6 @@ enum {
 	UPDATE,
 	LAST_SIGNAL
 };
-
 static guint signals[LAST_SIGNAL] = { 0 };
 
 static GObjectClass *parent_class = NULL;
@@ -75,7 +74,7 @@ changed (EAttachment *attachment)
 	g_signal_emit (attachment, signals[CHANGED], 0);
 }
 
-
+
 /* GtkObject methods.  */
 
 static void
@@ -105,7 +104,7 @@ finalise (GObject *object)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-
+
 /* Signals.  */
 
 static void
@@ -120,7 +119,7 @@ real_update_attachment (EAttachment *attachment, char *msg)
 	g_return_if_fail (E_IS_ATTACHMENT (attachment));
 }
 
-
+
 static void
 class_init (EAttachmentClass *klass)
 {
@@ -213,7 +212,7 @@ attachment_guess_mime_type (const char *file_name)
 	return type;
 }
 
-
+
 /**
  * e_attachment_new:
  * @file_name: filename to attach
@@ -223,7 +222,9 @@ attachment_guess_mime_type (const char *file_name)
  * Return value: the new attachment, or %NULL on error
  **/
 EAttachment *
-e_attachment_new (const char *file_name, const char *disposition, CamelException *ex)
+e_attachment_new (const char *file_name,
+			       const char *disposition,
+			       CamelException *ex)
 {
 	EAttachment *new;
 	CamelMimePart *part;
@@ -232,7 +233,7 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException
 	struct stat statbuf;
 	char *mime_type;
 	char *filename;
-	CamelURL *url;
+	CamelURL *curl;
 	
 	g_return_val_if_fail (file_name != NULL, NULL);
 	
@@ -251,14 +252,16 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException
 		return NULL;
 	}
 	
-	if (!(stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0))) {
+	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);
+	if (!stream) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot attach file %s: %s"),
 				      file_name, g_strerror (errno));
 		return NULL;
 	}
 	
-	if ((mime_type = attachment_guess_mime_type (file_name))) {
+	mime_type = attachment_guess_mime_type (file_name);
+	if (mime_type) {
 		if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) {
 			wrapper = (CamelDataWrapper *) camel_mime_message_new ();
 		} else {
@@ -304,10 +307,10 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException
 	new->is_available_local = TRUE;
 	new->file_name = filename;
 	
-	url = camel_url_new ("file:", NULL);
-	camel_url_set_path (url, file_name);
-	new->store_uri = camel_url_to_string (url, 0);
-	camel_url_free (url);
+	curl = camel_url_new ("file:", NULL);
+	camel_url_set_path (curl, file_name);
+	new->store_uri = camel_url_to_string (curl, 0);
+	camel_url_free (curl);
 	
 	return new;
 }
@@ -315,8 +318,8 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException
 
 typedef struct DownloadInfo {
 	EAttachment *attachment;
-	char *file_name;
-} DownloadInfo;
+	gchar *file_name;
+}DownloadInfo;
 
 static int
 async_progress_update_cb (GnomeVFSAsyncHandle      *handle,
@@ -363,42 +366,46 @@ async_progress_update_cb (GnomeVFSAsyncHandle      *handle,
 }
 
 static void
-download_to_local_path (GnomeVFSURI *source_uri, GnomeVFSURI *target_uri, DownloadInfo *download_info)
+download_to_local_path (GnomeVFSURI  *source_uri, GnomeVFSURI  *target_uri, DownloadInfo *download_info)
 			
 {
-	GList *source_uri_list;
-	GList *target_uri_list;
-	
-	source_uri_list = g_list_append (NULL, source_uri);
-	target_uri_list = g_list_append (NULL, target_uri);
-	
+	GnomeVFSResult       result;
+	GList               *source_uri_list = NULL;
+	GList               *target_uri_list = NULL;
+
+	source_uri_list = g_list_prepend (source_uri_list, source_uri);
+	target_uri_list = g_list_prepend (target_uri_list, target_uri);
+
 	/* Callback info */
-	gnome_vfs_async_xfer (&download_info->attachment->handle,    /* handle_return   */
-			      source_uri_list,                       /* source_uri_list */
-			      target_uri_list,                       /* target_uri_list */
-			      GNOME_VFS_XFER_DEFAULT,                /* xfer_options    */
-			      GNOME_VFS_XFER_ERROR_MODE_ABORT,       /* error_mode      */ 
-			      GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, /* overwrite_mode  */ 
-			      GNOME_VFS_PRIORITY_DEFAULT,            /* priority        */
-			      (GnomeVFSAsyncXferProgressCallback) async_progress_update_cb,
-			      download_info,                         /* update_callback_data   */
-			      NULL,                                  /* progress_sync_callback */
-			      NULL);                                 /* sync_callback_data     */
+	/* Maybe check the result here somewhere? */
+	result = gnome_vfs_async_xfer (&download_info->attachment->handle,                        /* handle_return   */
+				       source_uri_list,                       /* source_uri_list */
+				       target_uri_list,                       /* target_uri_list */
+				       GNOME_VFS_XFER_DEFAULT,                /* xfer_options    */
+				       GNOME_VFS_XFER_ERROR_MODE_ABORT,       /* error_mode      */ 
+				       GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, /* overwrite_mode  */ 
+				       GNOME_VFS_PRIORITY_DEFAULT,            /* priority        */
+				       (GnomeVFSAsyncXferProgressCallback) async_progress_update_cb,              /* progress_update_callback */
+				       download_info,                         /* update_callback_data     */
+				       NULL,                                  /* progress_sync_callback   */
+				       NULL);                                 /* sync_callback_data       */
 }
 
 EAttachment *
-e_attachment_new_remote_file (const char *uri, const char *disposition, const char *path, CamelException *ex)
+e_attachment_new_remote_file (const char *url,
+			      const char *disposition,
+			      const char *path,
+			      CamelException *ex)
 {
 	EAttachment *new;
 	DownloadInfo *download_info;
-	CamelURL *url;
-	char *base;
+	gchar *base;
+	CamelURL *curl;
 	
-	g_return_val_if_fail (uri != NULL, NULL);
-	
-	url = camel_url_new (uri, NULL);
-	base = g_path_get_basename (url->path);
-	camel_url_free (url);
+	g_return_val_if_fail (url != NULL, NULL);
+
+	curl = camel_url_new (url, NULL);
+	base = g_path_get_basename (curl->path);
 	
 	new = g_object_new (E_TYPE_ATTACHMENT, NULL);
 	new->editor_gui = NULL;
@@ -409,20 +416,23 @@ e_attachment_new_remote_file (const char *uri, const char *disposition, const ch
 	new->is_available_local = FALSE;
 	new->percentage = 0;
 	new->file_name = g_build_filename (path, base, NULL);
-	
-	g_free (base);
-	
+
+	g_free(base);
+
 	download_info = g_new (DownloadInfo, 1);
 	download_info->attachment = new;
 	download_info->file_name = g_strdup (new->file_name);
-	download_to_local_path (gnome_vfs_uri_new (uri), gnome_vfs_uri_new (new->file_name), download_info);
-	
+	download_to_local_path (gnome_vfs_uri_new(url), gnome_vfs_uri_new(new->file_name), download_info);
+
+	camel_url_free (curl);
 	return new;
 }
 
-
 void
-e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, const char *disposition, CamelException *ex)
+e_attachment_build_remote_file (const char *file_name,
+					     EAttachment *attachment,
+					     const char *disposition,
+					     CamelException *ex)
 {
 	CamelMimePart *part;
 	CamelDataWrapper *wrapper;
@@ -430,11 +440,11 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment,
 	struct stat statbuf;
 	char *mime_type;
 	char *filename;
-	CamelURL *url;
+	CamelURL *curl;
 	
 	g_return_if_fail (file_name != NULL);
 	
-	if (g_stat (file_name, &statbuf) == -1) {
+	if (g_stat (file_name, &statbuf) < 0) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot attach file %s: %s"),
 				      file_name, g_strerror (errno));
@@ -451,14 +461,16 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment,
 		return;
 	}
 	
-	if (!(stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0))) {
+	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);
+	if (!stream) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot attach file %s: %s"),
 				      file_name, g_strerror (errno));
 		return;
 	}
 	
-	if ((mime_type = attachment_guess_mime_type (file_name))) {
+	mime_type = attachment_guess_mime_type (file_name);
+	if (mime_type) {
 		if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) {
 			wrapper = (CamelDataWrapper *) camel_mime_message_new ();
 		} else {
@@ -505,13 +517,13 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment,
 	g_free (attachment->file_name);
 	attachment->file_name = filename;
 	
-	url = camel_url_new ("file:", NULL);
-	camel_url_set_path (url, file_name);
-	attachment->store_uri = camel_url_to_string (url, 0);
-	camel_url_free (url);
+	curl = camel_url_new ("file:", NULL);
+	camel_url_set_path (curl, file_name);
+	attachment->store_uri = camel_url_to_string (curl, 0);
+	camel_url_free (curl);
 
 }
-
+
 
 /**
  * e_attachment_new_from_mime_part:
@@ -629,7 +641,7 @@ ok_cb (GtkWidget *widget, gpointer data)
 		camel_mime_part_set_content_type (attachment->body, str);
 		camel_data_wrapper_set_mime_type(camel_medium_get_content_object(CAMEL_MEDIUM (attachment->body)), str);
 	}
-	
+
 	if (attachment->is_available_local) {
 		switch (gtk_toggle_button_get_active (dialog_data->disposition_checkbox)) {
 		case 0:
@@ -666,22 +678,27 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent)
 	const char *disposition;
 	DialogData *dialog_data;
 	GladeXML *editor_gui;
-	GtkWidget *window;
 	char *type;
 	char *filename;
 	
 	g_return_if_fail (E_IS_ATTACHMENT (attachment));
 	
 	if (attachment->editor_gui != NULL) {
-		window = glade_xml_get_widget (attachment->editor_gui, "dialog");
+		GtkWidget *window;
+		
+		window = glade_xml_get_widget (attachment->editor_gui,
+					       "dialog");
 		gdk_window_show (window->window);
 		return;
 	}
 	
-	filename = g_build_filename (EVOLUTION_GLADEDIR, "e-attachment.glade", NULL);
-	editor_gui = glade_xml_new (filename, NULL, NULL);
+	filename = g_build_filename (EVOLUTION_GLADEDIR,
+				     "e-attachment.glade",
+				     NULL);
+	editor_gui = glade_xml_new (filename,
+				    NULL, NULL);
 	g_free (filename);
-	
+
 	if (editor_gui == NULL) {
 		g_warning ("Cannot load `e-attachment.glade'");
 		return;
@@ -689,47 +706,58 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent)
 	
 	attachment->editor_gui = editor_gui;
 	
-	gtk_window_set_transient_for (GTK_WINDOW (glade_xml_get_widget (editor_gui, "dialog")),
-				      GTK_WINDOW (gtk_widget_get_toplevel (parent)));
+	gtk_window_set_transient_for
+		(GTK_WINDOW (glade_xml_get_widget (editor_gui, "dialog")),
+		 GTK_WINDOW (gtk_widget_get_toplevel (parent)));
 	
 	dialog_data = g_new (DialogData, 1);
 	dialog_data->attachment = attachment;
 	dialog_data->dialog = glade_xml_get_widget (editor_gui, "dialog");
-	dialog_data->file_name_entry = GTK_ENTRY (glade_xml_get_widget (editor_gui, "file_name_entry"));
-	dialog_data->description_entry = GTK_ENTRY (glade_xml_get_widget (editor_gui, "description_entry"));
-	dialog_data->mime_type_entry = GTK_ENTRY (glade_xml_get_widget (editor_gui, "mime_type_entry"));
-	dialog_data->disposition_checkbox = GTK_TOGGLE_BUTTON (glade_xml_get_widget (editor_gui, "disposition_checkbox"));
-	
-	if (attachment->is_available_local) {
-		set_entry (editor_gui, "file_name_entry", camel_mime_part_get_filename (attachment->body));
-		set_entry (editor_gui, "description_entry", camel_mime_part_get_description (attachment->body));
+	dialog_data->file_name_entry = GTK_ENTRY (
+		glade_xml_get_widget (editor_gui, "file_name_entry"));
+	dialog_data->description_entry = GTK_ENTRY (
+		glade_xml_get_widget (editor_gui, "description_entry"));
+	dialog_data->mime_type_entry = GTK_ENTRY (
+		glade_xml_get_widget (editor_gui, "mime_type_entry"));
+	dialog_data->disposition_checkbox = GTK_TOGGLE_BUTTON (
+		glade_xml_get_widget (editor_gui, "disposition_checkbox"));
+
+	if (attachment->is_available_local)	{
+		set_entry (editor_gui, "file_name_entry",
+			   camel_mime_part_get_filename (attachment->body));
+		set_entry (editor_gui, "description_entry",
+			   camel_mime_part_get_description (attachment->body));
 		content_type = camel_mime_part_get_content_type (attachment->body);
 		type = camel_content_type_simple (content_type);
 		set_entry (editor_gui, "mime_type_entry", type);
 		g_free (type);
-		
+	
 		disposition = camel_mime_part_get_disposition (attachment->body);
 		gtk_toggle_button_set_active (dialog_data->disposition_checkbox,
 					      disposition && !g_ascii_strcasecmp (disposition, "inline"));
 	} else {
-		set_entry (editor_gui, "file_name_entry", attachment->file_name);
-		set_entry (editor_gui, "description_entry", attachment->description);
-		if ((type = attachment_guess_mime_type (attachment->file_name))) {
+		set_entry (editor_gui, "file_name_entry",
+			   attachment->file_name);
+		set_entry (editor_gui, "description_entry",
+			   attachment->description);
+		type = attachment_guess_mime_type (attachment->file_name);
+		if (type) {
 			set_entry (editor_gui, "mime_type_entry", type);
 			g_free (type);
 		} else {
 			set_entry (editor_gui, "mime_type_entry", "");
 		}
-		
+	
 		gtk_toggle_button_set_active (dialog_data->disposition_checkbox, attachment->disposition);
+		
 	}
 	
 	connect_widget (editor_gui, "dialog", "response", (GCallback)response_cb, dialog_data);
-	
+
 	/* make sure that when the parent gets hidden/closed that our windows also close */
 	parent = gtk_widget_get_toplevel (parent);
-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", (GCallback) close_cb, dialog_data,
+	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", (GCallback)close_cb, dialog_data,
 					GTK_OBJECT (dialog_data->dialog));
-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "hide", (GCallback) close_cb, dialog_data,
+	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "hide", (GCallback)close_cb, dialog_data,
 					GTK_OBJECT (dialog_data->dialog));
 }
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index b66e9e0d20..e6bf6410b6 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -458,13 +458,13 @@ create_children			(EDateEdit	*dedit)
 	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
         gtk_widget_show (bbox);
 
-	priv->now_button = gtk_button_new_with_mnemonic (_("No_w"));
+	priv->now_button = gtk_button_new_with_label (_("Now"));
 	gtk_container_add (GTK_CONTAINER (bbox), priv->now_button);
         gtk_widget_show (priv->now_button);
 	g_signal_connect (priv->now_button, "clicked",
 			  G_CALLBACK (on_date_popup_now_button_clicked), dedit);
 
-	priv->today_button = gtk_button_new_with_mnemonic (_("_Today"));
+	priv->today_button = gtk_button_new_with_label (_("Today"));
 	gtk_container_add (GTK_CONTAINER (bbox), priv->today_button);
         gtk_widget_show (priv->today_button);
 	g_signal_connect (priv->today_button, "clicked",
@@ -472,7 +472,7 @@ create_children			(EDateEdit	*dedit)
 
 	/* Note that we don't show this here, since by default a 'None' date
 	   is not permitted. */
-	priv->none_button = gtk_button_new_with_mnemonic (_("_None"));
+	priv->none_button = gtk_button_new_with_label (_("None"));
 	gtk_container_add (GTK_CONTAINER (bbox), priv->none_button);
 	g_signal_connect (priv->none_button, "clicked",
 			  G_CALLBACK (on_date_popup_none_button_clicked), dedit);
@@ -1323,8 +1323,8 @@ on_date_popup_key_press			(GtkWidget	*widget,
 					 GdkEventKey	*event,
 					 EDateEdit	*dedit)
 {
-	if (event->keyval != GDK_Escape) {
-    	gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME);
+	if (event->keyval != GDK_Escape){
+		gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME);
 		return FALSE;
 	}
 
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 2ce971ad46..0a2cd9735b 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,20 +1,9 @@
-2006-07-05  Rajeev ramanathan <rajeevramanathan_2004@yaoo.co.in>
-
-	* e-cell-text.c: (ect_unrealize), (build_layout), (ect_draw): Added
-	code to render ECell text items with antialiasing, hinting 
-	and sub-pixel ordering with cairo.
-
-2006-07-18  Benoît Dejean  <benoit@placenet.org>
-
-	** Fixes bug #333041
-	* e-table-group-container.c: add gettext support to some strings.
-
 2006-06-12  simon.zheng  <simon.zheng@sun.com>
 
-	**Fixes bug #338295
-	* e-cell-text.c: (get_font_description_for_size), (get_font_size),
-	(ect_print), (ect_print_height): Use pango to handle text when 
-	printing tasks
+        **Fixes bug #338295
+        * e-cell-text.c: (get_font_description_for_size), (get_font_size),
+        (ect_print), (ect_print_height): Use pango to handle text when
+        printing tasks
 
 2006-06-12  Ed Catmur  <ed@catmur.co.uk>
 
@@ -22,18 +11,6 @@
 	* e-table-header-utils.c: (e_table_header_draw_button): 
 	Adding a weak reference to avoid crashing.
 
-2006-06-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Committing a fix for sorting in the vertical view.
-
-	* e-table-column-specification.c:
-	(e_table_column_specification_load_from_node):
-	* e-table-column-specification.h:
-	* e-table-header-item.c: (ethi_popup_sort_ascending),
-	(ethi_popup_sort_descending), (ethi_header_context_menu),
-	(ethi_change_sort_state):
-	* e-table-utils.c: (et_col_spec_to_col):
-
 2006-06-08  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	** Fixes bug #343764
@@ -41,16 +18,6 @@
 	Ensure g_label points to the right widget before accessing to its
 	style.
 
-2006-06-05  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	* Makefile.am: Remove extra tabs. Fixes #343734.
-
-2006-05-12  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #341530.
-	* e-table.h:
-	Removed duplicate delcaration of e_table_commi_click_to_add.
-
 2006-04-10  Jeff Cai <jeff.cai@sun.com>
 
 	** Fixes bug #327035
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index fee7d04cfb..af67ff40af 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -142,6 +142,7 @@ typedef struct {
 	int xofs, yofs;                 /* This gets added to the x
                                            and y for the cell text. */
 	double ellipsis_width[2];      /* The width of the ellipsis. */
+
 } ECellTextView;
 
 struct _CellEdit {
@@ -438,7 +439,6 @@ ect_unrealize (ECellView *ecv)
 
 	if (parent_class->unrealize)
 		(* parent_class->unrealize) (ecv);
-
 }
 
 static void
@@ -570,8 +570,6 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width)
 	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
 	PangoAttrList *attrs ;
 	PangoLayout *layout;
-	PangoContext *context;
-	cairo_font_options_t *font_options;
 
 	layout = gtk_widget_create_pango_layout (GTK_WIDGET (((GnomeCanvasItem *)ecell_view->e_table_item_view)->canvas), text);
 
@@ -583,34 +581,6 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width)
 	if (text_view->edit || width <= 0)
 		return layout;
 
-	context = pango_layout_get_context (layout);
-
-	font_options = get_font_options();
-	pango_cairo_context_set_font_options (context, font_options);
-	cairo_font_options_destroy (font_options);
-	pango_layout_context_changed (layout);
-
-	if (ect->font_name)
-	{
-		PangoFontDescription *desc = NULL, *fixed_desc = NULL;
-		char *fixed_family = NULL;
-		gint fixed_size;
-		
-		fixed_desc = pango_font_description_from_string (ect->font_name);
-		if (fixed_desc) {
-			fixed_family = pango_font_description_get_family (fixed_desc);
-			fixed_size = pango_font_description_get_size (fixed_desc);
-		} 
-		
-		desc = pango_font_description_copy (gtk_widget_get_style (GTK_WIDGET (((GnomeCanvasItem *)ecell_view->e_table_item_view)->canvas))->font_desc);
-		pango_font_description_set_family (desc, fixed_family);
-		pango_font_description_set_size (desc, fixed_size);
-/*  		pango_font_description_set_style (desc, PANGO_STYLE_OBLIQUE); */
-		pango_layout_set_font_description (layout, desc);
-		pango_font_description_free (desc);
-		pango_font_description_free (fixed_desc);
-	}
-	
 	pango_layout_set_width (layout, width * PANGO_SCALE);
 	pango_layout_set_wrap (layout, PANGO_WRAP_CHAR);
 
@@ -641,7 +611,7 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width)
 	default:
 		break;
 	}
-
+	
 	return layout;
 }
 
@@ -742,7 +712,10 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	selected = flags & E_CELL_SELECTED;
 
 	if (selected) {
+		if (flags & E_CELL_FOCUSED)
 			foreground = &canvas->style->fg [GTK_STATE_SELECTED];
+		else
+			foreground = &canvas->style->fg [GTK_STATE_ACTIVE];
 	} else {
 		foreground = &canvas->style->text [GTK_STATE_NORMAL];
 
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
deleted file mode 100644
index 37ac85770f..0000000000
--- a/widgets/table/e-table-example-1.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-example-1.c
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include "table-test.h"
-
-/*
- * One way in which we make it simpler to build an ETableModel is through
- * the ETableSimple class.  Instead of creating your own ETableModel
- * class, you simply create a new object of the ETableSimple class.  You
- * give it a bunch of functions that act as callbacks.
- * 
- * You also get to pass a void * to ETableSimple and it gets passed to
- * your callbacks.  This would be for having multiple models of the same
- * type.  This is just an example though, so we statically define all the
- * data and ignore the void *data parameter.
- * 
- * In our example we will be creating a table model with 6 columns and 10
- * rows.  This corresponds to having 6 different types of information and
- * 10 different sets of data in our database.
- * 
- * The headers will be hard coded, as will be the example data.
- *
- */
-
-/*
- * There are two different meanings to the word "column".  The first is
- * the model column.  A model column corresponds to a specific type of
- * data.  This is very much like the usage in a database table where a
- * column is a field in the database.
- *
- * The second type of column is a view column.  A view column
- * corresponds to a visually displayed column.  Each view column
- * corresponds to a specific model column, though a model column may
- * have any number of view columns associated with it, from zero to
- * greater than one.
- *
- * Also, a view column doesn't necessarily depend on only one model
- * column.  In some cases, the view column renderer can be given a
- * reference to another column to get extra information about its
- * display.
-*/
-
-#define ROWS 10
-#define COLS 4
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/*
- * Here we define the initial layout of the table.  This is an xml
- * format that allows you to change the initial ordering of the
- * columns or to do sorting or grouping initially.  This specification
- * shows all 5 columns, but moves the importance column nearer to the
- * front.  It also sorts by the "Full Name" column (ascending.)
- * Sorting and grouping take the model column as their arguments
- * (sorting is specified by the "column" argument to the leaf elemnt.
- */
-
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
-</ETableSpecification>"
-
-char *headers [COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/*
- * Virtual Column list:
- * 0   Email
- * 1   Full Name
- * 2   Address
- * 3   Phone
- */
-
-char *table_data [ROWS] [COLS];
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/*
- * Since our model is a constant size, we can just return its size in
- * the column and row count fields.
- */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	return (void *) table_data [row] [col];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_free (table_data [row] [col]);
-	table_data [row] [col] = g_strdup (val);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-/* This function frees the value passed to it. */
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-/* This function reports if a value is empty. */
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-/* We create a window containing our new table. */
-static void
-create_table (void)
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ETableHeader *e_table_header;
-	int i, j;
-	ETableModel *e_table_model = NULL;
-
-	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < COLS; j++)
-			table_data [i] [j] = g_strdup ("");
-	}
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value, 
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	 * Next we create a header.  The ETableHeader is used in two
-	 * different way.  The first is the full_header.  This is the
-	 * list of possible columns in the view.  The second use is
-	 * completely internal.  Many of the ETableHeader functions are
-	 * for that purpose.  The only functions we really need are
-	 * e_table_header_new and e_table_header_add_col.
-	 *
-	 * First we create the header.
-	 */
-	e_table_header = e_table_header_new ();
-	
-	/*
-	 * Next we have to build renderers for all of the columns.
-	 * Since all our columns are text columns, we can simply use
-	 * the same renderer over and over again.  If we had different
-	 * types of columns, we could use a different renderer for
-	 * each column.
-	 */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-		
-	/*
-	 * Next we create a column object for each view column and add
-	 * them to the header.  We don't create a column object for
-	 * the importance column since it will not be shown.
-	 */
-	for (i = 0; i < COLS; i++) {
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Here we create a window for our new table.  This window
-	 * will get shown and the person will be able to test their
-	 * item.
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-
-	/*
-	 * Here we create the table.  We give it the three pieces of
-	 * the table we've created, the header, the model, and the
-	 * initial layout.  It does the rest.
-	 */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 200, 200);
-
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-/* This is the main function which just initializes gnome and call our create_table function */
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
-
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 1e6d9bad29..7f340f990a 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -25,7 +25,6 @@
 #include <config.h>
 
 #include <string.h>
-#include <glib.h>
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
@@ -1236,15 +1235,14 @@ static void
 ethi_popup_sort_ascending(GtkWidget *widget, EthiHeaderInfo *info)
 {
 	ETableCol *col;
-	int model_col = -1;
+	int model_col;
 	int length;
 	int i;
 	int found = FALSE;
 	ETableHeaderItem *ethi = info->ethi;
 
 	col = e_table_header_get_column (ethi->eth, info->col);
-	if (col->sortable)
-		model_col = col->col_idx;
+	model_col = col->col_idx;
 
 	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
 	for (i = 0; i < length; i++) {
@@ -1266,13 +1264,12 @@ ethi_popup_sort_ascending(GtkWidget *widget, EthiHeaderInfo *info)
 			ETableSortColumn column =
 				e_table_sort_info_sorting_get_nth(
 					ethi->sort_info, i);
-			if (model_col == column.column || model_col == -1){
+			if (model_col == column.column){
 				column.ascending = 1;
 				e_table_sort_info_sorting_set_nth (
 					ethi->sort_info, i, column);
 				found = 1;
-				if (model_col != -1)
-					break;
+				break;
 			}
 		}
 	}
@@ -1291,15 +1288,14 @@ static void
 ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info)
 {
 	ETableCol *col;
-	int model_col=-1;
+	int model_col;
 	int length;
 	int i;
 	int found = FALSE;
 	ETableHeaderItem *ethi = info->ethi;
 
 	col = e_table_header_get_column (ethi->eth, info->col);
-	if (col->sortable)
-		model_col = col->col_idx;
+	model_col = col->col_idx;
 
 	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
 	for (i = 0; i < length; i++) {
@@ -1320,13 +1316,12 @@ ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info)
 				e_table_sort_info_sorting_get_nth(
 					ethi->sort_info, i);
 
-			if (model_col == column.column || model_col == -1){
+			if (model_col == column.column){
 				column.ascending = 0;
 				e_table_sort_info_sorting_set_nth (
 					ethi->sort_info, i, column);
 				found = 1;
-				if (model_col != -1)
-					break;
+				break;
 			}
 		}
 	}
@@ -1454,7 +1449,7 @@ ethi_popup_customize_view(GtkWidget *widget, EthiHeaderInfo *info)
 	ETableHeaderItem *ethi = info->ethi;
 	ETableState *state;
 	ETableSpecification *spec;
-	
+
 	if (ethi->config)
 		e_table_config_raise (E_TABLE_CONFIG (ethi->config));
 	else {
@@ -1507,104 +1502,22 @@ static EPopupMenu ethi_context_menu [] = {
 };
 
 static void
-sort_by_id (GtkWidget *menu_item, ETableHeaderItem *ethi)
-{
-	int col = GPOINTER_TO_INT (g_object_get_data(menu_item, "col-number"));
-	ETableCol *ecol;
-
-	if (!gtk_check_menu_item_get_active(menu_item))
-		return;
-	
-	ecol = e_table_header_get_column (ethi->full_header, col);
-	ethi_change_sort_state (ethi, ecol);
-}
-
-static void
-popup_custom (GtkWidget *menu_item, EthiHeaderInfo *info)
-{
-	if (!gtk_check_menu_item_get_active(menu_item))
-		return;
-
-	ethi_popup_customize_view(menu_item, info);
-}
-static void
 ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 {
 	EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1);
 	ETableCol *col;
-	GtkMenu *popup, *sub_menu;;
-	int ncol, sort_count, sort_col;
-	GtkWidget *menu_item;
-	GSList *group = NULL;
-	ETableSortColumn column;
-	gboolean ascending;
-	
+	GtkMenu *popup;
 	info->ethi = ethi;
 	info->col = ethi_find_col_by_x (ethi, event->x);
 	col = e_table_header_get_column (ethi->eth, info->col);
 
 	popup = e_popup_menu_create_with_domain (ethi_context_menu,
 						 1 +
-						 0 +
+						 (col->sortable ? 0 : 2) +
 						 ((ethi->table || ethi->tree) ? 0 : 4) + 
 						 ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
 						 ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
 						 128, info, E_I18N_DOMAIN);
-	
-	menu_item = gtk_menu_item_new_with_label (_("Sort By"));
-	gtk_widget_show (menu_item);
-	sub_menu = gtk_menu_new ();
-	gtk_widget_show (sub_menu);
-	gtk_menu_item_set_submenu (menu_item, sub_menu);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (popup), menu_item);
-
-	sort_count = e_table_sort_info_sorting_get_count(ethi->sort_info);
-
-	if (sort_count > 1 || sort_count < 1)
-		sort_col = -1; /* Custom sorting */
-	else {
-		column = e_table_sort_info_sorting_get_nth(ethi->sort_info, 0);
-		sort_col = column.column;
-		ascending = column.ascending;
-	}
-	
-	/* Custom */
-	menu_item = gtk_radio_menu_item_new_with_label (group, _("Custom"));
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item));
-	gtk_widget_show (menu_item);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (sub_menu), menu_item);
-	if (sort_col == -1)
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
-	g_signal_connect (menu_item, "toggled", G_CALLBACK (popup_custom), info);
-	
-	/* Show a seperator */
-	menu_item = gtk_separator_menu_item_new ();
-	gtk_widget_show (menu_item);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (sub_menu), menu_item);
-	/* Headers */
-	for (ncol = 0; ncol<ethi->full_header->col_count; ncol++)
-	{
-		char *text=NULL;
-
-		if (!ethi->full_header->columns[ncol]->sortable)
-			continue;
-		
-		if (ncol == sort_col) {
-			text = g_strdup_printf("%s (%s)", ethi->full_header->columns[ncol]->text, ascending ? _("Ascending"):_("Descending"));
-			menu_item = gtk_radio_menu_item_new_with_label (group, text);
-			g_free (text);
-		} else
-			menu_item = gtk_radio_menu_item_new_with_label (group, ethi->full_header->columns[ncol]->text);
-		
-		gtk_widget_show (menu_item);
-		gtk_menu_shell_prepend (GTK_MENU_SHELL (sub_menu), menu_item);
-		
-		if (ncol == sort_col)
-			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
-		g_object_set_data (menu_item, "col-number", GINT_TO_POINTER (ncol));
-		g_signal_connect (menu_item, "activate", G_CALLBACK (sort_by_id), ethi);
-	}
-	
 	g_object_ref (popup);
 	gtk_object_sink (GTK_OBJECT (popup));
 	g_signal_connect (popup, "selection-done",
@@ -1622,7 +1535,7 @@ ethi_button_pressed (ETableHeaderItem *ethi, GdkEventButton *event)
 void
 ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 {
-	int model_col = -1;
+	int model_col;
 	int length;
 	int i;
 	int found = FALSE;
@@ -1630,32 +1543,33 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 	if (col == NULL)
 		return;
 
-	if (col->sortable)
-		model_col = col->col_idx;
+	model_col = col->col_idx;
 	
 	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
 	for (i = 0; i < length; i++) {
 		ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i);
-		if (model_col == column.column || model_col == -1){
+		if (model_col == column.column){
 			int ascending = column.ascending;
 			ascending = ! ascending;
 			column.ascending = ascending;
 			e_table_sort_info_grouping_set_nth(ethi->sort_info, i, column);
 			found = 1;
-			if (model_col != -1)
-				break;
+			break;
 		}
 	}
 	
+	if (!col->sortable)
+		return;
+	
 	if (!found) {
 		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
 		for (i = 0; i < length; i++) {
 			ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i);
 
-			if (model_col == column.column || model_col == -1){
+			if (model_col == column.column){
 				int ascending = column.ascending;
 				
-				if (ascending == 0 && model_col != -1){
+				if (ascending == 0){
 					/*
 					 * This means the user has clicked twice
 					 * already, lets kill sorting now.
@@ -1667,8 +1581,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 					e_table_sort_info_sorting_set_nth(ethi->sort_info, i, column);
 				}
 				found = 1;
-				if (model_col != -1)
-					break;
+				break;
 			}
 		}
 	}
@@ -1805,7 +1718,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			ethi_end_resize (ethi);
 		} else if (was_maybe_drag && ethi->sort_info) {
 			ETableCol *ecol;
-			
+		
 			ecol = e_table_header_get_column (ethi->eth, ethi_find_col_by_x (ethi, e->button.x));
 			ethi_change_sort_state (ethi, ecol);
 		}
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 1cc802260e..75332cdd8a 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -405,30 +405,12 @@ create_layout (EText *text)
 static void
 reset_layout (EText *text)
 {
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (text);
-	cairo_font_options_t *font_options;
-	PangoContext *context;
-
 	if (text->layout == NULL) {
 		create_layout (text);
 	}
 	else {
-		context = pango_layout_get_context (text->layout);
-
-		font_options = get_font_options();
-		pango_cairo_context_set_font_options (context, font_options);
-		cairo_font_options_destroy (font_options);
-		pango_layout_context_changed (text->layout);
-
-		text->font_desc = pango_font_description_new ();
-		pango_font_description_set_size (text->font_desc, 
-			pango_font_description_get_size ((GTK_WIDGET (item->canvas))->style->font_desc));
-		pango_font_description_set_family (text->font_desc,
-			pango_font_description_get_family ((GTK_WIDGET (item->canvas))->style->font_desc));
-		pango_layout_set_font_description (text->layout, text->font_desc);
-
- 		pango_layout_set_text (text->layout, text->text, -1);
- 		reset_layout_attrs (text);
+		pango_layout_set_text (text->layout, text->text, -1);
+		reset_layout_attrs (text);
 	}
 
 	if (!text->button_down) {
@@ -2505,7 +2487,7 @@ e_text_copy_clipboard (EText *text)
 			 selection_end_pos - selection_start_pos);
 
 	gtk_clipboard_set_text (
-#if GTK_CHECK_VERSION (2, 2, 0)
+#ifdef GTK_2_2
 				gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
 							  GDK_SELECTION_CLIPBOARD),
 #else
@@ -2605,7 +2587,7 @@ e_text_update_primary_selection (EText *text)
 	};
 	GtkClipboard *clipboard;
 
-#if GTK_CHECK_VERSION (2, 2, 0)
+#ifdef GTK_2_2
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas), GDK_SELECTION_PRIMARY);
 #else
 	clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
@@ -2644,7 +2626,7 @@ e_text_paste (EText *text, GdkAtom selection)
 {
 	g_object_ref (text);
 	gtk_clipboard_request_text (
-#if GTK_CHECK_VERSION (2, 2, 0)
+#ifdef GTK_2_2
 
 				    gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
 							      selection),
@@ -2779,7 +2761,7 @@ e_text_do_popup (EText *text, GdkEventButton *button, int position)
 	closure->position = position;
 
 	gtk_clipboard_request_contents (
-#if GTK_CHECK_VERSION (2, 2, 0)
+#ifdef GTK_2_2
 
 					gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
 								  GDK_SELECTION_CLIPBOARD),